Get head reference for commit flag on build cmd

Signed-off-by: alexandreh2ag <[email protected]>

cli/build/commit.go

@@ -1,10 +1,12 @@
 package build
 
 import (
+	"fmt"
 	"github.com/alexandreh2ag/mib/container/docker"
 	"github.com/alexandreh2ag/mib/context"
 	"github.com/alexandreh2ag/mib/git"
 	"github.com/alexandreh2ag/mib/loader"
+	"github.com/alexandreh2ag/mib/printer"
 	"github.com/spf13/cobra"
 )
 
@@ -17,7 +19,7 @@ func GetCommitCmd(ctx *context.Context) *cobra.Command {
 		RunE:  GetCommitRunFn(ctx),
 	}
 
-	cmd.Flags().String(Commit, "", "Commit sha")
+	cmd.Flags().String(Commit, "", "Commit sha, if empty get head reference")
 
 	return cmd
 }
@@ -26,11 +28,21 @@ func GetCommitRunFn(ctx *context.Context) func(*cobra.Command, []string) error {
 	return func(cmd *cobra.Command, args []string) error {
 		pushImages, _ := cmd.Flags().GetBool(PushImages)
 		commitHash, _ := cmd.Flags().GetString(Commit)
+
 		builder := ctx.Builders.GetInstance(docker.KeyBuilder)
 		gitManager, errCreateGit := git.CreateGit(ctx)
 		if errCreateGit != nil {
 			return errCreateGit
 		}
+
+		if commitHash == "" {
+			hash, errHead := gitManager.Head()
+			if errHead != nil {
+				return fmt.Errorf("fail when get head git reference: %v", errHead)
+			}
+			commitHash = hash
+		}
+
 		images, err := loader.LoadImages(ctx)
 		if err != nil {
 			return err
@@ -41,6 +53,11 @@ func GetCommitRunFn(ctx *context.Context) func(*cobra.Command, []string) error {
 		}
 
 		images.FlagChanged(loader.RemoveExtExcludePath(ctx.WorkingDir, ctx.Config.Build.ExtensionExclude, filesChanged))
+
+		if len(images) > 0 {
+			cmd.Println(printer.DisplayImagesTree(images))
+		}
+
 		errBuild := builder.BuildImages(images, pushImages)
 		if errBuild != nil {
 			return errBuild

cli/build/commit_test.go

@@ -49,6 +49,34 @@ func TestGetCommitRunFn(t *testing.T) {
 				assert.NoError(t, err)
 			},
 		},
+		{
+			name:      "SuccessWithoutCommitFlag",
+			imageData: "name: foo\ntag: 0.1",
+			preFn: func(ctx *context.Context, ctrl *gomock.Controller) {
+				m := mockgit.NewMockManager(ctrl)
+
+				mibGit.CreateGit = func(ctx *context.Context) (mibGit.Manager, error) {
+					return m, nil
+				}
+				gomock.InOrder(
+					m.EXPECT().Head().Times(1).Return("xxx", nil),
+					m.EXPECT().GetCommitFilesChanged(gomock.Eq("xxx")).Times(1).Return(
+						[]string{"foo/Dockerfile"},
+						nil,
+					),
+				)
+
+				builderDocker := mock_types_container.NewMockBuilderImage(ctrl)
+				builderDocker.EXPECT().BuildImages(gomock.Any(), gomock.Eq(true)).Times(1).Return(nil)
+				ctx.Builders[docker.KeyBuilder] = builderDocker
+			},
+			cmdArgs: []string{
+				"--" + PushImages,
+			},
+			checkFn: func(t *testing.T, err error) {
+				assert.NoError(t, err)
+			},
+		},
 		{
 			name:      "ErrorCreateGitManger",
 			imageData: "name: foo\ntag: 0.1",
@@ -66,6 +94,24 @@ func TestGetCommitRunFn(t *testing.T) {
 				assert.Contains(t, err.Error(), "error")
 			},
 		},
+		{
+			name:      "ErrorGetHeadReference",
+			imageData: "name: foo\ntag: 0.1",
+			preFn: func(ctx *context.Context, ctrl *gomock.Controller) {
+				m := mockgit.NewMockManager(ctrl)
+				mibGit.CreateGit = func(ctx *context.Context) (mibGit.Manager, error) {
+					return m, nil
+				}
+				m.EXPECT().Head().Times(1).Return("", errors.New("error"))
+				builderDocker := mock_types_container.NewMockBuilderImage(ctrl)
+				ctx.Builders[docker.KeyBuilder] = builderDocker
+			},
+			cmdArgs: []string{},
+			checkFn: func(t *testing.T, err error) {
+				assert.Error(t, err)
+				assert.Contains(t, err.Error(), "error")
+			},
+		},
 		{
 			name:      "FailLoadImages",
 			imageData: "name: foo\ntag: ",

cli/build/dirty.go

@@ -5,6 +5,7 @@ import (
 	"github.com/alexandreh2ag/mib/context"
 	"github.com/alexandreh2ag/mib/git"
 	"github.com/alexandreh2ag/mib/loader"
+	"github.com/alexandreh2ag/mib/printer"
 
 	"github.com/spf13/cobra"
 )
@@ -32,6 +33,9 @@ func GetDirtyRunFn(ctx *context.Context) func(*cobra.Command, []string) error {
 		}
 		filesChanged := git.GetStageFilesChanged(gitManager)
 		images.FlagChanged(loader.RemoveExtExcludePath(ctx.WorkingDir, ctx.Config.Build.ExtensionExclude, filesChanged))
+		if len(images) > 0 {
+			cmd.Println(printer.DisplayImagesTree(images))
+		}
 		errBuild := builder.BuildImages(images, pushImages)
 		if errBuild != nil {
 			return errBuild

git/git.go

@@ -28,6 +28,7 @@ type Repository interface {
 	ResolveRevision(in plumbing.Revision) (*plumbing.Hash, error)
 	CommitObject(h plumbing.Hash) (*object.Commit, error)
 	CommitObjects() (object.CommitIter, error)
+	Head() (*plumbing.Reference, error)
 }
 
 type Worktree interface {
@@ -37,6 +38,7 @@ type Worktree interface {
 }
 
 type Manager interface {
+	Head() (string, error)
 	Status() (git.Status, error)
 	ResolveRevision(in plumbing.Revision) (*plumbing.Hash, error)
 	CommitFileContent(hash *plumbing.Hash, path string) (string, error)
@@ -52,6 +54,14 @@ type Git struct {
 	w Worktree
 }
 
+func (g Git) Head() (string, error) {
+	head, err := g.r.Head()
+	if err != nil {
+		return "", err
+	}
+	return head.String(), nil
+}
+
 func (g Git) CreateCommit(msg string, opts *git.CommitOptions) (plumbing.Hash, error) {
 	return g.w.Commit(msg, opts)
 }

git/git_test.go

@@ -51,6 +51,24 @@ func TestGit_Status(t *testing.T) {
 	assert.Equal(t, want, got)
 }
 
+func TestGit_Head_Success(t *testing.T) {
+
+	ctx := context.TestContext(nil)
+	ctx.WorkingDir = "/app/repo"
+
+	repo := initGitRepo(t, ctx)
+	_ = afero.WriteFile(ctx.FS, filepath.Join(ctx.WorkingDir, "foo/mib.yml"), []byte("name: foo\ntag: 0.1"), 0644)
+	_ = afero.WriteFile(ctx.FS, filepath.Join(ctx.WorkingDir, "foo/Dockerfile"), []byte("FROM debian:latest"), 0644)
+	_ = stageAllAndCommit(t, repo, ctx.WorkingDir, "Add image")
+
+	worktree, err := repo.Worktree()
+	assert.NoError(t, err)
+	gitManger := &Git{r: repo, w: worktree}
+	got, err := gitManger.Head()
+	assert.NoError(t, err)
+	assert.NotEqual(t, "", got)
+}
+
 func TestGit_ResolveRevision(t *testing.T) {
 
 	hash := plumbing.NewHash("hash")