pivotal-github 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d039f8d1d57b58263b8a4738a65294636438cae
-  data.tar.gz: 1218c1afbc685ef1e201a6233fd4d9cbdb42ebd6
+  metadata.gz: 7edfc02ec43d1db0604e8c23d5aaae998647d4a0
+  data.tar.gz: 3af75ec9f3c920ffc85b6d0f63f390c09edf264f
 SHA512:
-  metadata.gz: 9933d2bd69190dddb4c77306e2bae65f11510bcce7db7374cd14c42f0827990ee5c2fb464a5821e0f857b3acae825d6b0e67542dbe8aab259c0009358fdd2438
-  data.tar.gz: df212357b1f6257e37f07862ed464c940237b1b633e7674a8301be1b42171c6080dba9e7f5e612a3dfc61e669c75fc4e464e62dfd8feaf28c74f1b73d4666efe
+  metadata.gz: 997b24125e1c6feae448f4cc7e537a07f171833d19c1690a04e51cf889b406c40c5b6f63ab3b6d559fd36d08d0e12ab16809136859ba71f81e45cbbabb5a7ee4
+  data.tar.gz: 51d303e1f43d9ac3e40d047bc6f91d2029f333eb537055eda7a67ddb78a0e7d02efe3354ff7f344c975aab989195bca20d9db9bd8a3145d35c9c6d0afe6bc5e9

data/README.md

@@ -115,13 +115,14 @@ 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. (If you decide you don't want to make the pull request after all, just use `git undo` to restore the previous state.)
+`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.
 
 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.
 
 #### Options
 
     Usage: git story-pull-request [options]
+        -b, --base-branch <branch>       base branch for delivered ids
         -o, --override                   override unfinished story warning
         -h, --help                       this usage guide
 
@@ -202,7 +203,7 @@ Here's the process in detail:
 6. At the GitHub page for the repo, select **Branches** and submit a pull request
 6. (On OS X, replace the previous two steps with `git story-pull-request`)
 6. Assign the pull request to Bob at GitHub
-7. On the Pivotal Tracker story, add a comment with the pull request URL, and optionally change the **Owner** to Bob
+7. On the Pivotal Tracker story, change the **Owner** to Bob
 8. Continue working, taking care to branch off of the current story branch if its changes are required to continue
 
 Rather than immediately submitting a pull request, Alice can also continue by branching off the previous story branch, working on a set of related features, and then issue Bob a pull request for the final branch when she reaches a natural stopping place.

data/lib/pivotal-github/story_pull_request.rb

@@ -8,7 +8,8 @@ class StoryPullRequest < FinishedCommand
   def parser
     OptionParser.new do |opts|
       opts.banner = "Usage: git story-pull-request [options]"
-      opts.on("-b", "--base-branch", "base branch for delivered ids") do |opt|
+      opts.on("-b <branch>", "--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|
@@ -25,6 +26,10 @@ class StoryPullRequest < FinishedCommand
     "[Delivers ##{id}](#{story_url(id)})"
   end
 
+  def base_branch
+    options.base_branch || 'master'
+  end
+
   # Returns a commit message with links to all the delivered stories.
   def commit_message
     ids = delivered_ids(`git log #{base_branch}..HEAD`)
@@ -42,8 +47,4 @@ class StoryPullRequest < FinishedCommand
   end
 
   private
-
-    def base_branch
-      options.base_branch || 'master'
-    end
 end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

data/spec/commands/story_pull_request_spec.rb

@@ -18,6 +18,11 @@ 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/ }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Michael Hartl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-utils