pivotal-github 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 727659cf612b3572160046ca9f12608acf16698a
-  data.tar.gz: cc892a9b14ca4d3538d64b345d69c65825945fe8
+  metadata.gz: 14cc1b18c4f212885bef01e59a3ec1afb2dee62b
+  data.tar.gz: 9db260b070a5e61863d5f1c6bf497291775ad79f
 SHA512:
-  metadata.gz: 0af10b8c3ef1fa9348d4aa4b06aee3bb552100258859a49af400ba809f79d286edf8b18f1a4066bc1322ece1a8ff686f0987d8724354ae5b5c07186a338306f2
-  data.tar.gz: 107f5d9c12867a47b3e548770cfe96fe1fc5ff5126859b70463101efc7599690a0d4ad46060491291b410fc0d2020895449acf0fdaa3c3069b462e0f7da4e3aa
+  metadata.gz: 121e1d1a29a105bf95adba4343c3c6456359549363f32e666f8d0e402e8d787d3d9d10b8313428c34a3e4fb01c04170d110a4188f667ad8fc337bde84548e0f8
+  data.tar.gz: da5c6538f8b44413c460de83da555c916a65301f1b5ad07c9ac865de5e4278c1182eb9fa1dbdfae2d14170d8313fc0e54c021bc0c5196b0d5deda44a93fb9434

data/README.md

@@ -115,7 +115,7 @@ Additionally, `git story-merge` accepts any options valid for `git merge`.
 
     $ git story-pull-request
 
-`git story-pull-request` issues a `git push-branch` as well (from [git-utils](https://github.com/mhartl/git-utils)), just in case the local branch hasn't yet been pushed up to the remote repository. For reference, it then makes a commit containing a message with links to all the delivered story ids. These ids are determined relative to a base branch; this is `master` by default, but if there have been a series of topic branches then the base branch should be set (using the `-b` option) to the branch of the previous pull request. The pull request message includes the branch used for the request, so this previous branch can be determined using `git log`.
+`git story-pull-request` issues a `git push-branch` as well (from [git-utils](https://github.com/mhartl/git-utils)), just in case the local branch hasn't yet been pushed up to the remote repository. For reference, it then makes a commit containing a message with links to all the delivered story ids. These ids consist of all the delivered stories that haven't already been delivered by a pull request.
 
 As with `git story-merge`, by default `git story-pull-request` exits with a warning if the most recent commit doesn't finish the story.
 

data/lib/pivotal-github/story.rb

@@ -7,11 +7,36 @@ module Story
 
   # Returns the ids of delivered stories found in the given text.
   def delivered_ids(text)
-    delivered  = text.scan(/\[Deliver(?:s|ed) (.*?)\]/).flatten
+    delivered = text.scan(/\[Deliver(?:s|ed) (.*?)\]/).flatten
     # Handle multiple ids, i.e., '[Delivers #<id 1> #<id 2>]'
     delivered.inject([]) do |ids, element|
       ids.concat(element.scan(/[0-9]{8,}/).flatten)
       ids
     end.uniq
   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_ids(fast_log_delivered_text).uniq
+  end
+
+  def fast_log_delivered_text
+    @delivered_text ||= `git log -E --grep '\\[Deliver(s|ed) #'`
+  end
+
+  # Returns the ids delivered since the last pull request.
+  # We omit the ids of stories that have already been delivered by a
+  # particular pull request, so that each new PR is only tagged with stories
+  # delivered since the *last* PR.
+  def delivered_ids_since_last_pr(text)
+    delivered_ids(text) - pr_ids(text)
+  end
+
+  # Returns the ids included in previous pull requests.
+  def pr_ids(text)
+    text.scan(/\[Deliver(?:s|ed) #(.*?)\]\(https:\/\//).flatten.uniq
+  end
 end

data/lib/pivotal-github/story_accept.rb

@@ -37,15 +37,6 @@ class StoryAccept < Command
     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_text = `git log -E --grep '\\[Deliver(s|ed) #'`
-    delivered_ids(delivered_text).uniq
-  end
-
   def pivotal_tracker_ids(filter)
     uri = URI.parse("#{project_uri}/stories?filter=#{CGI::escape(filter)}")
     response = Net::HTTP.start(uri.host, uri.port) do |http|

data/lib/pivotal-github/story_pull_request.rb

@@ -8,10 +8,6 @@ class StoryPullRequest < FinishedCommand
   def parser
     OptionParser.new do |opts|
       opts.banner = "Usage: git story-pull-request [options]"
-      opts.on("-b", "--base-branch BRANCH",
-              "base branch for delivered ids") do |opt|
-        self.options.base_branch = opt
-      end
       opts.on("-o", "--override", "override unfinished story warning") do |opt|
         self.options.override = opt
       end
@@ -26,10 +22,6 @@ class StoryPullRequest < FinishedCommand
     "[Delivers ##{id}](#{story_url(id)})"
   end
 
-  def base_branch
-    options.base_branch || 'master'
-  end
-
   # Returns a commit message with the branch being used for the pull request.
   def short_message
     "Issue pull request for branch #{story_branch}"
@@ -37,7 +29,7 @@ class StoryPullRequest < FinishedCommand
 
   # Returns a commit message with links to all the delivered stories.
   def long_message
-    ids = delivered_ids(`git log #{base_branch}..HEAD`)
+    ids = delivered_ids_since_last_pr(fast_log_delivered_text)
     ids.map { |id| delivers_url(id) }.join("\n")
   end
 

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "1.2.0"
+    VERSION = "1.2.2"
   end
 end

data/spec/commands/story_commit_spec.rb

@@ -80,7 +80,8 @@ describe StoryCommit do
 
     describe "when used with branches containing multiple stories" do
       before do
-        command.stub(:story_branch).and_return('62831853-tau-manifesto-31415926')
+        command.stub(:story_branch).
+                and_return('62831853-tau-manifesto-31415926')
       end
       its(:cmd) do
         delivered_ids = '#62831853 #31415926'
@@ -97,7 +98,8 @@ describe StoryCommit do
 
     describe "when used with branches containing multiple stories" do
       before do
-        command.stub(:story_branch).and_return('62831853-tau-manifesto-31415926')
+        command.stub(:story_branch).
+                and_return('62831853-tau-manifesto-31415926')
       end
       its(:cmd) do
         delivered_ids = '#62831853 #31415926'

data/spec/commands/story_pull_request_spec.rb

@@ -7,7 +7,8 @@ describe StoryPullRequest do
   before do
     command.stub(:remote_location).
             and_return('https://github.com/mhartl/foo')
-    command.stub(:delivered_ids).and_return(['62831853', '31415926'])
+    command.stub(:delivered_ids_since_last_pr).
+            and_return(['62831853', '31415926'])
     command.stub(:write_pr_file).and_return('')
   end
   subject { command }
@@ -19,11 +20,6 @@ describe StoryPullRequest do
     should include '[Delivers #31415926]'
   end
 
-  describe "base branch override" do
-    let(:command) { StoryPullRequest.new(['-b', 'development']) }
-    its(:base_branch) { should eq 'development' }
-  end
-
   describe "command-line command" do
     subject { `bin/git-story-pull-request --debug` }
     it { should_not match /\.git/ }

data/spec/story_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Story do
+  include Story
+
+  describe '#story_url' do
+    let(:id) { '62831853' }
+    subject { story_url(id) }
+    it { should include id }
+  end
+
+  describe '#delivered_ids_since_last_pr' do
+    let(:text) do <<-EOS
+      [Delivers #62831853 #31415926]
+      [Delivered #27182818]
+
+      [Delivers #55203510](https://www.pivotaltracker.com/story/show/55203510)
+      [Delivers #55202656](https://www.pivotaltracker.com/story/show/55202656)
+
+      [Delivers #55202656]
+      EOS
+    end
+    subject { delivered_ids_since_last_pr(text) }
+
+    it { should include '62831853' }
+    it { should include '31415926' }
+    it { should include '27182818' }
+    it { should_not include '55203510' }
+    it { should_not include '55202656' }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Michael Hartl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-utils
@@ -89,6 +89,7 @@ files:
 - spec/commands/story_pull_request_spec.rb
 - spec/options/options_spec.rb
 - spec/spec_helper.rb
+- spec/story_spec.rb
 homepage: https://github.com/mhartl/pivotal-github
 licenses:
 - MIT
@@ -123,3 +124,4 @@ test_files:
 - spec/commands/story_pull_request_spec.rb
 - spec/options/options_spec.rb
 - spec/spec_helper.rb
+- spec/story_spec.rb