pivotal-github 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d5c6c4ff6bc562432cdad32deefcadd1095ce31
-  data.tar.gz: 4ad424a5c6365e1bea404ecef4bec42ddab9e61d
+  metadata.gz: 790d9af1927198ccaa10a814e1b55e7ac8297427
+  data.tar.gz: 19ac915287456c91a30b2186738a12a83cc49b7e
 SHA512:
-  metadata.gz: 9d4e770331dccb47984810e94565c198290687d7adb4168bd2577ffb7afd1a3e1e1227a5fd4ce4964ce6ba05efc2054efe09b5b81f4273d858549bfa77517f7a
-  data.tar.gz: 89fcc3a626db9d8fca1f3e16663404f45311d05f453962c9ed3da114838ae352b47b3ad430f19bdd1c14178668c83758301e7d53bb206bdce9c9fdbe9c1e13bd
+  metadata.gz: 66d8f52e653b9a08848bbc01937cab720d7a37db2367ea8ee0bb94af683ab7673893c3d890dc768fda4aa9ce6e0ca17aa634b36f4781b46759fcc734e5818372
+  data.tar.gz: ede4d84d31bc6c87cf7fadf9c151106c9002d8d99322989077cf80e30ce1ed61ee8fb0516bc7f30dba47b00c13d11adcac9b3c43e426779b23e64fcb5dd6c5be

data/README.md

@@ -132,8 +132,6 @@ As with `git story-merge`, by default `git story-pull-request` exits with a warn
 
 The purpose of `git story-accept` is to accept stories that have been merged into `master`, so by default it works only on the master branch. This requirement can be overridden by the `--override` option.
 
-In order to avoid reading the entire Git log every time it's run, by default `git story-accept` stops immediately after finding a story that has already been accepted. The assumption is that `git story-accept` is run immediately after merging a pull request into a master branch that is always up-to-date, so that there are no delivered but unaccepted stories further down in the log.
-
 `git story-accept` requires the existence of `.api_token` and `.project_id` files containing the Pivotal Tracker API token and project id, respectively. The user is prompted to create them if they are not present. (They aren't read from the command line using `gets` due to an incompatibility with options passing.)
 
 #### Options
@@ -141,8 +139,8 @@ In order to avoid reading the entire Git log every time it's run, by default `gi
     Usage: git story-accept [options]
         -o, --override                   override master branch requirement
         -q, --quiet                      suppress display of accepted story ids
-        -a, --all                        process all stories (entire log)
         -h, --help                       this usage guide
+
 ### story-open
 
 The `story-open` command (no `git`) opens the current story in the default browser (OS X–only):

data/lib/pivotal-github/story_accept.rb

@@ -16,9 +16,6 @@ class StoryAccept < Command
       opts.on("-q", "--quiet", "suppress display of accepted story ids") do |opt|
         self.options.quiet = opt
       end
-      opts.on("-a", "--all", "process all stories (entire log)") do |opt|
-        self.options.all = opt
-      end
       opts.on_tail("-h", "--help", "this usage guide") do
         puts opts.to_s; exit 0
       end
@@ -32,24 +29,38 @@ class StoryAccept < Command
   end
 
   # Returns the ids to accept.
-  # These ids are of the form [Delivers #<story id>] or
-  # [Delivers #<story id> #<another story id>].
+  # The stories to accept are the set intersection of the delivered stories
+  # according to the Git log and according to Pivotal Tracker.
   def ids_to_accept
-    delivered_lines = `git log | egrep '\\[Deliver(s|ed) #'`.split("\n")
+    git_log_delivered_story_ids & pivotal_tracker_delivered_story_ids
+  end
+
+  # Returns the ids of delivered stories according to the Git log.
+  # These ids are of the form [Delivers #<story id>] or
+  # [Delivers #<story id> #<another story id>]. The difference is handled
+  # by the delivered_ids method.
+  def git_log_delivered_story_ids
+    delivered_lines = `git log | egrep '\\[Deliver(s|ed) #'`.split("\n").uniq
     delivered_lines.inject([]) do |accept, line|
-      delivered_ids(line).each do |commit_id|
-        return accept if already_accepted?(commit_id) && !options.all
-        accept << commit_id
-        accept.uniq!
-      end
-      accept
+      accept << delivered_ids(line)
+    end.uniq
+  end
+
+  # Returns the ids of delivered stories according to Pivotal Tracker.
+  def pivotal_tracker_delivered_story_ids
+    data = { 'X-TrackerToken' => api_token,
+             'Content-type'   => "application/xml" }
+    uri = URI.parse("#{project_uri}/stories?filter=state%3Adelivered")
+    response = Net::HTTP.start(uri.host, uri.port) do |http|
+      http.get(uri.path, data)
     end
+    Nokogiri::XML(response.body).css('id').map(&:content)
   end
 
   # Returns true if a story has already been accepted.
   def already_accepted?(story_id)
     data = { 'X-TrackerToken' => api_token,
-             'Content-type' => "application/xml" }
+             'Content-type'   => "application/xml" }
     uri = story_uri(story_id)
     response = Net::HTTP.start(uri.host, uri.port) do |http|
       http.get(uri.path, data)
@@ -122,8 +133,11 @@ class StoryAccept < Command
       'http://www.pivotaltracker.com/services/v3'
     end
 
+    def project_uri
+      URI.parse("#{api_base}/projects/#{project_id}")
+    end
+
     def story_uri(story_id)
-      uri = "#{api_base}/projects/#{project_id}/stories/#{story_id}"
-      URI.parse(uri)
+      URI.parse("#{project_uri}/stories/#{story_id}")
     end
 end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
   end
 end

data/spec/commands/story_accept_spec.rb

@@ -5,7 +5,10 @@ describe StoryAccept do
   let(:command) { StoryAccept.new(['-o', '-a']) }
   before do
     command.stub(:story_branch).and_return('62831853-tau-manifesto')
-    command.stub(:already_accepted?).and_return(false)
+    command.stub(:git_log_delivered_story_ids).
+            and_return(%w[51204529 51106181 50566167 50566179 60566178])
+    command.stub(:pivotal_tracker_delivered_story_ids).
+            and_return(%w[51204529 51106181 50566167 50566178])
   end
   subject { command }
 
@@ -19,6 +22,9 @@ describe StoryAccept do
     it { should include("51204529") }
     it { should include("51106181") }
     it { should include("50566167") }
+    it { should_not include("50566178") }
+    it { should_not include("50566178") }
+    it { should_not include("60566178") }
 
     it "should not have duplicate ids" do
       expect(ids).to eq ids.uniq
@@ -39,18 +45,4 @@ describe StoryAccept do
       command.run!
     end
   end
-
-  describe "when stopping upon reading the first accepted id" do
-    let(:command) { StoryAccept.new(['-o']) }
-    before do
-      command.stub(:story_branch).and_return('62831853-tau-manifesto')
-      command.stub(:already_accepted?).and_return(false)
-      command.stub(:already_accepted?).with("50566167").and_return(true)
-    end
-    subject { command }
-
-    its(:ids_to_accept) { should include("51204529") }
-    its(:ids_to_accept) { should include("51106181") }
-    its(:ids_to_accept) { should_not include("50566167") }
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Michael Hartl