visionmedia-commander 3.0.0 → 3.0.1

data/History.rdoc

@@ -1,4 +1,9 @@
 
+=== 3.0.1 / 2009-03-12
+
+* Fixed bug in #command_name_from_args preventing the left-most match for a command name to be used
+* Fixed bug in Command#example preventing the formatter from outputting them correctly
+
 === 3.0.0 / 2009-03-12
 
 * Added sub command help support when using the --help switch

data/README.rdoc

@@ -32,22 +32,30 @@ as well as an object, specifying a method to call, so view the RDoc for more inf
    program :description, 'Stupid command that prints foo or bar.'
 
    command :foo do |c|
-     c.syntax = "foobar foo"
-     c.description = "Displays foo"
+     c.syntax = 'foobar foo'
+     c.description = 'Displays foo'
      c.when_called do |args, options|
-       say "foo"
+       say 'foo'
      end
    end
 
    command :bar do |c|
-     c.syntax = "foobar [options] bar"
-     c.description = "Display bar with optional prefix"
-     c.option "--prefix STRING"
+     c.syntax = 'foobar bar [options]'
+     c.description = 'Display bar with optional prefix and suffix'
+     c.option '--prefix STRING', String, 'Adds a prefix to bar'
+     c.option '--suffix STRING', String, 'Adds a suffix to bar'
      c.when_called do |args, options|
-       say "#{options.prefix} bar"
+       options.default :prefix => '(', :suffix => ')'
+       say "#{options.prefix}bar#{options.suffix}"
      end
    end
 
+   $ foobar bar
+   # => (bar)
+
+   $ foobar bar --suffix '{' --prefix '}'
+   # => {bar}
+
 == HighLine
 
 As mentioned above the highline gem is imported into 'global scope', below

data/Todo.rdoc

@@ -1,11 +1,14 @@
 
 == Major
 
+* Fix help command ...
+* Rough out some formatter specs using include?
 * 1.9.x compatability
 * Publish RDoc on mini page / screencasts
 
 == Minor
 
+* 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

data/commander.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{commander}
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]

data/lib/commander/command.rb

@@ -41,7 +41,7 @@ module Commander
     #
     
     def example description, command 
-      @examples.push description, command
+      @examples << [description, command]
     end
     
     ##
@@ -207,7 +207,7 @@ module Commander
     
     def option_proc switches
       Proc.new do |value|
-        @proxy_options.push [switch_to_sym(switches.last), value]
+        @proxy_options << [switch_to_sym(switches.last), value]
       end 
     end
     

data/lib/commander/runner.rb

@@ -132,10 +132,19 @@ module Commander
     
     ##
     # Attemps to locate a command name from within the arguments.
-    # Supports multi-word commands, using the largest possible match.
+    # Supports multi-word commands, using the largest left-most possible match.
     
     def command_name_from_args
-      @__command_name_from_args ||= valid_command_names_from(*@args.dup).last
+      @__command_name_from_args ||= begin
+          names = valid_command_names_from *@args.dup
+          if names.length > 1
+            names.first.length == names.last.length ? 
+              names.first :
+              names.last
+          else
+            names.first
+          end
+        end
     end
     
     ##

data/lib/commander/version.rb

@@ -1,4 +1,4 @@
 
 module Commander
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/spec/runner_spec.rb

@@ -101,6 +101,11 @@ describe Commander do
    	  command('foo bar foo') {}
    	  command_runner.command_name_from_args.should == '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'      
+    end
   end
   
   describe "#active_command" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-commander
 version: !ruby/object:Gem::Version 
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors: 
 - TJ Holowaychuk