git_pivotal_tracker 0.0.5 → 0.0.6

data/lib/git_pivotal_tracker/base.rb

@@ -87,6 +87,9 @@ module GitPivotalTracker
         opts.on("-b", "--integration-branch=", "The branch to merge finished stories back down onto") { |b| options[:integration_branch] = b }
         opts.on("-n", "--full-name=", "Your Pivotal Tracker full name") { |n| options[:full_name] = n }
 
+
+        opts.on("-I", "--include-rejected", "Include rejected stories as well as unstarted ones") { |i| options[:include_rejected] = i }
+        opts.on("-O", "--only-mine", "Only include stories that are assigned to me") { |o| options[:only_mine] = o }
         opts.on("-F", "--fast-forward", "Merge topic branch with fast forward") { |f| options[:fast_forward] = f }
         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 }

data/lib/git_pivotal_tracker/story.rb

@@ -39,7 +39,9 @@ module GitPivotalTracker
     private
 
     def fetch_story
-      conditions = { :current_state => "unstarted", :limit => 1 }
+      state = options[:include_rejected] ? "unstarted,rejected" : "unstarted"
+      conditions = { :current_state => state, :limit => 1 }
+      conditions[:owned_by] = "\"#{options[:full_name]}\"" if options[:only_mine]
       conditions[:story_type] = type unless type == 'story'
       project.stories.all(conditions).first
     end

data/lib/git_pivotal_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitPivotalTracker
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/git_pivotal_tracker/base_spec.rb

@@ -32,6 +32,14 @@ describe GitPivotalTracker::Base do
       it "leaves full_name nil" do
         subject.options[:full_name].should be_nil
       end
+
+      it "leaves include_rejected nil" do
+        subject.options[:include_rejected].should be_nil
+      end
+
+      it "leaves only_mine nil" do
+        subject.options[:only_mine].should be_nil
+      end
     end
 
     it "sets the api_token" do
@@ -54,6 +62,16 @@ describe GitPivotalTracker::Base do
       GitPivotalTracker::Base.new("-n", "Full Name").options[:full_name].should == 'Full Name'
     end
 
+    it "sets include_rejected" do
+      GitPivotalTracker::Base.new("--include-rejected").options[:include_rejected].should be
+      GitPivotalTracker::Base.new("-I").options[:include_rejected].should be
+    end
+
+    it "sets only_mine" do
+      GitPivotalTracker::Base.new("--only-mine").options[:only_mine].should be
+      GitPivotalTracker::Base.new("-O").options[:only_mine].should be
+    end
+
     it "sets fast_forward" do
       GitPivotalTracker::Base.new("--fast-forward").options[:fast_forward].should be
       GitPivotalTracker::Base.new("-F").options[:fast_forward].should be
@@ -147,13 +165,15 @@ describe GitPivotalTracker::Base do
     end
 
     context "given no prepare-commit-msg hook" do
+      let(:file_name) { ".git/hooks/prepare-commit-msg" }
+
       before do
-        File.delete ".git/hooks/prepare-commit-msg"
+        File.delete file_name if File.exists? file_name
         GitPivotalTracker::Base.new
       end
 
       it "installs the hook" do
-        File.executable?(".git/hooks/prepare-commit-msg").should be
+        File.executable?(file_name).should be
       end
     end
   end

data/spec/git_pivotal_tracker/story_spec.rb

@@ -5,10 +5,9 @@ describe GitPivotalTracker::Story do
     before do
       stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123').
           to_return :body => File.read("#{FIXTURES_PATH}/project.xml")
+      @story = GitPivotalTracker::Story.new("-t", "8a8a8a8", "-p", "123")
     end
 
-    let(:story) { GitPivotalTracker::Story.new("-t", "8a8a8a8", "-p", "123") }
-
     context "given there are no stories" do
       before do
         stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted&limit=1').
@@ -16,51 +15,83 @@ describe GitPivotalTracker::Story do
       end
 
       it "fails" do
-        story.run!.should == 1
+        @story.run!.should == 1
       end
     end
 
     context "given there is a story" do
       before do
         start_xml = File.read("#{FIXTURES_PATH}/start_story.xml")
-        stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted&limit=1').
-            to_return :body => File.read("#{FIXTURES_PATH}/one_story.xml")
         stub_request(:put, 'http://www.pivotaltracker.com/services/v3/projects/123/stories/1234567890').
             with(:body => start_xml).to_return(:body => start_xml)
 
-        @current_branch = story.repository.head.name
+        @current_branch = @story.repository.head.name
+
+        @expected_branch = 'feature-1234567890-pause_the_film'
+        @story.repository.git.branch({:D => true}, @expected_branch)
       end
 
-      context "then I accept the default branch suffix" do
+      context "when the include-rejected flag is set" do
         before do
-          @expected_branch = 'feature-1234567890-pause_the_film'
-          story.repository.git.branch({:D => true}, @expected_branch)
+          @story = GitPivotalTracker::Story.new("-t", "8a8a8a8", "-p", "123", "--include-rejected")
 
-          story.should_receive(:gets).and_return "\n"
-          story.run!
+          stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted,rejected&limit=1').
+              to_return :body => File.read("#{FIXTURES_PATH}/one_story.xml")
         end
 
-        it "creates a new branch" do
-          story.repository.head.name.should == @expected_branch
+        it "succeeds" do
+          @story.should_receive(:gets).and_return "\n"
+          @story.run!.should == 0
         end
       end
 
-      context "then I customize the branch suffix" do
+      context "when the only-mine flag is set" do
         before do
-          @expected_branch = 'feature-1234567890-new_name'
-          story.repository.git.branch({:D => true}, @expected_branch)
+          @story = GitPivotalTracker::Story.new("-t", "8a8a8a8", "-p", "123", "--full-name", "Ben Lindsey", "--only-mine")
+          stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted%20owned_by:%22Ben%20Lindsey%22&limit=1').
+              to_return :body => File.read("#{FIXTURES_PATH}/one_story.xml")
+        end
 
-          story.should_receive(:gets).and_return "new_name\n"
-          story.run!
+        it "succeeds" do
+          @story.should_receive(:gets).and_return "\n"
+          @story.run!.should == 0
         end
+      end
+
+      context "when the default options are used" do
+        before do
+          stub_request(:get, 'http://www.pivotaltracker.com/services/v3/projects/123/stories?filter=current_state:unstarted&limit=1').
+              to_return :body => File.read("#{FIXTURES_PATH}/one_story.xml")
+        end
+
+        context "then I accept the default branch suffix" do
+          before do
+            @story.should_receive(:gets).and_return "\n"
+            @story.run!
+          end
+
+          it "creates a new branch" do
+            @story.repository.head.name.should == @expected_branch
+          end
+        end
+
+        context "then I customize the branch suffix" do
+          before do
+            @expected_branch = 'feature-1234567890-new_name'
+            @story.repository.git.branch({:D => true}, @expected_branch)
+
+            @story.should_receive(:gets).and_return "new_name\n"
+            @story.run!
+          end
 
-        it "creates a new branch" do
-          story.repository.head.name.should == @expected_branch
+          it "creates a new branch" do
+            @story.repository.head.name.should == @expected_branch
+          end
         end
       end
 
       after do
-        story.repository.git.checkout({:raise => true}, @current_branch)
+        @story.repository.git.checkout({:raise => true}, @current_branch)
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: git_pivotal_tracker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ben Lindsey
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 -07:00
+date: 2011-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency