pivotal-github 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee37c7adebef4d6cbb5c5716c8cd51769d58e8b
-  data.tar.gz: ac797758f8093b15876b523563e5b3e0968cf92e
+  metadata.gz: 0153297904674bee8177bc900ba75511e50a7a77
+  data.tar.gz: 43442746d793f8c258712798d5302fdf46459de6
 SHA512:
-  metadata.gz: 34f804ea2699b8eae40165063c8323295a28601c6624085715a12e94850d3b16c126e57df2942b4525268a61aca1de26e0d4f2916cc6990bd36fa227327932e1
-  data.tar.gz: 459cfe8b759904fe11f6bd9667815f65c934f5c6d87da7b4b505b158c9b8dfcb62c41c370e764e44418d7a40779f863f93199cffd7da9336ae4a69b3f871ee3c
+  metadata.gz: d8ecaf622b62ce28025740ffd4867286b7621a1da4b4289b5476e25ec26bbd5db7938c5d51e64fd147adf616495c6aa3bfc549460e75d11687435885f93f0d5a
+  data.tar.gz: 66c2fe445678ebbd961d9f2cac5ee35cf32e252b0d95aff1760121c915c140c27476ff94557171b46ca090687838262d45b04020aeeed32d5ab1cf11b894583b

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.
+`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`.
 
 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_pull_request.rb

@@ -30,8 +30,13 @@ class StoryPullRequest < FinishedCommand
     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}"
+  end
+
   # Returns a commit message with links to all the delivered stories.
-  def commit_message
+  def long_message
     ids = delivered_ids(`git log #{base_branch}..HEAD`)
     ids.map { |id| delivers_url(id) }.join("\n")
   end
@@ -41,10 +46,8 @@ class StoryPullRequest < FinishedCommand
     Dir.mkdir '.pull_requests' unless File.directory?('.pull_requests')
     c =  ["touch .pull_requests/`date '+%s'`"]
     c << "git add ."
-    c << %(git commit -m "Pull request" -m "#{commit_message}")
+    c << %(git commit -m "#{short_message}" -m "#{long_message}")
     c << "git pull-request"
     c.join("\n")
   end
-
-  private
 end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "1.0.10"
+    VERSION = "1.0.11"
   end
 end

data/spec/commands/story_pull_request_spec.rb

@@ -13,7 +13,8 @@ describe StoryPullRequest do
   subject { command }
 
   its(:cmd) { should match /git pull-request/ }
-  its(:commit_message) do
+  its(:short_message) { should include command.story_branch }
+  its(:long_message) do
     should include '[Delivers #62831853]'
     should include '[Delivers #31415926]'
   end

metadata

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