repo_tag: able to create annotated tag (#70)

Author: sermojohn

command.go

@@ -50,6 +50,12 @@ func (c *Command) AddEnvs(envs ...string) *Command {
 	return c
 }
 
+// AddCommitter appends given committer to the command.
+func (c *Command) AddCommitter(committer *Signature) *Command {
+	c.AddEnvs("GIT_COMMITTER_NAME="+committer.Name, "GIT_COMMITTER_EMAIL="+committer.Email)
+	return c
+}
+
 // DefaultTimeout is the default timeout duration for all commands.
 const DefaultTimeout = time.Minute
 

repo.go

@@ -428,7 +428,7 @@ func CreateCommit(repoPath string, committer *Signature, message string, opts ..
 	}
 
 	cmd := NewCommand("commit")
-	cmd.AddEnvs("GIT_COMMITTER_NAME="+committer.Name, "GIT_COMMITTER_EMAIL="+committer.Email)
+	cmd.AddCommitter(committer)
 
 	if opt.Author == nil {
 		opt.Author = committer

repo_tag.go

@@ -209,6 +209,12 @@ func (r *Repository) Tags(opts ...TagsOptions) ([]string, error) {
 //
 // Docs: https://git-scm.com/docs/git-tag
 type CreateTagOptions struct {
+	// Annotated marks a tag as annotated rather than lightweight.
+	Annotated bool
+	// Message specifies a tagging message for the annotated tag. It is ignored when tag is not annotated.
+	Message string
+	// Author is the author of the tag. It is ignored when tag is not annotated.
+	Author *Signature
 	// The timeout duration before giving up for each shell command execution. The
 	// default timeout duration will be used when not supplied.
 	Timeout time.Duration
@@ -221,7 +227,20 @@ func (r *Repository) CreateTag(name, rev string, opts ...CreateTagOptions) error
 		opt = opts[0]
 	}
 
-	_, err := NewCommand("tag", name, rev).RunInDirWithTimeout(opt.Timeout, r.path)
+	cmd := NewCommand("tag")
+	if opt.Annotated {
+		cmd.AddArgs("-a", name)
+		cmd.AddArgs("--message", opt.Message)
+		if opt.Author != nil {
+			cmd.AddCommitter(opt.Author)
+		}
+	} else {
+		cmd.AddArgs(name)
+	}
+
+	cmd.AddArgs(rev)
+
+	_, err := cmd.RunInDirWithTimeout(opt.Timeout, r.path)
 	return err
 }
 

repo_tag_test.go

@@ -106,6 +106,38 @@ func TestRepository_CreateTag(t *testing.T) {
 	assert.True(t, r.HasReference(RefsTags+"v2.0.0"))
 }
 
+func TestRepository_CreateAnnotatedTag(t *testing.T) {
+	r, cleanup, err := setupTempRepo()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer cleanup()
+
+	assert.False(t, r.HasReference(RefsTags+"v2.0.0"))
+
+	err = r.CreateTag("v2.0.0", "master", CreateTagOptions{
+		Annotated: true,
+		Author: &Signature{
+			Name:  "alice",
+			Email: "[email protected]",
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.True(t, r.HasReference(RefsTags+"v2.0.0"))
+
+	tag, err := r.Tag("v2.0.0")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, "alice", tag.tagger.Name)
+	assert.Equal(t, "[email protected]", tag.tagger.Email)
+	assert.False(t, tag.tagger.When.IsZero())
+}
+
 func TestRepository_DeleteTag(t *testing.T) {
 	r, cleanup, err := setupTempRepo()
 	if err != nil {