pivotal-github 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb23c95f5fd7c9ccb44d99c7769d4d5eb8193edc
-  data.tar.gz: af5aefc3a45d42d5711bc818084f17f71c9aab35
+  metadata.gz: 539f3b0c8e216974b9bff5ef66acbd97e17e64fe
+  data.tar.gz: 40a1bfff6dc52af9f2408fccf0e33466cbf034ae
 SHA512:
-  metadata.gz: 171552555c6e801c0ce9e614361ea0e5d47cee06714583998321f26f5a74e2e87e4656e26b50dcce3f8ce426a40c12f804d7cbe597c106cd09eb2f581ce6c41b
-  data.tar.gz: 1e6e7f994761a6b2b01a55dc537a504053be60b2f9c338ce5f7ef4fd9d67e21c73b25295e35cab39e23d89382cfd433a9356561949177fde214a6c82a1c4dc6d
+  metadata.gz: 0a27676c8844b14de42dae831605bc89fd4a7b465edaca72b6b51dfab1bcf64ba25f3f0967bef7510711e99573befc95663f438dc90540602e79631ccafeb3cc
+  data.tar.gz: 9d4fa7934c92d112569eba79f0993e226abde76720d453be5b82af796ad50f94bc50eec501f6a673f4e192bd6647017b86e2e492bee0f0a60d0f104f63e50f17

data/lib/pivotal-github/command.rb

@@ -57,7 +57,7 @@ class Command
   # '#62831853'. For multiple-id stories, each story id is precede by '#', as in
   # '#62831853 #31415926'
   def message_ids
-    story_ids.map { |id| "##{id}" }.join(' ')
+    @message_ids ||= story_ids.map { |id| "##{id}" }.join(' ')
   end
 
   # Runs a command.

data/lib/pivotal-github/story_accept.rb

@@ -13,7 +13,7 @@ class StoryAccept < Command
       opts.on("-o", "--override", "override master branch requirement") do |opt|
         self.options.override = opt
       end
-      opts.on("-q", "--quiet", "suppress display of accepted story ids") do |opt|
+      opts.on("-q", "--quiet", "don't display accepted story ids") do |opt|
         self.options.quiet = opt
       end
       opts.on_tail("-h", "--help", "this usage guide") do
@@ -53,11 +53,12 @@ class StoryAccept < Command
   end
 
   # Returns the ids of delivered stories according to Pivotal Tracker.
+  # We include 'includedone:true' to force Pivotal Tracker to return
+  # *all* delivered ids, no matter when the story was finished. This also
+  # appears to be necessary to return the ids of stories marked **Delivered**
+  # by a merge commit, as in `git story-merge -d`.
   def pivotal_tracker_delivered_story_ids
-    # The Pivotal Tracker API doesn't seem to want to return stories
-    # with a particular state unless the type is also specified.
-    pivotal_tracker_ids('state:delivered type:feature') +
-    pivotal_tracker_ids('state:delivered type:bug')
+    pivotal_tracker_ids('state:delivered includedone:true')
   end
 
   # Returns true if a story has already been accepted.

data/lib/pivotal-github/story_merge.rb

@@ -30,7 +30,7 @@ class StoryMerge < FinishedCommand
   def cmd
     lines = ["git checkout #{target_branch}"]
     c = ["git merge --no-ff --log"]
-    c << %(-m "#{message}")
+    c << %(-m "#{message}") unless story_ids.empty?
     c << argument_string(unknown_options) unless unknown_options.empty?
     c << story_branch
     lines << c.join(' ')

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "1.1.6"
+    VERSION = "1.1.7"
   end
 end

metadata

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