visionmedia-commander 3.1.7 → 3.1.8

data/History.rdoc

@@ -1,4 +1,11 @@
 
+=== 3.1.8 / 2009-03-25
+
+* Utilizing abort and $stderr instead of using #say [#16]
+* Fixed INT trapping issue (purely cosmetic) [#14]
+* Removed todo, use lighthouse now for commander at:
+  http://visionmedia.lighthouseapp.com/projects/27643-commander/overview
+
 === 3.1.7 / 2009-03-24
 
 * Added global --trace option

data/Manifest

@@ -32,5 +32,5 @@ tasks/gemspec.rake
 tasks/spec.rake
 test/foo
 test/pbar
+test/re
 test/ui
-Todo.rdoc

data/commander.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{commander}
-  s.version = "3.1.7"
+  s.version = "3.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-03-24}
+  s.date = %q{2009-03-25}
   s.default_executable = %q{commander}
   s.description = %q{The complete solution for Ruby command-line executables}
   s.email = %q{tj@vision-media.ca}
   s.executables = ["commander"]
   s.extra_rdoc_files = ["bin/commander", "lib/commander/blank.rb", "lib/commander/command.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/object.rb", "lib/commander/core_ext/string.rb", "lib/commander/core_ext.rb", "lib/commander/help_formatters/base.rb", "lib/commander/help_formatters/terminal/command_help.erb", "lib/commander/help_formatters/terminal/help.erb", "lib/commander/help_formatters/terminal.rb", "lib/commander/help_formatters.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "lib/commander.rb", "README.rdoc", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake"]
-  s.files = ["bin/commander", "commander.gemspec", "History.rdoc", "lib/commander/blank.rb", "lib/commander/command.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/object.rb", "lib/commander/core_ext/string.rb", "lib/commander/core_ext.rb", "lib/commander/help_formatters/base.rb", "lib/commander/help_formatters/terminal/command_help.erb", "lib/commander/help_formatters/terminal/help.erb", "lib/commander/help_formatters/terminal.rb", "lib/commander/help_formatters.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "lib/commander.rb", "Manifest", "Rakefile", "README.rdoc", "spec/command_spec.rb", "spec/core_ext/array_spec.rb", "spec/core_ext/object_spec.rb", "spec/core_ext/string_spec.rb", "spec/help_formatters/base_spec.rb", "spec/help_formatters/terminal_spec.rb", "spec/runner_spec.rb", "spec/spec_helper.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "test/foo", "test/pbar", "test/ui", "Todo.rdoc"]
+  s.files = ["bin/commander", "commander.gemspec", "History.rdoc", "lib/commander/blank.rb", "lib/commander/command.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/object.rb", "lib/commander/core_ext/string.rb", "lib/commander/core_ext.rb", "lib/commander/help_formatters/base.rb", "lib/commander/help_formatters/terminal/command_help.erb", "lib/commander/help_formatters/terminal/help.erb", "lib/commander/help_formatters/terminal.rb", "lib/commander/help_formatters.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "lib/commander.rb", "Manifest", "Rakefile", "README.rdoc", "spec/command_spec.rb", "spec/core_ext/array_spec.rb", "spec/core_ext/object_spec.rb", "spec/core_ext/string_spec.rb", "spec/help_formatters/base_spec.rb", "spec/help_formatters/terminal_spec.rb", "spec/runner_spec.rb", "spec/spec_helper.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "test/foo", "test/pbar", "test/re", "test/ui"]
   s.has_rdoc = true
   s.homepage = %q{http://visionmedia.github.com/commander}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Commander", "--main", "README.rdoc"]

data/lib/commander.rb

@@ -32,5 +32,4 @@ require 'commander/help_formatters'
 
 $command_runner = Commander::Runner.new
 $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 10 rescue 80
-trap('INT') { abort program(:int_message) }
 at_exit { run! } 

data/lib/commander/runner.rb

@@ -37,6 +37,7 @@ module Commander
     def run!
       trace = false
       require_program :name, :version, :description
+      trap('INT') { abort program(:int_message) }
       global_option('--help', 'Display help documentation') { command(:help).run *@args[1..-1]; return }
       global_option('--version', 'Display version information') { say version; return } 
       global_option('--trace', 'Display backtrace when an error occurs') { trace = true }
@@ -46,14 +47,14 @@ module Commander
         begin
           call_active_command
         rescue InvalidCommandError
-          say 'invalid command. Use --help for more information'
+          abort 'invalid command. Use --help for more information'
         rescue \
           OptionParser::InvalidOption, 
           OptionParser::InvalidArgument,
           OptionParser::MissingArgument => e
-          say e
-        rescue Exception => e
-          say "error: #{e}. Use --trace to view backtrace"
+          abort e
+        rescue => e
+          abort "error: #{e}. Use --trace to view backtrace"
         end
       else
         call_active_command
@@ -299,7 +300,7 @@ module Commander
     private
     
     def say *args #:nodoc: 
-      $termina.say *args
+      $terminal.say *args
     end
     
   end

data/lib/commander/version.rb

@@ -1,4 +1,4 @@
 
 module Commander
-  VERSION = '3.1.7'
+  VERSION = '3.1.8'
 end

data/spec/runner_spec.rb

@@ -2,6 +2,7 @@
 describe Commander do
   
 	before :each do
+	  $stderr = StringIO.new
     mock_terminal
 	  create_test_command
 	end
@@ -64,10 +65,11 @@ describe Commander do
   
   describe "--trace" do
     it "should display pretty errors by default" do
-      new_command_runner 'foo' do
-        command(:foo) { |c| c.when_called { raise 'cookies!' } }
-      end.run!
-      @output.string.should == "error: cookies!. Use --trace to view backtrace\n"
+      lambda {
+        new_command_runner 'foo' do
+          command(:foo) { |c| c.when_called { raise 'cookies!' } }
+        end.run!
+      }.should raise_error(SystemExit, /error: cookies!. Use --trace/)
     end
     
     it "should display callstack when using this switch" do
@@ -93,19 +95,25 @@ describe Commander do
   
   describe "with invalid options" do
     it "should output an invalid option message" do
-      run('test', '--invalid-option').should == "invalid option: --invalid-option\n"
+      lambda {
+        run('test', '--invalid-option')  
+      }.should raise_error(SystemExit, /invalid option: --invalid-option/)
     end
   end
   
   describe "with invalid sub-command passed" do
     it "should output an invalid command message" do
-      run('foo').should == "invalid command. Use --help for more information\n"
+      lambda {
+        run('foo')  
+      }.should raise_error(SystemExit, /invalid command. Use --help for more information/)
     end
   end
   
   describe "with invalid sub-command passed to help" do
     it "should output an invalid command message" do
-      run('help', 'does_not_exist').should == "invalid command. Use --help for more information\n"
+      lambda {
+        run('help', 'does_not_exist')
+      }.should raise_error(SystemExit, /invalid command. Use --help for more information/)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-commander
 version: !ruby/object:Gem::Version 
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-24 00:00:00 -07:00
+date: 2009-03-25 00:00:00 -07:00
 default_executable: commander
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,8 +84,8 @@ files:
 - tasks/spec.rake
 - test/foo
 - test/pbar
+- test/re
 - test/ui
-- Todo.rdoc
 has_rdoc: true
 homepage: http://visionmedia.github.com/commander
 post_install_message: 

data/Todo.rdoc

@@ -1,33 +0,0 @@
-
-== Major
-
-* Finish global --trace
-* 1.9.x compatability
-* Publish RDoc on mini page / screencasts
-
-== Minor
-
-* Better custom shell support ... Highline stuff is not very nice
-* Prevent global options from overriding sub-command level options
-* Add arbitrary help blocks to sub-commands as well
-* Spec for changing out formatters (mock formatter)
-* Add optional default command when none is present
-* Fix multi-word command template creation via `commander init`
-* Consider global #color method again
-* Change; use stack technique for progress bar instead to clean things up
-* Add; dynamically generate padding erb templates, command lists, multi-line text bodies etc
-* Add optional command to be executed when none is specified
-* Add global options... change runner implementations as well as displaying in terminal formatter, OpenStruct inherit these options?
-* Add highline paging ... clean it up because its ugly
-* Add option copying / merging capabilities
-* Change; require that users explicitly require 'commander/import' (which in turn will highlight/import as well)
-* Release to RubyForge as well
-* Change; consider reversing |options, args| so args make use of ruby block param defaults with 1.9
-  or simply just to expand arg params like so |options, source_dir, dest_dir| ...
-
-== Brainstorming
-
-* Add global trapping of INT to end process with less ugly output
-* Add global --options switch for loading options from a filepath
-* Add argument parser / defaults
-* Add regexp matching for command names