pivotal-github 0.6.6 → 0.6.7

data/README.md

@@ -101,13 +101,13 @@ 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', '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.)
+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 `--force` option.
 
 #### Options
 
     Usage: git story-merge [options]
         -d, --development BRANCH         development branch (defaults to master)
-	    -r, --run                        run without marking story finished
+	    -f, --force                      override unfinished story warning
         -h, --help                       this usage guide
 
 Additionally, `git story-merge` accepts any options valid for `git merge`.
@@ -125,7 +125,7 @@ As with `git story-merge`, by default `git story-pull-request` exits with a warn
 #### Options
 
     Usage: git story-pull-request [options]
-    	-r, --run                        run without marking story finished
+    	-f, --force                      override unfinished story warning
         -s, --skip                       skip `git story-push`
         -h, --help                       this usage guide
 

data/lib/pivotal-github/options.rb

@@ -12,6 +12,12 @@ module Options
     unknown = []                                     
     recursive_parse = Proc.new do |arg_list|                   
       begin
+        # Hack to handle an unknown '-ff' argument
+        # The issue here is that OptParse interprets '-ff' as a '-f' option
+        # applied twice. This is sort-of a feature, as it allows, e.g., '-am'
+        # to set both the '-a' and '-m' options, but it interacts badly
+        # with '-ff' (as used by 'git merge') when '-f' is one of the options.
+        unknown << arg_list.delete('-ff') if arg_list.include?('-ff')
         parser.parse!(arg_list)
       rescue OptionParser::InvalidOption => e
         unknown.concat(e.args)

data/lib/pivotal-github/story_merge.rb

@@ -10,10 +10,7 @@ class StoryMerge < FinishedCommand
               "development branch (defaults to master)") do |opt|
         self.options.development = opt
       end
-      # I wanted to use '-f' and '--force', but those interact
-      # badly with the default `git merge` options.
-      opts.on("-r", "--run", 
-              "run without marking story finished") do |opt|
+      opts.on("-f", "--force", "override unfinished story warning") do |opt|
         self.options.run = opt
       end
       opts.on_tail("-h", "--help", "this usage guide") do

data/lib/pivotal-github/story_pull_request.rb

@@ -6,8 +6,7 @@ class StoryPullRequest < FinishedCommand
   def parser
     OptionParser.new do |opts|
       opts.banner = "Usage: git story-pull-request [options]"
-      opts.on("-r", "--run",
-              "run without marking story finished") do |opt|
+      opts.on("-f", "--force", "override unfinished story warning") do |opt|
         self.options.run = opt
       end
       opts.on("-s", "--skip", "skip `git story-push`") do |opt|

data/lib/pivotal-github/version.rb

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

data/spec/options/options_spec.rb

@@ -9,14 +9,14 @@ describe Options do
     OptionParser.new do |opts|
       opts.banner = "Usage: git record [options]"
       opts.on("-m", "--message MESSAGE",
-              "add a commit message (with ticket #)") do |m| 
-        options.message = m
+              "add a commit message (with ticket #)") do |opt| 
+        options.message = opt
       end
-      opts.on("-a", "--all", "commit all changed files") do |a|
-        options.all = a
+      opts.on("-a", "--all", "commit all changed files") do |opt|
+        options.all = opt
       end
-      opts.on("-f", "--finish", "mark story as finished") do |f|
-        options.finish = f
+      opts.on("-f", "--finish", "mark story as finished") do |opt|
+        options.finish = opt
       end
       opts.on_tail("-h", "--help", "this usage guide") do
         puts opts.to_s; exit 0
@@ -24,7 +24,9 @@ describe Options do
     end    
   end
 
-  let(:args) { ['-a', '-m', '"A message"', '--finish', '-z', '--foo', 'b ar'] }
+  # The presence of '-ff' in this list is important to test the custom
+  # handling of the interaction of '-ff' and '-f'.
+  let(:args) { ['-a', '-m', '"A message"', '--finish', '-ff', '--foo', 'b ar'] }
 
   it { should respond_to(:unknown_options) }
   it { should respond_to(:known_options) }
@@ -32,7 +34,7 @@ describe Options do
   describe '#unknown_options' do
     subject { Options::unknown_options(parser, args) }
 
-    it { should     include('-z') }
+    it { should     include('-ff') }
     it { should     include('--foo') }
     it { should     include('b ar') }
     it { should_not include('-a') }
@@ -44,7 +46,7 @@ describe Options do
   describe '#known_options' do
     subject { Options::known_options(parser, args) }
 
-    it { should_not include('-z') }
+    it { should_not include('-ff') }
     it { should_not include('--foo') }
     it { should_not include('b ar') }
     it { should     include('-a') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -48,15 +48,14 @@ files:
 - lib/pivotal-github/story_push.rb
 - lib/pivotal-github/version.rb
 - pivotal-github.gemspec
-- spec/commands/FinishedCommand.rb
 - spec/commands/command_spec.rb
 - spec/commands/story_commit_spec.rb
 - spec/commands/story_merge_spec.rb
 - spec/commands/story_open_spec.rb
 - spec/commands/story_pull_request_spec.rb
+- spec/commands/story_pull_spec.rb
 - spec/commands/story_push_spec.rb
 - spec/options/options_spec.rb
-- spec/options/story_pull_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mhartl/pivotal-github
 licenses: []
@@ -83,13 +82,12 @@ signing_key:
 specification_version: 3
 summary: See the README for full documentation
 test_files:
-- spec/commands/FinishedCommand.rb
 - spec/commands/command_spec.rb
 - spec/commands/story_commit_spec.rb
 - spec/commands/story_merge_spec.rb
 - spec/commands/story_open_spec.rb
 - spec/commands/story_pull_request_spec.rb
+- spec/commands/story_pull_spec.rb
 - spec/commands/story_push_spec.rb
 - spec/options/options_spec.rb
-- spec/options/story_pull_spec.rb
 - spec/spec_helper.rb