Adding Git::Object::Tag .tagger and .message support.

robertodecurnex · robertodecurnex · commit b62ed86ca80f · 2015-01-12T14:14:52.000-03:00
Closes #27
diff --git a/lib/git/author.rb b/lib/git/author.rb
@@ -11,4 +11,4 @@ def initialize(author_string)
     end
     
   end
-end
+end
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -390,7 +390,7 @@ def tags
     #   
     def add_tag(name, *opts)
       self.lib.tag(name, *opts)
-      tag(name)
+      self.tag(name)
     end
  
     # deletes a tag 
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -200,6 +200,31 @@ def process_commit_data(data, sha = nil, indent = 4)
 
       return hsh
     end
+
+    def tag_data(name)
+      sha = sha.to_s
+      tdata = command_lines('cat-file', ['tag', name])
+      process_tag_data(tdata, name, 0)
+    end
+
+    def process_tag_data(data, name, indent=4)
+      hsh = {
+        'name'    => name,
+        'message' => ''
+      }
+
+      loop do
+        key, *value = data.shift.split
+
+        break if key.nil?
+
+        hsh[key] = value.join(' ')
+      end
+      
+      hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
+
+      return hsh
+    end
     
     def process_commit_log_data(data)
       in_message = false
diff --git a/lib/git/object.rb b/lib/git/object.rb
@@ -235,10 +235,10 @@ def commit?
   
         # see if this object has been initialized and do so if not
         def check_commit
-          unless @tree
-            data = @base.lib.commit_data(@objectish)
-            set_commit(data)
-          end
+          return if @tree
+          
+          data = @base.lib.commit_data(@objectish)
+          set_commit(data)
         end
       
     end
@@ -250,14 +250,41 @@ def initialize(base, sha, name)
         super(base, sha)
         @name = name
         @annotated = nil
+        @loaded = false
+      end
+
+      def annotated?
+        @annotated ||= (@base.lib.object_type(self.name) == 'tag')
       end
 
+      def message
+        check_tag()
+        return @message
+      end
+      
       def tag?
         true
       end
 
-      def annotated?
-        @annotated ||= (@base.lib.object_type(self.name) == 'tag')
+      def tagger
+        check_tag()
+        return @tagger
+      end
+
+      private
+
+      def check_tag
+        return if @loaded
+
+        if !self.annotated? 
+          @message = @tagger = nil
+        else
+          tdata = @base.lib.tag_data(@name)
+          @message = tdata['message'].chomp
+          @tagger = Git::Author.new(tdata['tagger'])
+        end
+
+        @loaded = true
       end
         
     end
diff --git a/tests/units/test_tags.rb b/tests/units/test_tags.rb
@@ -11,6 +11,10 @@ def test_tags
     in_temp_dir do |path|
       r1 = Git.clone(@wbare, 'repo1')
       r2 = Git.clone(@wbare, 'repo2')
+      r1.config('user.name', 'Test User')
+      r1.config('user.email', 'test@email.com')
+      r2.config('user.name', 'Test User')
+      r2.config('user.email', 'test@email.com')
         
       assert_raise Git::GitTagNameDoesNotExist do
         r1.tag('first')
@@ -55,8 +59,18 @@ def test_tags
         r2.tag('third')
       end
 
-      assert_true(r2.tag('fourth').annotated?)
-      assert_false(r2.tag('fifth').annotated?)
+      tag1 = r2.tag('fourth')
+      assert_true(tag1.annotated?)
+      assert_equal(tag1.tagger.class, Git::Author)
+      assert_equal(tag1.tagger.name, 'Test User')
+      assert_equal(tag1.tagger.email, 'test@email.com')
+      assert_true((Time.now - tag1.tagger.date) <  10)
+      assert_equal(tag1.message, ' test message')
+      
+      tag2 = r2.tag('fifth')
+      assert_false(tag2.annotated?)
+      assert_equal(tag2.tagger, nil)
+      assert_equal(tag2.message, nil)
     end
   end
 end

-Original file line number
+Diff line change
     end
   end
 -end
 +end
Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ def tags`
`390`	`390`	`#`
`391`	`391`	`def add_tag(name, *opts)`
`392`	`392`	`self.lib.tag(name, *opts)`
`393`		`- tag(name)`
	`393`	`+ self.tag(name)`
`394`	`394`	`end`
`395`	`395`
`396`	`396`	`# deletes a tag`