repo_tag: add unit tests

Author: unknwon

Diff for: git.go

@@ -40,6 +40,7 @@ func log(format string, args ...interface{}) {
 
 var (
 	// gitVersion stores the Git binary version.
+	// NOTE: To check Git version should call BinVersion not this global variable.
 	gitVersion     string
 	gitVersionOnce sync.Once
 	gitVersionErr  error

Diff for: repo_tag.go

@@ -35,8 +35,6 @@ l:
 				}
 				tag.commitID = id
 			case "type":
-				// A commit can have one or more parents
-				tag.typ = ObjectType(line[spacepos+1:])
 			case "tagger":
 				sig, err := parseSignature(line[spacepos+1:])
 				if err != nil {
@@ -86,11 +84,11 @@ func (r *Repository) getTag(timeout time.Duration, id *SHA1) (*Tag, error) {
 			return nil, err
 		}
 
-		tag, err := parseTag(data)
+		tag, err = parseTag(data)
 		if err != nil {
 			return nil, err
 		}
-
+		tag.typ = ObjectTag
 		tag.id = id
 		tag.repo = r
 	default:
@@ -139,22 +137,27 @@ func (r *Repository) Tag(refspec string, opts ...TagOptions) (*Tag, error) {
 	return tag, nil
 }
 
-// TagListOptions contains optional arguments for listing tags.
+// TagsOptions contains optional arguments for listing tags.
 // Docs: https://git-scm.com/docs/git-tag#Documentation/git-tag.txt---list
-type TagListOptions struct {
+type TagsOptions struct {
 	// The timeout duration before giving up. The default timeout duration will be used when not supplied.
 	Timeout time.Duration
 }
 
-// TagList returns a list of tags in the repository.
-func (r *Repository) TagList(opts ...TagListOptions) ([]string, error) {
-	var opt TagListOptions
+// Tags returns a list of tags in the repository.
+func (r *Repository) Tags(opts ...TagsOptions) ([]string, error) {
+	var opt TagsOptions
 	if len(opts) > 0 {
 		opt = opts[0]
 	}
 
+	version, err := BinVersion()
+	if err != nil {
+		return nil, err
+	}
+
 	cmd := NewCommand("tag", "--list")
-	if goversion.Compare(gitVersion, "2.4.9", ">=") {
+	if goversion.Compare(version, "2.4.9", ">=") {
 		cmd.AddArgs("--sort=-creatordate")
 	}
 
@@ -166,7 +169,7 @@ func (r *Repository) TagList(opts ...TagListOptions) ([]string, error) {
 	tags := strings.Split(string(stdout), "\n")
 	tags = tags[:len(tags)-1]
 
-	if goversion.Compare(gitVersion, "2.4.9", "<") {
+	if goversion.Compare(version, "2.4.9", "<") {
 		goversion.Sort(tags)
 
 		// Reverse order

Diff for: repo_tag_test.go

@@ -0,0 +1,89 @@
+package git
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRepository_Tag(t *testing.T) {
+	tests := []struct {
+		refspec string
+		opt     TagOptions
+		expTag  *Tag
+	}{
+		{
+			refspec: "v1.0.0",
+			expTag: &Tag{
+				typ:      ObjectCommit,
+				id:       MustIDFromString("0eedd79eba4394bbef888c804e899731644367fe"),
+				commitID: MustIDFromString("0eedd79eba4394bbef888c804e899731644367fe"),
+				refspec:  "v1.0.0",
+			},
+		}, {
+			refspec: "v1.1.0",
+			expTag: &Tag{
+				typ:      ObjectTag,
+				id:       MustIDFromString("b39c8508bbc4b00ad2e24d358012ea123bcafd8d"),
+				commitID: MustIDFromString("0eedd79eba4394bbef888c804e899731644367fe"),
+				refspec:  "v1.1.0",
+			},
+		},
+	}
+	for _, test := range tests {
+		t.Run("", func(t *testing.T) {
+			tag, err := testrepo.Tag(test.refspec, test.opt)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			assert.Equal(t, test.expTag.Type(), tag.Type())
+			assert.Equal(t, test.expTag.ID().String(), tag.ID().String())
+			assert.Equal(t, test.expTag.CommitID().String(), tag.CommitID().String())
+			assert.Equal(t, test.expTag.Refspec(), tag.Refspec())
+		})
+	}
+}
+
+func TestRepository_Tags(t *testing.T) {
+	// Make sure it does not blow up
+	tags, err := testrepo.Tags(TagsOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	assert.NotEmpty(t, tags)
+}
+
+func TestRepository_CreateTag(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{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.True(t, r.HasReference(RefsTags+"v2.0.0"))
+}
+
+func TestRepository_DeleteTag(t *testing.T) {
+	r, cleanup, err := setupTempRepo()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer cleanup()
+
+	assert.True(t, r.HasReference(RefsTags+"v1.0.0"))
+
+	err = r.DeleteTag("v1.0.0", DeleteTagOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.False(t, r.HasReference(RefsTags+"v1.0.0"))
+}

Diff for: tag.go

@@ -16,7 +16,37 @@ type Tag struct {
 	repo *Repository
 }
 
+// Type returns the type of the tag.
+func (t *Tag) Type() ObjectType {
+	return t.typ
+}
+
+// ID returns the SHA-1 hash of the tag.
+func (t *Tag) ID() *SHA1 {
+	return t.id
+}
+
+// CommitID returns the commit ID of the tag.
+func (t *Tag) CommitID() *SHA1 {
+	return t.commitID
+}
+
+// Refspec returns the refspec of the tag.
+func (t *Tag) Refspec() string {
+	return t.refspec
+}
+
+// Tagger returns the tagger of the tag.
+func (t *Tag) Tagger() *Signature {
+	return t.tagger
+}
+
+// Message returns the message of the tag.
+func (t *Tag) Message() string {
+	return t.message
+}
+
 // Commit returns the underlying commit of the tag.
-func (tag *Tag) Commit(opts ...CatFileCommitOptions) (*Commit, error) {
-	return tag.repo.CatFileCommit(tag.commitID.String(), opts...)
+func (t *Tag) Commit(opts ...CatFileCommitOptions) (*Commit, error) {
+	return t.repo.CatFileCommit(t.commitID.String(), opts...)
 }