git_pivotal_tracker 0.0.9 → 0.1.0

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'].each do |key|
+      ['only-mine', 'include-rejected', 'fast-forward', 'rebase', 'verbose', 'use-ssl', 'interactive'].each do |key|
         options[key.sub(/-/, '_').to_sym] = repository.config["pivotal.#{key}"] == '1'
       end
 
@@ -95,6 +95,7 @@ module GitPivotalTracker
         opts.on("-S", "--use-ssl", "Use SSL for connection to Pivotal Tracker") { |s| options[:use_ssl] = s }
         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_tail("-h", "--help", "This usage guide") { put opts.to_s; exit 0 }
       end.parse!(args)
     end

data/lib/git_pivotal_tracker/story.rb

@@ -5,8 +5,19 @@ module GitPivotalTracker
       return 1 if super
 
       puts "Retrieving latest #{type} from Pivotal Tracker"
+      story = nil
+      if options[:interactive]
+        stories = fetch_stories(10)
+        stories.each_with_index do |s, i|
+          puts "#{i}) #{s.story_type} #{s.id} #{s.name}"
+        end
+        print "Pick a story: "
+        story = stories[gets.chomp.to_i]
+      else
+        story = fetch_stories.first
+      end
 
-      unless story = fetch_story
+      unless story
         puts "No #{type} available!"
         return 1
       end
@@ -41,12 +52,12 @@ module GitPivotalTracker
 
     private
 
-    def fetch_story
+    def fetch_stories(count = 1)
       state = options[:include_rejected] ? "unstarted,rejected" : "unstarted"
-      conditions = { :current_state => state, :limit => 1 }
+      conditions = { :current_state => state, :limit => count }
       conditions[:story_type] = type == 'story' ? 'bug,chore,feature' : type
       conditions[:owned_by] = "\"#{options[:full_name]}\"" if options[:only_mine]
-      project.stories.all(conditions).first
+      project.stories.all(conditions)
     end
 
     def branch_suffix(story)

data/lib/git_pivotal_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitPivotalTracker
-  VERSION = '0.0.9'
+  VERSION = '0.1.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].each do |key|
+      [:fast_forward, :rebase, :verbose, :use_ssl, :include_rejected, :only_mine, :interactive].each do |key|
         it "does not set #{key}" do
           subject.options[key].should_not be
         end
@@ -73,6 +73,11 @@ describe GitPivotalTracker::Base do
       GitPivotalTracker::Base.new("--verbose").options[:verbose].should be
       GitPivotalTracker::Base.new("-V").options[:verbose].should be
     end
+
+    it "sets interactive" do
+      GitPivotalTracker::Base.new("--interactive").options[:interactive].should be
+      GitPivotalTracker::Base.new("-X").options[:interactive].should be
+    end
   end
 
   describe "#parse_gitconfig" do
@@ -97,7 +102,8 @@ describe GitPivotalTracker::Base do
           'pivotal.fast-forward' => '1',
           'pivotal.rebase' => '1',
           'pivotal.verbose' => '1',
-          'pivotal.use-ssl' => '1'
+          'pivotal.use-ssl' => '1',
+          'pivotal.interactive' => '1'
         })
         subject = GitPivotalTracker::Base.new
       end
@@ -114,7 +120,7 @@ describe GitPivotalTracker::Base do
         subject.options[:project_id].should == '123'
       end
 
-      [:only_mine, :include_rejected, :fast_forward, :rebase, :verbose, :use_ssl].each do |key|
+      [:only_mine, :include_rejected, :fast_forward, :rebase, :verbose, :use_ssl, :interactive].each do |key|
         it "sets #{key}" do
           subject.options[key].should be
         end
@@ -133,12 +139,13 @@ describe GitPivotalTracker::Base do
           'pivotal.fast-forward' => '0',
           'pivotal.rebase' => '0',
           'pivotal.verbose' => '0',
-          'pivotal.use-ssl' => '0'
+          'pivotal.use-ssl' => '0',
+          'pivotal.interactive' => '0'
         })
         subject = GitPivotalTracker::Base.new
       end
 
-      [:only_mine, :include_rejected, :fast_forward, :rebase, :verbose, :use_ssl].each do |key|
+      [:only_mine, :include_rejected, :fast_forward, :rebase, :verbose, :use_ssl, :interactive].each do |key|
         it "does not set #{key}" do
           subject.options[key].should_not be
         end

data/spec/git_pivotal_tracker/finish_spec.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 describe GitPivotalTracker::Finish do
 
   before do
+    File.delete( "test.txt" ) if File.exists?( "test.txt" )
     stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123').
         to_return :body => File.read("#{FIXTURES_PATH}/project.xml")
     stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories/1234567890').
@@ -55,7 +56,7 @@ describe GitPivotalTracker::Finish do
       finish.run!.should == 0
       @repo.head.name.should == @current_head.name
       @repo.commits.first.parents.should have(2).items
-      @repo.heads.detect { |h| h.name == @current_head.name }.commit.sha.should == @sha
+      @repo.commits( @current_head.name ).first.sha.should == @sha
     end
 
     context "when I have rebase turned on" do

metadata

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