commander 4.0.1 → 4.0.2

data/History.rdoc

@@ -1,4 +1,10 @@
 
+4.0.2 / 2010-01-19
+==================
+
+  * Added program(:int_block) to allow a block to be run on interrupt.
+  * Fixed; ProgressBar immediately shows, and doesn't die on empty lists.
+
 4.0.1 / 2010-01-14
 ==================
 

data/commander.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{commander}
-  s.version = "4.0.1"
+  s.version = "4.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-01-19}
   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/runner.rb

@@ -51,6 +51,7 @@ module Commander
       trace = false
       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('-v', '--version', 'Display version information') { say version; return } 
       global_option('-t', '--trace', 'Display backtrace when an error occurs') { trace = true }
@@ -109,12 +110,14 @@ module Commander
     #   :int_message     Message to display when interrupted (CTRL + C)
     #
     
-    def program key, *args
+    def program key, *args, &block
       if key == :help and !args.empty?
         @program[:help] ||= {}
         @program[:help][args.first] = args.at(1)
       elsif key == :help_formatter && !args.empty?
         @program[key] = (@help_formatter_aliases[args.first] || args.first)
+      elsif block
+        @program[key] = block
       else
         @program[key] = *args unless args.empty?
         @program[key]

data/lib/commander/user_interaction.rb

@@ -223,6 +223,7 @@ module Commander
 
     def progress arr, options = {}, &block
       bar = ProgressBar.new arr.length, options
+      bar.show
       arr.each { |v| bar.increment yield(v) }
     end
         
@@ -325,7 +326,11 @@ module Commander
       # Completion percentage.
       
       def percent_complete
-        @step * 100 / @total_steps
+        if @total_steps.zero?
+          100
+        else
+          @step * 100 / @total_steps
+        end
       end
       
       ##
@@ -368,7 +373,7 @@ module Commander
           :steps_remaining => steps_remaining,
           :total_steps => @total_steps, 
           :time_elapsed => "%0.2fs" % time_elapsed,
-          :time_remaining => "%0.2fs" % time_remaining,
+          :time_remaining => @step > 0 ? "%0.2fs" % time_remaining : '',
         }.
         merge! @tokens
       end

data/lib/commander/version.rb

@@ -1,4 +1,4 @@
 
 module Commander
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

data/spec/runner_spec.rb

@@ -189,7 +189,7 @@ describe Commander 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').should == ['foo bar', 'foo bar foo']
+   	  command_runner.valid_command_names_from('foo', 'bar', 'foo').sort.should == ['foo bar', 'foo bar foo']
     end
     
     it "should return empty array when no possible command names exist" do

data/spec/ui_spec.rb

@@ -10,4 +10,16 @@ describe Commander::UI do
     end
   end
 
-end
+  describe "progress" do
+    it "should not die on an empty list" do
+      exception = false
+      begin
+        progress([]) {}
+      rescue
+        exception = true
+      end
+      exception.should_not be_true
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: commander
 version: !ruby/object:Gem::Version 
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -08:00
+date: 2010-01-19 00:00:00 -08:00
 default_executable: commander
 dependencies: 
 - !ruby/object:Gem::Dependency