visionmedia-commander 3.1.6 → 3.1.7

data/History.rdoc

@@ -1,4 +1,8 @@
 
+=== 3.1.7 / 2009-03-24
+
+* Added global --trace option
+
 === 3.1.6 / 2009-03-22
 
 * Changed Options struct to always use symbols

data/Todo.rdoc

@@ -1,8 +1,6 @@
 
 == Major
 
-* Change Options to use hash @table ... open struct
-* Add to_hash or __hash__ method to Options, revise rbind
 * Finish global --trace
 * 1.9.x compatability
 * Publish RDoc on mini page / screencasts

data/commander.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{commander}
-  s.version = "3.1.6"
+  s.version = "3.1.7"
 
   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-22}
+  s.date = %q{2009-03-24}
   s.default_executable = %q{commander}
   s.description = %q{The complete solution for Ruby command-line executables}
   s.email = %q{tj@vision-media.ca}

data/lib/commander/command.rb

@@ -26,9 +26,7 @@ module Commander
       end
       
       def default defaults = {}
-        defaults.each do |key, value|
-          __send__ :"#{key}=", value if __send__(key).nil?
-        end
+        @table = defaults.merge! @table
       end
     end
         

data/lib/commander/runner.rb

@@ -35,19 +35,29 @@ module Commander
     # Run command parsing and execution process.
     
     def run!
+      trace = false
       require_program :name, :version, :description
       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 }
       parse_global_options
       remove_global_options
-      call_active_command
-    rescue InvalidCommandError
-      say 'invalid command. Use --help for more information'
-    rescue \
-      OptionParser::InvalidOption, 
-      OptionParser::InvalidArgument,
-      OptionParser::MissingArgument => e
-      say e
+      unless trace
+        begin
+          call_active_command
+        rescue InvalidCommandError
+          say '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"
+        end
+      else
+        call_active_command
+      end
     end
     
     ##

data/lib/commander/version.rb

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

data/spec/command_spec.rb

@@ -34,7 +34,7 @@ describe Commander::Command do
     
   describe "#option" do
     it "should add options" do
-      lambda { @command.option '--recursive' }.should change(@command.options, :length).from(2).to(3)
+      lambda { @command.option '--recursive' }.should change(@command.options, :length).from(1).to(2)
     end
     
     it "should allow procs as option handlers" do
@@ -48,14 +48,6 @@ describe Commander::Command do
       @command.run '--password', 'foo'
     end
   end
-    
-  describe "#options" do
-  	it "should distinguish between switches and descriptions" do
-  	  @command.option '-t', '--trace', 'some description'
-  	  @command.options[2][:description].should == 'some description'
-  	  @command.options[2][:switches].should == ['-t', '--trace']
-  	end
-  end
   
   describe "#switch_to_sym" do
     it "should return a symbol based on the switch name" do
@@ -72,7 +64,7 @@ describe Commander::Command 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.run '--trace', 'just', 'some', 'args'
+        @command.run '--verbose', 'just', 'some', 'args'
       end
       
       it "calling the #call method by default when an object is called" do

data/spec/runner_spec.rb

@@ -62,22 +62,22 @@ describe Commander do
     end
   end
   
-  # describe "--trace" do
-  #   it "should display pretty errors by default" do
-  #     new_command_runner 'test' do
-  #       raise 'cookies!'
-  #     end.run!
-  #     @output.should == 'error: cookies!. use --trace to view backtrace'
-  #   end
-  #   
-  #   it "should display callstack when using this switch" do
-  #     lambda { 
-  #       new_command_runner 'test', '--trace' do
-  #         raise 'cookies!'
-  #       end.run!
-  #     }.should raise_error
-  #   end
-  # end
+  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"
+    end
+    
+    it "should display callstack when using this switch" do
+      lambda {
+        new_command_runner 'foo', '--trace' do
+          command(:foo) { |c| c.when_called { raise 'cookies!' } }
+        end.run!  
+      }.should raise_error(RuntimeError)
+    end
+  end
   
   describe "--version" do
     it "should output program version" do
@@ -200,28 +200,28 @@ describe Commander do
   
   describe "should function correctly" do
     it "when options are passed before the command name" do
-      new_command_runner '--trace', 'test', 'foo', 'bar' do
+      new_command_runner '--verbose', 'test', 'foo', 'bar' do
         @command.when_called do |args, options|
           args.should == ['foo', 'bar']
-          options.trace.should be_true
+          options.verbose.should be_true
         end
       end.run!
     end
 
     it "when options are passed after the command name" do
-      new_command_runner 'test', '--trace', 'foo', 'bar' do
+      new_command_runner 'test', '--verbose', 'foo', 'bar' do
         @command.when_called do |args, options|
           args.should == ['foo', 'bar']
-          options.trace.should be_true
+          options.verbose.should be_true
         end
       end.run!
     end
 
     it "when an argument passed is the same name as the command" do
-      new_command_runner 'test', '--trace', 'foo', 'test', 'bar' do
+      new_command_runner 'test', '--verbose', 'foo', 'test', 'bar' do
         @command.when_called do |args, options|
           args.should == ['foo', 'test', 'bar']
-          options.trace.should be_true
+          options.verbose.should be_true
         end
       end.run!
     end

data/spec/spec_helper.rb

@@ -19,8 +19,7 @@ def create_test_command
     c.description = "test description"
     c.example "description", "command"
     c.example "description 2", "command 2"
-    c.option "-t", "--trace", "trace description"
-    c.option "--verbose", "verbose description"
+    c.option '-v', "--verbose", "verbose description"
     c.when_called do |args, options|
       "test %s" % args.join
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-commander
 version: !ruby/object:Gem::Version 
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-22 00:00:00 -07:00
+date: 2009-03-24 00:00:00 -07:00
 default_executable: commander
 dependencies: 
 - !ruby/object:Gem::Dependency