git_pivotal_tracker 0.1.0 → 0.2.0

data/README.md

@@ -65,6 +65,18 @@ If you prefer to fast-forward your merges into the integration branch (default i
 
 ``git config --global pivotal.fast-forward 1``
 
+If you prefer to choose one of the first 10 stories interactively:
+
+``git config --global pivotal.interactive 1``
+
+If you prefer to delete your topic branch after a successful merge into the integration branch:
+
+``git config --global pivotal.delete-branch 1``
+
+If you would only like to take stories that are assigned to you:
+
+``git config --global pivotal.only-mine 1``
+
 If your Pivotal Tracker user name is different than your git user name:
 
 ``git config --global pivotal.full-name 'Ben Lindsey'``
@@ -76,12 +88,13 @@ If you would like verbose logging turned on for git commands:
 Author
 ------
 
-* Ben Lindsey <ben@carbonfive.com>
+* Ben Lindsey <ben@cumulo.us>
 
 Contributors
 ------
 
-* [https://github.com/lyahdav](Liron Yahdav)
+* [Liron Yahdav](https://github.com/lyahdav)
+* [Philippe Huibonhoa](https://github.com/phuibonhoa)
 
 License
 -------

data/lib/git_pivotal_tracker/base.rb

@@ -73,7 +73,7 @@ module GitPivotalTracker
         options[key.sub(/-/, '_').to_sym] = repository.config["pivotal.#{key}"]
       end
 
-      ['only-mine', 'include-rejected', 'fast-forward', 'rebase', 'verbose', 'use-ssl', 'interactive'].each do |key|
+      ['only-mine', 'include-rejected', 'fast-forward', 'rebase', 'verbose', 'use-ssl', 'interactive', 'delete-branch'].each do |key|
         options[key.sub(/-/, '_').to_sym] = repository.config["pivotal.#{key}"] == '1'
       end
 
@@ -96,6 +96,7 @@ module GitPivotalTracker
         opts.on("-R", "--rebase", "Fetch and rebase the integration branch before merging") { |r| options[:rebase] = r }
         opts.on("-V", "--verbose", "Verbose command logging") { |v| options[:verbose] = v }
         opts.on("-X", "--interactive", "Interactive story picking") { |x| options[:interactive] = x }
+        opts.on("-D", "--delete-branch", "Delete topic branch after merge") { |d| options[:delete_branch] = d }
         opts.on_tail("-h", "--help", "This usage guide") { put opts.to_s; exit 0 }
       end.parse!(args)
     end

data/lib/git_pivotal_tracker/finish.rb

@@ -28,6 +28,7 @@ module GitPivotalTracker
 
       puts "Marking Story #{story_id} as finished..."
       if story.update(:current_state => finished_state)
+        delete_current_branch if options[:delete_branch]
         puts "Success"
         return 0
       else
@@ -44,5 +45,10 @@ module GitPivotalTracker
     def finished_state
       story.story_type == "chore" ? "accepted" : "finished"
     end
+
+    def delete_current_branch
+      puts "Deleting #{current_branch}"
+      log repository.git.branch({:raise => true, :d => true}, current_branch)
+    end
   end
 end

data/lib/git_pivotal_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitPivotalTracker
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/git_pivotal_tracker/base_spec.rb

@@ -17,7 +17,7 @@ describe GitPivotalTracker::Base do
         subject.options[:full_name].should be_nil
       end
 
-      [:fast_forward, :rebase, :verbose, :use_ssl, :include_rejected, :only_mine, :interactive].each do |key|
+      [:fast_forward, :rebase, :verbose, :use_ssl, :include_rejected, :only_mine, :interactive, :delete_branch].each do |key|
         it "does not set #{key}" do
           subject.options[key].should_not be
         end
@@ -78,6 +78,11 @@ describe GitPivotalTracker::Base do
       GitPivotalTracker::Base.new("--interactive").options[:interactive].should be
       GitPivotalTracker::Base.new("-X").options[:interactive].should be
     end
+
+    it "sets delete_branch" do
+      GitPivotalTracker::Base.new("--delete-branch").options[:delete_branch].should be
+      GitPivotalTracker::Base.new("-D").options[:delete_branch].should be
+    end
   end
 
   describe "#parse_gitconfig" do
@@ -103,7 +108,8 @@ describe GitPivotalTracker::Base do
           'pivotal.rebase' => '1',
           'pivotal.verbose' => '1',
           'pivotal.use-ssl' => '1',
-          'pivotal.interactive' => '1'
+          'pivotal.interactive' => '1',
+          'pivotal.delete-branch' => '1'
         })
         subject = GitPivotalTracker::Base.new
       end
@@ -120,7 +126,7 @@ describe GitPivotalTracker::Base do
         subject.options[:project_id].should == '123'
       end
 
-      [:only_mine, :include_rejected, :fast_forward, :rebase, :verbose, :use_ssl, :interactive].each do |key|
+      [:only_mine, :include_rejected, :fast_forward, :rebase, :verbose, :use_ssl, :interactive, :delete_branch].each do |key|
         it "sets #{key}" do
           subject.options[key].should be
         end

data/spec/git_pivotal_tracker/finish_spec.rb

@@ -59,6 +59,11 @@ describe GitPivotalTracker::Finish do
       @repo.commits( @current_head.name ).first.sha.should == @sha
     end
 
+    it "does not delete the topic branch" do
+      finish.run!.should == 0
+      @repo.git.branch.should match @new_branch
+    end
+
     context "when I have rebase turned on" do
       before do
         finish.options[:rebase] = 1
@@ -81,5 +86,16 @@ describe GitPivotalTracker::Finish do
         @repo.heads.detect { |h| h.name == @current_head.name }.commit.sha.should == @sha
       end
     end
+
+    context "when I have delete branch turned on" do
+      before do
+        finish.options[:delete_branch] = 1
+      end
+
+      it "deletes the topic branch after merging" do
+        finish.run!.should == 0
+        @repo.git.branch.should_not match @new_branch
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_pivotal_tracker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70146443531320 !ruby/object:Gem::Requirement
+  requirement: &70254038532080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146443531320
+  version_requirements: *70254038532080
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70146443530860 !ruby/object:Gem::Requirement
+  requirement: &70254038531620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146443530860
+  version_requirements: *70254038531620
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70146443530440 !ruby/object:Gem::Requirement
+  requirement: &70254038531200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70146443530440
+  version_requirements: *70254038531200
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70146443526940 !ruby/object:Gem::Requirement
+  requirement: &70254038530780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146443526940
+  version_requirements: *70254038530780
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
-  requirement: &70146443526520 !ruby/object:Gem::Requirement
+  requirement: &70254038530360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146443526520
+  version_requirements: *70254038530360
 description: provides a set of git workflow tools to start and finish Pivotal Tracker
   stories in topic branches
 email: