pivotal-github 0.6.5 → 0.6.6

data/README.md

@@ -101,7 +101,7 @@ In addition, the `--log` option puts the commit messages from the individual com
 
 Because of the way options are chained, passing `--ff` or `--no-log` to `git story-merge` will override the `--no-ff` or `--log` flags (respectively) and thus restore the default behavior of `git merge`.
 
-Finally, experience shows that it's easy to forget to mark a story finished when making the final commit. As a reminder, the `git story-merge` command exits with a warning if the most recent commit doesn't contain 'Finishes' or 'Delivers' (or 'Finished' or 'Delivered'). This behavior can be overriden with the `--run` option. (I wanted to use `-f` and `--force`, but those interact badly with the default `git merge` options.)
+Finally, experience shows that it's easy to forget to mark a story finished when making the final commit. As a reminder, the `git story-merge` command exits with a warning if the most recent commit doesn't contain 'Finishes' or 'Delivers' (or 'Finished', 'Delivered', 'Fixes', or 'Fixed'). This behavior can be overriden with the `--run` option. (I wanted to use `-f` and `--force`, but those interact badly with the default `git merge` options.)
 
 #### Options
 

data/lib/pivotal-github/finished_command.rb

@@ -1,4 +1,4 @@
-# By devault, command runs only when story is finished
+# By default, command runs only when story is finished
 class FinishedCommand < Command
 
   def run!
@@ -12,11 +12,11 @@ class FinishedCommand < Command
     # We look for 'Finishes' or 'Delivers' and issue a warning if neither is
     # in the most recent commit. (Also supports 'Finished' and 'Delivered'.)
     def check_finishes
-      unless `git log -1` =~ /Finishe(s|d)|Deliver(s|ed)/
+      unless `git log -1` =~ /Finishe(s|d)|Deliver(s|ed)|Fixe(s|d)/i
         warning =  "Warning: Unfinished story\n"
         warning += "Run `git commit --amend` to add 'Finishes' or 'Delivers' "
         warning += "to the commit message\n"
-        warning += "Use --force to override"
+        warning += "Use --run to override"
         $stderr.puts warning
         exit 1
       end

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "0.6.5"
+    VERSION = "0.6.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors: