commander 4.0.6 → 4.0.7

data/.gitignore

@@ -0,0 +1,6 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+.rvmrc
+coverage/*

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode

data/DEVELOPMENT

@@ -1,23 +1,15 @@
-To run the development rake tasks, you need rake and echoe gems installed.
-
-To install the rest of the development dependencies:
-
-  $ rake dev_setup
+To run the development rake tasks, you need bundler installed.
 
 Before you push any changes, run the RSpec suite:
 
   $ rake spec
 
-Build the docs:
-
-  $ rake docs
-
-Build and check the docs:
-
-  $ rake docs:open
-
 To build a new version of the gem:
 
   $ rake build
-  $ rake gem
 
+To push the new version to Rubygems:
+
+  $ rake release
+  
+(http://rubygems.org/gems/commander)

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/History.rdoc

@@ -1,3 +1,10 @@
+4.0.7 / 2012-01-23
+==================
+
+  * Improved support for JRuby and Windows (and any other platforms that don't support Kernel.fork).
+  * Fixed bug #33 - support `--help` after commands.
+  * Reorganized help output to display synopsis before description (issue #12).
+
 4.0.6 / 2011-09-15
 ==================
 

data/README.rdoc

@@ -202,7 +202,7 @@ growlnotify can also be installed via homebrew[http://mxcl.github.com/homebrew/]
 === Option Defaults
 
 The options struct passed to #action provides a #default method, allowing you
-to set defaults in a clean manor to options which have not been set.
+to set defaults in a clean manner for options which have not been set.
 
   command :foo do |c|
     c.option '--interval SECONDS', Integer, 'Interval in seconds'

data/Rakefile

@@ -1,34 +1,10 @@
-$:.unshift 'lib'
+require "rspec/core/rake_task"
+require "bundler/gem_tasks"
 
-require 'psych' if RUBY_VERSION >= "1.9.2"
-require 'rubygems'
-
-load_errors = ['highline', 'echoe'].map do |g|
-  begin
-    require g
-    nil
-  rescue LoadError
-    "The #{g} gem is not installed. Please run:\n\tgem install #{g}"
-  end
-end.compact
-abort "Missing dependencies!\n" + load_errors.join("\n") unless load_errors.empty?
-
-require 'commander'
-require 'rake'
-
-Echoe.new "commander", Commander::VERSION do |p|
-  p.email = "ggilder@tractionco.com"
-  p.summary = "The complete solution for Ruby command-line executables"
-  p.url = "http://visionmedia.github.com/commander"
-  p.runtime_dependencies << "highline ~>1.5.0"
-  p.development_dependencies << "echoe ~>4.0.0"
-  p.development_dependencies << "sdoc ~>0.3.11"
-  p.development_dependencies << "rspec <2"
-  
-  p.eval = Proc.new do
-    self.authors = ["TJ Holowaychuk", "Gabriel Gilder"]
-    self.default_executable = "commander"
-  end
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.verbose = false
+  t.rspec_opts = '--color'
 end
 
-Dir['tasks/**/*.rake'].sort.each { |lib| load lib }
+task :default => :spec

data/bin/commander

@@ -8,17 +8,17 @@ program :version, Commander::VERSION
 program :description, 'Commander utility program.'
 
 command :init do |c|
-	c.syntax = 'commander init <file>'
-	c.summary = 'Initialize a commander template'
-	c.description = 'Initialize an empty <file> with a commander template, 
+  c.syntax = 'commander init <file>'
+  c.summary = 'Initialize a commander template'
+  c.description = 'Initialize an empty <file> with a commander template, 
     allowing very quick creation of commander executables.'
-	c.example 'Create a new file with a commander template.', 'commander init bin/my_executable'
-	c.action do |args, options|
-	  file = args.shift || abort('file argument required.')
-		name = ask 'Machine name of program: '
-		description = ask 'Describe your program: '
-		commands = ask_for_array 'List the commands you wish to create: '
-		begin
+  c.example 'Create a new file with a commander template.', 'commander init bin/my_executable'
+  c.action do |args, options|
+    file = args.shift || abort('file argument required.')
+    name = ask 'Machine name of program: '
+    description = ask 'Describe your program: '
+    commands = ask_for_array 'List the commands you wish to create: '
+    begin
       File.open(file, 'w') do |f|
         f.write <<-"...".gsub!(/^ {10}/, '')
           #!/usr/bin/env ruby
@@ -48,8 +48,8 @@ command :init do |c|
         end
        end
        say "Initialized template in #{file}"
-		 rescue Exception => e
+     rescue Exception => e
        abort e
-		 end
-	end
+     end
+  end
 end

data/commander.gemspec

@@ -1,42 +1,25 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "commander/version"
 
 Gem::Specification.new do |s|
-  s.name = "commander"
-  s.version = "4.0.6"
+  s.name        = "commander"
+  s.version     = Commander::VERSION
+  s.authors     = ["TJ Holowaychuk", "Gabriel Gilder"]
+  s.email       = ["ggilder@tractionco.com"]
+  s.homepage    = "http://visionmedia.github.com/commander"
+  s.summary     = "The complete solution for Ruby command-line executables"
+  s.description = "The complete solution for Ruby command-line executables. Commander bridges the gap between other terminal related libraries you know and love (OptionParser, HighLine), while providing many new features, and an elegant API."
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["TJ Holowaychuk", "Gabriel Gilder"]
-  s.date = "2011-09-15"
-  s.description = "The complete solution for Ruby command-line executables"
-  s.email = "ggilder@tractionco.com"
-  s.executables = ["commander"]
-  s.extra_rdoc_files = ["README.rdoc", "bin/commander", "lib/commander.rb", "lib/commander/blank.rb", "lib/commander/command.rb", "lib/commander/core_ext.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/object.rb", "lib/commander/delegates.rb", "lib/commander/help_formatters.rb", "lib/commander/help_formatters/base.rb", "lib/commander/help_formatters/terminal.rb", "lib/commander/help_formatters/terminal/command_help.erb", "lib/commander/help_formatters/terminal/help.erb", "lib/commander/help_formatters/terminal_compact.rb", "lib/commander/help_formatters/terminal_compact/command_help.erb", "lib/commander/help_formatters/terminal_compact/help.erb", "lib/commander/import.rb", "lib/commander/platform.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "tasks/dev_setup.rake", "tasks/docs.rake", "tasks/gemspec.rake"]
-  s.files = ["DEVELOPMENT", "History.rdoc", "Manifest", "README.rdoc", "Rakefile", "bin/commander", "commander.gemspec", "lib/commander.rb", "lib/commander/blank.rb", "lib/commander/command.rb", "lib/commander/core_ext.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/object.rb", "lib/commander/delegates.rb", "lib/commander/help_formatters.rb", "lib/commander/help_formatters/base.rb", "lib/commander/help_formatters/terminal.rb", "lib/commander/help_formatters/terminal/command_help.erb", "lib/commander/help_formatters/terminal/help.erb", "lib/commander/help_formatters/terminal_compact.rb", "lib/commander/help_formatters/terminal_compact/command_help.erb", "lib/commander/help_formatters/terminal_compact/help.erb", "lib/commander/import.rb", "lib/commander/platform.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "spec/command_spec.rb", "spec/core_ext/array_spec.rb", "spec/core_ext/object_spec.rb", "spec/help_formatters/terminal_spec.rb", "spec/runner_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/ui_spec.rb", "tasks/dev_setup.rake", "tasks/docs.rake", "tasks/gemspec.rake"]
-  s.homepage = "http://visionmedia.github.com/commander"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Commander", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
   s.rubyforge_project = "commander"
-  s.rubygems_version = "1.8.10"
-  s.summary = "The complete solution for Ruby command-line executables"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<highline>, ["~> 1.5.0"])
-      s.add_development_dependency(%q<echoe>, ["~> 4.0.0"])
-      s.add_development_dependency(%q<sdoc>, ["~> 0.3.11"])
-      s.add_development_dependency(%q<rspec>, ["< 2"])
-    else
-      s.add_dependency(%q<highline>, ["~> 1.5.0"])
-      s.add_dependency(%q<echoe>, ["~> 4.0.0"])
-      s.add_dependency(%q<sdoc>, ["~> 0.3.11"])
-      s.add_dependency(%q<rspec>, ["< 2"])
-    end
-  else
-    s.add_dependency(%q<highline>, ["~> 1.5.0"])
-    s.add_dependency(%q<echoe>, ["~> 4.0.0"])
-    s.add_dependency(%q<sdoc>, ["~> 0.3.11"])
-    s.add_dependency(%q<rspec>, ["< 2"])
-  end
+  s.add_runtime_dependency("highline", "~> 1.5.0")
+  s.add_development_dependency("rspec", "~> 2")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("simplecov")
 end

data/lib/commander/help_formatters/terminal/command_help.erb

@@ -2,11 +2,6 @@
   <%= $terminal.color "NAME", :bold %>:
 
     <%= @name %>
-
-  <%= $terminal.color "DESCRIPTION", :bold %>:
-
-    <%= @description || @summary || 'No description.' -%>
-
 <% if @syntax -%>
 
   <%= $terminal.color "SYNOPSIS", :bold %>:
@@ -14,6 +9,11 @@
     <%= @syntax -%>
 
 <% end -%>
+
+  <%= $terminal.color "DESCRIPTION", :bold %>:
+
+    <%= @description || @summary || 'No description.' -%>
+
 <% unless @examples.empty? -%>
 
   <%= $terminal.color "EXAMPLES", :bold %>:

data/lib/commander/help_formatters/terminal_compact/command_help.erb

@@ -1,13 +1,13 @@
 
   <%= @name %>
-<% if @description || @summary -%>
-
-  <%= @description || @summary %>
-<% end -%>
 <% if @syntax -%>
 
   Usage: <%= @syntax %>
 <% end -%>
+<% if @description || @summary -%>
+
+  <%= @description || @summary %>
+<% end -%>
 <% unless @examples.empty? -%>
 
   Examples:

data/lib/commander/runner.rb

@@ -52,7 +52,11 @@ module Commander
       require_program :version, :description
       trap('INT') { abort program(:int_message) } if program(:int_message)
       trap('INT') { program(:int_block).call } if program(:int_block)
-      global_option('-h', '--help', 'Display help documentation') { command(:help).run *@args[1..-1]; return }
+      global_option('-h', '--help', 'Display help documentation') do
+        args = @args - %w[-h --help]
+        command(:help).run(*args)
+        return
+      end
       global_option('-v', '--version', 'Display version information') { say version; return } 
       global_option('-t', '--trace', 'Display backtrace when an error occurs') { trace = true }
       parse_global_options
@@ -271,7 +275,11 @@ module Commander
             say help_formatter.render 
           else
             command = command args.join(' ')
-            require_valid_command command
+            begin
+              require_valid_command command
+            rescue InvalidCommandError => e
+              abort "#{e}. Use --help for more information"
+            end
             say help_formatter.render_command(command)
           end
         end

data/lib/commander/user_interaction.rb

@@ -252,22 +252,32 @@ module Commander
     
     def enable_paging
       return unless $stdout.tty?
-      return if Platform::jruby? # Fork is not supported by JRuby
+      return unless Process.respond_to? :fork
       read, write = IO.pipe
 
+      # Kernel.fork is not supported on all platforms and configurations.
+      # As of Ruby 1.9, `Process.respond_to? :fork` should return false on
+      # configurations that don't support it, but versions before 1.9 don't
+      # seem to do this reliably and instead raise a NotImplementedError
+      # (which is rescued below).
+      
       if Kernel.fork
         $stdin.reopen read
-        read.close; write.close
+        write.close; read.close
         Kernel.select [$stdin]
         ENV['LESS'] = 'FSRX'
         pager = ENV['PAGER'] || 'less'
         exec pager rescue exec '/bin/sh', '-c', pager
       else
+        # subprocess
         $stdout.reopen write
         $stderr.reopen write if $stderr.tty?
-        read.close; write.close
-        return
+        write.close; read.close
       end
+    rescue NotImplementedError
+    ensure
+      write.close if write && !write.closed?
+      read.close if read && !read.closed?
     end
 
     ##

data/lib/commander/version.rb

@@ -1,4 +1,3 @@
-
 module Commander
-  VERSION = '4.0.6'
+  VERSION = '4.0.7'
 end

data/spec/command_spec.rb

@@ -15,13 +15,13 @@ describe Commander::Command do
     it "should act like an open struct" do
       @options.send = 'mail'
       @options.call = true
-      @options.send.should == 'mail'
-      @options.call.should == true
+      @options.send.should eq('mail')
+      @options.call.should eq(true)
     end
     
     it "should allow __send__ to function as always" do
       @options.send = 'foo'
-      @options.__send__(:send).should == 'foo'
+      @options.__send__(:send).should eq('foo')
     end
   end
   
@@ -37,7 +37,7 @@ describe Commander::Command do
     
     it "should allow usage of common method names" do
       @command.option '--open file'
-      @command.when_called { |_, options| options.open.should == 'foo' }  
+      @command.when_called { |_, options| options.open.should eq('foo') }  
       @command.run '--open', 'foo'
     end
   end
@@ -45,7 +45,7 @@ describe Commander::Command do
   describe "#run" do
     describe "should invoke #when_called" do
       it "with arguments seperated from options" do
-        @command.when_called { |args, options| args.join(' ').should == 'just some args' }  
+        @command.when_called { |args, options| args.join(' ').should eq('just some args') }  
         @command.run '--verbose', 'just', 'some', 'args'
       end
       
@@ -86,32 +86,32 @@ describe Commander::Command do
 
       it "mandatory arguments" do
         @command.option '--file FILE'
-        @command.when_called { |_, options| options.file.should == 'foo' }  
+        @command.when_called { |_, options| options.file.should eq('foo') }  
         @command.run '--file', 'foo'
         lambda { @command.run '--file' }.should raise_error(OptionParser::MissingArgument)
       end  
 
       it "optional arguments" do
         @command.option '--use-config [file] '
-        @command.when_called { |_, options| options.use_config.should == 'foo' }  
+        @command.when_called { |_, options| options.use_config.should eq('foo') }  
         @command.run '--use-config', 'foo'
         @command.when_called { |_, options| options.use_config.should be_nil }  
         @command.run '--use-config'
         @command.option '--interval N', Integer
-        @command.when_called { |_, options| options.interval.should == 5 }  
+        @command.when_called { |_, options| options.interval.should eq(5) }  
         @command.run '--interval', '5'
         lambda { @command.run '--interval', 'invalid' }.should raise_error(OptionParser::InvalidArgument)
       end
       
       it "lists" do
         @command.option '--fav COLORS', Array
-        @command.when_called { |_, options| options.fav.should == ['red', 'green', 'blue'] }  
+        @command.when_called { |_, options| options.fav.should eq(['red', 'green', 'blue']) }  
         @command.run '--fav', 'red,green,blue'
       end
       
       it "lists with multi-word items" do
         @command.option '--fav MOVIES', Array
-        @command.when_called { |_, options| options.fav.should == ['super\ bad', 'nightmare'] }  
+        @command.when_called { |_, options| options.fav.should eq(['super\ bad', 'nightmare']) }  
         @command.run '--fav', 'super\ bad,nightmare'        
       end
       
@@ -122,8 +122,8 @@ describe Commander::Command do
           options.default \
             :files => ['foo', 'bar'],
             :interval => 5
-          options.files.should == ['foo', 'bar']
-          options.interval.should == 15
+          options.files.should eq(['foo', 'bar'])
+          options.interval.should eq(15)
         end
         @command.run '--interval', '15'
       end

data/spec/core_ext/array_spec.rb

@@ -4,11 +4,11 @@ describe Array do
   
   describe "#parse" do
     it "should seperate a list of words into an array" do
-      Array.parse('just a test').should == ['just', 'a', 'test']
+      Array.parse('just a test').should eq(['just', 'a', 'test'])
     end
     
     it "should preserve escaped whitespace" do
-      Array.parse('just a\ test').should == ['just', 'a test']
+      Array.parse('just a\ test').should eq(['just', 'a test'])
     end
   end
 

data/spec/runner_spec.rb

@@ -6,34 +6,34 @@ describe Commander do
     mock_terminal
     create_test_command
   end
-	
+  
   describe "#program" do
     it "should set / get program information" do
       program :name, 'test'
-  	  program(:name).should == 'test'
+      program(:name).should eq('test')
     end
     
     it "should allow arbitrary blocks of global help documentation" do
       program :help, 'Copyright', 'TJ Holowaychuk'
-  	  program(:help)['Copyright'].should == 'TJ Holowaychuk'
+      program(:help)['Copyright'].should eq('TJ Holowaychuk')
     end
     
     it "should raise an error when required info has not been set" do
       new_command_runner '--help'
-  	  program :version, ''
+      program :version, ''
       lambda { run! }.should raise_error(Commander::Runner::CommandError)
     end
     
     it "should allow aliases of help formatters" do
       program :help_formatter, :compact
-      program(:help_formatter).should == Commander::HelpFormatter::TerminalCompact
+      program(:help_formatter).should eq(Commander::HelpFormatter::TerminalCompact)
     end
   end
   
   describe "#command" do
-  	it "should return a command instance when only the name is passed" do
-  	  command(:test).should be_instance_of(Commander::Command)
-  	end
+    it "should return a command instance when only the name is passed" do
+      command(:test).should be_instance_of(Commander::Command)
+    end
     
     it "should return nil when the command does not exist" do
       command(:im_not_real).should be_nil
@@ -43,26 +43,26 @@ describe Commander do
   describe "#separate_switches_from_description" do
     it "should seperate switches and description returning both" do
       switches, description = *Commander::Runner.separate_switches_from_description('-h', '--help', 'display help')
-      switches.should == ['-h', '--help']
-      description.should == 'display help'
+      switches.should eq(['-h', '--help'])
+      description.should eq('display help')
     end
   end
   
   describe "#switch_to_sym" do
     it "should return a symbol based on the switch name" do
-     Commander::Runner.switch_to_sym('--trace').should == :trace
-     Commander::Runner.switch_to_sym('--foo-bar').should == :foo_bar
-     Commander::Runner.switch_to_sym('--[no-]feature"').should == :feature
-     Commander::Runner.switch_to_sym('--[no-]feature ARG').should == :feature
-     Commander::Runner.switch_to_sym('--file [ARG]').should == :file
-     Commander::Runner.switch_to_sym('--colors colors').should == :colors
+     Commander::Runner.switch_to_sym('--trace').should eq(:trace)
+     Commander::Runner.switch_to_sym('--foo-bar').should eq(:foo_bar)
+     Commander::Runner.switch_to_sym('--[no-]feature"').should eq(:feature)
+     Commander::Runner.switch_to_sym('--[no-]feature ARG').should eq(:feature)
+     Commander::Runner.switch_to_sym('--file [ARG]').should eq(:file)
+     Commander::Runner.switch_to_sym('--colors colors').should eq(:colors)
     end
   end
   
   describe "#alias_command" do
     it "should alias a command" do
       alias_command :foo, :test
-      command(:foo).should == command(:test)
+      command(:foo).should eq(command(:test))
     end
     
     it "should pass arguments passed to the alias when called" do
@@ -74,7 +74,7 @@ describe Commander do
         end 
         alias_command :'install gem', :install, '--gem-name'
       end.run!
-      gem_name.should == 'commander'
+      gem_name.should eq('commander')
     end
   end
   
@@ -84,7 +84,7 @@ describe Commander do
       new_command_runner 'test', '--config', 'foo' do
         global_option('--config FILE') { |f| file = f }
       end.run!
-      file.should == 'foo'
+      file.should eq('foo')
     end
     
     it "should be inherited by commands" do
@@ -120,7 +120,7 @@ describe Commander do
           c.when_called {}
         end
       end.run!
-      global_option.should == 'MAGIC'
+      global_option.should eq('MAGIC')
     end
 
     it 'should parse global options after command' do
@@ -132,7 +132,7 @@ describe Commander do
           c.when_called {}
         end
       end.run!
-      global_option.should == 'MAGIC'
+      global_option.should eq('MAGIC')
     end
 
     it 'should parse global options placed before command options' do
@@ -146,7 +146,7 @@ describe Commander do
         end
       end.run!
 
-      global_option.should == 'MAGIC'
+      global_option.should eq('MAGIC')
     end
 
     it 'should parse global options placed after command options' do
@@ -160,7 +160,7 @@ describe Commander do
         end
       end.run!
 
-      global_option.should == 'MAGIC'
+      global_option.should eq('MAGIC')
     end
 
     it 'should parse global options surrounded by command options' do
@@ -175,7 +175,7 @@ describe Commander do
         end
       end.run!
 
-      global_option.should == 'MAGIC'
+      global_option.should eq('MAGIC')
     end
 
     it 'should not parse command options' do
@@ -191,7 +191,7 @@ describe Commander do
       end.parse_global_options
 
       command_option.should be_nil
-      global_option.should == 'MAGIC'
+      global_option.should eq('MAGIC')
     end
 
     it 'should not affect command arguments with values' do
@@ -206,8 +206,8 @@ describe Commander do
         end
       end.run!
 
-      command_option.should == 'bar'
-      global_option.should == 'MAGIC'
+      command_option.should eq('bar')
+      global_option.should eq('MAGIC')
     end
 
     it 'should not affect global arguments with values' do
@@ -221,7 +221,7 @@ describe Commander do
         end
       end.run!
 
-      global_option.should == 'bar'
+      global_option.should eq('bar')
     end
     
     it 'should allow global arguments with values before command arguments (github issue #8)' do
@@ -236,8 +236,8 @@ describe Commander do
         end
       end.run!
 
-      global_option.should == 'path'
-      command_option.should == 'bar'
+      global_option.should eq('path')
+      command_option.should eq('bar')
     end
   end
 
@@ -254,7 +254,7 @@ describe Commander do
       args << '--command-with-arg' << 'rawr'
       args << '--paths' << '"lib/**/*.js","spec/**/*.js"'
       command_runner.remove_global_options options, args
-      args.should == ['--command', '--command-with-arg', 'rawr']
+      args.should eq(['--command', '--command-with-arg', 'rawr'])
     end
 
     it "should not swallow an argument unless it expects an argument" do
@@ -267,7 +267,7 @@ describe Commander do
       args << '-a' << 'deleted'
       args << 'beta'
       command_runner.remove_global_options options, args
-      args.should == ['alpha', 'beta']
+      args.should eq(['alpha', 'beta'])
     end
   end
   
@@ -292,7 +292,7 @@ describe Commander do
   
   describe "--version" do
     it "should output program version" do
-      run('--version').should == "test 1.2.3\n"
+      run('--version').should eq("test 1.2.3\n")
     end
   end
   
@@ -300,6 +300,10 @@ describe Commander do
     it "should not output an invalid command message" do
       run('--help').should_not == "invalid command. Use --help for more information\n"
     end
+    
+    it "can be used before or after the command and options" do
+      run('test', '--help').should eq("Implement help for test here\n")
+    end
   end
   
   describe "with invalid options" do
@@ -329,40 +333,58 @@ describe Commander do
     end
   end
   
+  describe "with invalid command passed to --help" do
+    it "should output an invalid command message" do
+      pending("JRuby's Kernel.abort implementation is not testable") if Commander::Platform::jruby?
+      lambda {
+        run('--help', 'does_not_exist')
+      }.should raise_error(SystemExit, /invalid command. Use --help for more information/)
+    end
+  end
+
+  describe "with invalid option passed to --help" do
+    it "should output an invalid option message" do
+      pending("JRuby's Kernel.abort implementation is not testable") if Commander::Platform::jruby?
+      lambda {
+        run('--help', 'test', '--invalid-option')
+      }.should raise_error(SystemExit, /invalid option: --invalid-option/)
+    end
+  end
+  
   describe "#valid_command_names_from" do
     it "should return array of valid command names" do
       command('foo bar') {}
-   	  command('foo bar foo') {}
-   	  command_runner.valid_command_names_from('foo', 'bar', 'foo').sort.should == ['foo bar', 'foo bar foo']
+      command('foo bar foo') {}
+      command_runner.valid_command_names_from('foo', 'bar', 'foo').sort.should eq(['foo bar', 'foo bar foo'])
     end
     
     it "should return empty array when no possible command names exist" do
-   	  command_runner.valid_command_names_from('fake', 'command', 'name').should == []
+      command_runner.valid_command_names_from('fake', 'command', 'name').should eq([])
     end
   end
   
   describe "#command_name_from_args" do
     it "should locate command within arbitrary arguments passed" do
-   	  new_command_runner '--help', '--arbitrary', 'test'
-   	  command_runner.command_name_from_args.should == 'test'
+      new_command_runner '--help', '--arbitrary', 'test'
+      command_runner.command_name_from_args.should eq('test')
     end
     
     it "should support multi-word commands" do
-   	  new_command_runner '--help', '--arbitrary', 'some', 'long', 'command', 'foo'
-   	  command('some long command') {}
-   	  command_runner.command_name_from_args.should == 'some long command'
+      new_command_runner '--help', '--arbitrary', 'some', 'long', 'command', 'foo'
+      command('some long command') {}
+      command_runner.command_name_from_args.should eq('some long command')
     end
     
     it "should match the longest possible command" do
-   	  new_command_runner '--help', '--arbitrary', 'foo', 'bar', 'foo'
-   	  command('foo bar') {}
-   	  command('foo bar foo') {}
-   	  command_runner.command_name_from_args.should == 'foo bar foo'      
+      new_command_runner '--help', '--arbitrary', 'foo', 'bar', 'foo'
+      command('foo bar') {}
+      command('foo bar foo') {}
+      command_runner.command_name_from_args.should eq('foo bar foo'      )
     end
     
     it "should use the left-most command name when multiple are present" do
-   	  new_command_runner 'help', 'test'
-   	  command_runner.command_name_from_args.should == 'help'      
+      new_command_runner 'help', 'test'
+      command_runner.command_name_from_args.should eq('help'      )
     end
   end
   
@@ -388,7 +410,7 @@ describe Commander do
       new_command_runner '--trace' do
         default_command :test
         command(:test).should_receive(:run).once
-        command_runner.active_command.should == command(:test)
+        command_runner.active_command.should eq(command(:test))
       end.run!
     end
     
@@ -397,7 +419,7 @@ describe Commander do
         default_command :test
         command(:'foo bar'){}
         command(:'foo bar').should_receive(:run).once
-        command_runner.active_command.should == command(:'foo bar')
+        command_runner.active_command.should eq(command(:'foo bar'))
       end.run!
     end
     
@@ -406,7 +428,7 @@ describe Commander do
       default_command :'foo bar'
       command(:'foo bar'){}
       command(:'foo bar something'){}
-      command_runner.active_command.should == command(:'foo bar something')
+      command_runner.active_command.should eq(command(:'foo bar something'))
     end
     
     it "should allow defaulting of command aliases" do
@@ -422,7 +444,7 @@ describe Commander do
     it "when options are passed before the command name" do
       new_command_runner '--verbose', 'test', 'foo', 'bar' do
         @command.when_called do |args, options|
-          args.should == ['foo', 'bar']
+          args.should eq(['foo', 'bar'])
           options.verbose.should be_true
         end
       end.run!
@@ -431,7 +453,7 @@ describe Commander do
     it "when options are passed after the command name" do
       new_command_runner 'test', '--verbose', 'foo', 'bar' do
         @command.when_called do |args, options|
-          args.should == ['foo', 'bar']
+          args.should eq(['foo', 'bar'])
           options.verbose.should be_true
         end
       end.run!
@@ -440,7 +462,7 @@ describe Commander do
     it "when an argument passed is the same name as the command" do
       new_command_runner 'test', '--verbose', 'foo', 'test', 'bar' do
         @command.when_called do |args, options|
-          args.should == ['foo', 'test', 'bar']
+          args.should eq(['foo', 'test', 'bar'])
           options.verbose.should be_true
         end
       end.run!
@@ -449,16 +471,16 @@ describe Commander do
     it "when using multi-word commands" do
       new_command_runner '--verbose', 'my', 'command', 'something', 'foo', 'bar' do
         command('my command') { |c| c.option('--verbose') }
-        command_runner.command_name_from_args.should == 'my command'
-        command_runner.args_without_command_name.should == ['--verbose', 'something', 'foo', 'bar']
+        command_runner.command_name_from_args.should eq('my command')
+        command_runner.args_without_command_name.should eq(['--verbose', 'something', 'foo', 'bar'])
       end.run!
     end
 
     it "when using multi-word commands with parts of the command name as arguments" do
       new_command_runner '--verbose', 'my', 'command', 'something', 'my', 'command' do
         command('my command') { |c| c.option('--verbose') }
-        command_runner.command_name_from_args.should == 'my command'
-        command_runner.args_without_command_name.should == ['--verbose', 'something', 'my', 'command']
+        command_runner.command_name_from_args.should eq('my command')
+        command_runner.args_without_command_name.should eq(['--verbose', 'something', 'my', 'command'])
       end.run!
     end
     
@@ -466,8 +488,8 @@ describe Commander do
       new_command_runner '--verbose', 'my', 'command', 'something', 'my', 'command' do
         command('my command') {}
         command('my command something') { |c| c.option('--verbose') }
-        command_runner.command_name_from_args.should == 'my command something'
-        command_runner.args_without_command_name.should == ['--verbose', 'my', 'command']
+        command_runner.command_name_from_args.should eq('my command something')
+        command_runner.args_without_command_name.should eq(['--verbose', 'my', 'command'])
       end.run!
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
+require 'rubygems'
+require 'simplecov'
+SimpleCov.start
 
 $:.unshift File.dirname(__FILE__) + '/../lib'
-require 'rubygems'
 require 'commander/import'
 require 'stringio'
 
@@ -47,7 +49,7 @@ def command_runner
 end
 
 def run *args
-  new_command_runner *args do
+  new_command_runner(*args) do
     program :help_formatter, Commander::HelpFormatter::Base
   end.run!    
   @output.string

data/spec/ui_spec.rb

@@ -5,7 +5,7 @@ describe Commander::UI do
   describe ".replace_tokens" do
     it "should replace tokens within a string, with hash values" do
       result = Commander::UI.replace_tokens 'Welcome :name, enjoy your :object'.freeze, :name => 'TJ', :object => 'cookie'
-      result.should == 'Welcome TJ, enjoy your cookie'
+      result.should eq('Welcome TJ, enjoy your cookie')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commander
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2155737700 !ruby/object:Gem::Requirement
+  requirement: &70326274634880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,73 +22,54 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155737700
+  version_requirements: *70326274634880
 - !ruby/object:Gem::Dependency
-  name: echoe
-  requirement: &2155737200 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70326274634380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2155737200
+  version_requirements: *70326274634380
 - !ruby/object:Gem::Dependency
-  name: sdoc
-  requirement: &2155736700 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70326274634000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155736700
+  version_requirements: *70326274634000
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2155736200 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &70326274633540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155736200
-description: The complete solution for Ruby command-line executables
-email: ggilder@tractionco.com
+  version_requirements: *70326274633540
+description: The complete solution for Ruby command-line executables. Commander bridges
+  the gap between other terminal related libraries you know and love (OptionParser,
+  HighLine), while providing many new features, and an elegant API.
+email:
+- ggilder@tractionco.com
 executables:
 - commander
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- bin/commander
-- lib/commander.rb
-- lib/commander/blank.rb
-- lib/commander/command.rb
-- lib/commander/core_ext.rb
-- lib/commander/core_ext/array.rb
-- lib/commander/core_ext/object.rb
-- lib/commander/delegates.rb
-- lib/commander/help_formatters.rb
-- lib/commander/help_formatters/base.rb
-- lib/commander/help_formatters/terminal.rb
-- lib/commander/help_formatters/terminal/command_help.erb
-- lib/commander/help_formatters/terminal/help.erb
-- lib/commander/help_formatters/terminal_compact.rb
-- lib/commander/help_formatters/terminal_compact/command_help.erb
-- lib/commander/help_formatters/terminal_compact/help.erb
-- lib/commander/import.rb
-- lib/commander/platform.rb
-- lib/commander/runner.rb
-- lib/commander/user_interaction.rb
-- lib/commander/version.rb
-- tasks/dev_setup.rake
-- tasks/docs.rake
-- tasks/gemspec.rake
+extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
 - DEVELOPMENT
+- Gemfile
 - History.rdoc
 - Manifest
 - README.rdoc
@@ -120,22 +101,12 @@ files:
 - spec/core_ext/object_spec.rb
 - spec/help_formatters/terminal_spec.rb
 - spec/runner_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/ui_spec.rb
-- tasks/dev_setup.rake
-- tasks/docs.rake
-- tasks/gemspec.rake
 homepage: http://visionmedia.github.com/commander
 licenses: []
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- Commander
-- --main
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -149,11 +120,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.2'
+      version: '0'
 requirements: []
 rubyforge_project: commander
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: The complete solution for Ruby command-line executables
-test_files: []
+test_files:
+- spec/command_spec.rb
+- spec/core_ext/array_spec.rb
+- spec/core_ext/object_spec.rb
+- spec/help_formatters/terminal_spec.rb
+- spec/runner_spec.rb
+- spec/spec_helper.rb
+- spec/ui_spec.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---color

data/tasks/dev_setup.rake

@@ -1,11 +0,0 @@
-desc 'Install development dependencies'
-task :dev_setup do
-  ObjectSpace.each_object(Echoe) do |o|
-    o.development_dependencies.each do |gem_string|
-      gem_name, version = gem_string.split(' ', 2)
-      cmd = "gem install #{gem_name}"
-      cmd += " --version '#{version}'" if (version)
-      puts `#{cmd}`
-    end
-  end
-end

data/tasks/docs.rake

@@ -1,19 +0,0 @@
-
-desc 'Build docs with sdoc gem'
-task :docs do
-  require "sdoc"
-  sh 'sdoc -N lib/commander'
-end
-
-namespace :docs do
-  
-  desc 'Remove rdoc products'
-  task :remove => [:clobber_docs]
-  
-  desc 'Build docs, and open in browser for viewing (specify BROWSER)'
-  task :open => [:docs] do
-    browser = ENV["BROWSER"] || "safari"
-    sh "open -a #{browser} doc/index.html"
-  end
-  
-end

data/tasks/gemspec.rake

@@ -1,3 +0,0 @@
-
-desc 'Build gemspec file'
-task :gemspec => [:build_gemspec]