lib/pivotal-github/story_merge.rb in pivotal-github-0.6.4 vs lib/pivotal-github/story_merge.rb in pivotal-github-0.6.5

@@ -1,16 +1,23 @@
 require 'pivotal-github/command'
+require 'pivotal-github/finished_command'
 
-class StoryMerge < Command
+class StoryMerge < FinishedCommand
 
   def parser
     OptionParser.new do |opts|
       opts.banner = "Usage: git story-merge [options]"
       opts.on("-d", "--development BRANCH",
               "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|
+        self.options.run = opt
+      end
       opts.on_tail("-h", "--help", "this usage guide") do
         puts opts.to_s; exit 0
       end
     end
   end
@@ -24,13 +31,9 @@
     c = ['git merge --no-ff --log']
     c << argument_string(unknown_options) unless unknown_options.empty?
     c << story_branch
     lines << c.join(' ')
     lines.join("\n")
-  end
-
-  def run!
-    system cmd
   end
 
   private
 
     def development_branch
\ No newline at end of file