treet 0.13.1 → 0.14.0

data/lib/treet/gitrepo.rb

@@ -25,19 +25,25 @@ class Treet::Gitrepo < Treet::Repo
     gitrepo.refs(/tags/)
   end
 
-  def tag(tagname)
+  def tag(tagname, opts = {})
     refname = "refs/tags/#{tagname}"
-    begin
-      if tag_ref = Rugged::Reference.lookup(gitrepo, refname)
-        # move an existing tag
-        tag_ref.target = head.target
-      else
-        # new tag
-        Rugged::Reference.create(gitrepo, refname, head.target)
-      end
-    rescue Rugged::ReferenceError
-      # invalid string for source, e.g. blank or illegal punctuation (colons)
-      raise ArgumentError, "invalid source string '#{tagname}' for repository tagging"
+    commit = opts[:commit] || head.target
+    if tag_ref = Rugged::Reference.lookup(gitrepo, refname)
+      # move an existing tag
+      tag_ref.target = commit
+    else
+      # new tag
+      Rugged::Reference.create(gitrepo, refname, commit)
+    end
+  rescue Rugged::ReferenceError, Rugged::InvalidError => e
+    # invalid string for source, e.g. blank or illegal punctuation (colons)
+    # or opts[:commit] is invalid
+    raise ArgumentError, "unable to tag '#{tagname}' on repo: #{e.message}"
+  end
+
+  def detag(tagname)
+    if tag_ref = Rugged::Reference.lookup(gitrepo, "refs/tags/#{tagname}")
+      tag_ref.delete!
     end
   end
 

data/lib/treet/version.rb

@@ -1,3 +1,3 @@
 module Treet
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end

data/spec/lib/test_gitrepo.rb

@@ -8,7 +8,7 @@ require "test_helper"
 # patch a gitrepo (with commit) - verify commit structure
 # pulling past snapshots
 
-describe Treet::Gitrepo do
+class GitrepoTests < MiniTest::Spec
   def self.make_gitrepo(filename, opts = {})
     thash = Treet::Hash.new(load_json(filename))
     trepo = thash.to_repo(Dir.mktmpdir('repo', $topdir))
@@ -123,8 +123,8 @@ describe Treet::Gitrepo do
 
 
   describe "a patched gitrepo" do
-    def self.patch_johnb
-      @memo ||= begin
+    def repo
+      @@repo_patch ||= begin
         data = {
           "name" => {
             "full" => "John Bigbooté"
@@ -133,18 +133,17 @@ describe Treet::Gitrepo do
         thash = Treet::Hash.new(data)
         trepo = thash.to_repo(Dir.mktmpdir('repo', $topdir))
         r = Treet::Gitrepo.new(trepo.root, :author => {:name => 'Bob', :email => 'bob@example.com'})
-        r.patch([
-          [
-            "+",
-            "org.name",
-            "Bigcorp"
-          ]
-        ])
+        @@v1 = r.version
+        r.patch([["+", "org.name", "Bigcorp"]])
+        @@v2 = r.version
+        r.patch([["+", "name.first", "John"], ["+", "name.last", "Bigbooté"]])
+        @@v3 = r.version
+        r.patch([["+", "name.last", "Bigbritches"]])
         r
       end
     end
 
-    let(:repo) { self.class.patch_johnb }
+    # let(:repo) { self.class.patch_johnb }
 
     it "should have correct git index" do
       repo.index.count.must_equal 2
@@ -153,26 +152,35 @@ describe Treet::Gitrepo do
     end
 
     it "should hashify correctly" do
-      expectation = load_json('one').merge({'org' => {'name' => 'Bigcorp'}})
+      expectation = {
+        'name' => {'full' => 'John Bigbooté', 'first' => 'John', 'last' => 'Bigbritches'},
+        'org' => {'name' => 'Bigcorp'}
+      }
       repo.to_hash.must_equal expectation
     end
 
     it "should have 2 commits" do
       r = Rugged::Repository.new(repo.root)
       latest_commit = r.head.target
-      r.lookup(latest_commit).parents.count.must_equal 1
-      previous_commit = r.lookup(latest_commit).parents.first
-      previous_commit.parents.must_be_empty
+      walker = Rugged::Walker.new(r)
+      walker.push(latest_commit)
+      walker.count.must_equal 4
     end
 
     it "should have no tags" do
       repo.tags.must_be_empty
     end
 
-    # it "should be able to reverse-engineer the patch from the git history" do
-    #   skip
-    #   # rugged has a `Rugged::Commit#diff-tree` on the roadmap (see `USAGE.rb`), not yet implemented
-    # end
+    it "should be able to attach tags to commits" do
+      repo.tag('foo')
+      repo.version(:tag => 'foo').must_equal repo.version
+      repo.tag('foo', :commit => @@v1)
+      repo.version(:tag => 'foo').must_equal @@v1
+      repo.version(:tag => 'foo').wont_equal repo.version
+      ->{repo.tag('foo', :commit => 'junk')}.must_raise ArgumentError
+      ->{repo.tag('foo', :commit => @@v2.reverse)}.must_raise ArgumentError
+      repo.detag('foo')
+    end
   end
 
   describe "patched with a delete" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treet
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1191802132244638868
+      hash: 3982221712391638709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1191802132244638868
+      hash: 3982221712391638709
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24