visionmedia-commander 2.5.7 → 3.0.0

data/History.rdoc

@@ -1,4 +1,34 @@
 
+=== 3.0.0 / 2009-03-12
+
+* Added sub command help support when using the --help switch
+* #delete_switches is now mutative
+* Added #valid_command_names_from
+* #when_called now raises argument error when neither a block, object, or class is passed
+* Added options#default method and specs
+* Added support for multi-word list parsing in Array#parse
+* Added summary to commander template
+* Added optional block param for #new_command_runner spec helper
+* Added .re (metadata for visionmedia-release gem)
+* Moved delgation of Kernel methods to Object
+* Refactored multi-word command name specs
+* Refactored Object#method_missing; using call chain to implement
+* Refactored all specs
+* Change #color calls in formatters to $terminal#color for now
+* Using highlines $terminal.output for IO stream with the progressbar
+* Replaced #ensure_program_key_set with #require_program, taking an array of keys
+* Renamed #args_without_command to #args_without_command_name
+* Renamed #populate_options_to_when_called to #option_proc
+* Renamed #sym_from_switch to #switch_to_sym
+* Removed #get_command, use #command without supplying a block
+* Removed Command#inspect
+* Removed command description aliases of short_description, long_description. Use description / summary
+* Removed VerboseFileUtils
+* Removed String#camelcase as its not really needed (was only used in commander's executable for creating templates)
+* Removed commander/import for now
+* Removed LOG_FORMAT
+* Removed Kernel ext which only had #color
+
 === 2.5.7 / 2009-03-11
 
 * Fixed paren warnings in import spec

data/Manifest

@@ -3,17 +3,14 @@ commander.gemspec
 History.rdoc
 lib/commander/command.rb
 lib/commander/core_ext/array.rb
-lib/commander/core_ext/kernel.rb
 lib/commander/core_ext/object.rb
 lib/commander/core_ext/string.rb
 lib/commander/core_ext.rb
-lib/commander/fileutils.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/import.rb
 lib/commander/runner.rb
 lib/commander/user_interaction.rb
 lib/commander/version.rb
@@ -21,12 +18,16 @@ lib/commander.rb
 Manifest
 Rakefile
 README.rdoc
-spec/commander_spec.rb
+spec/command_spec.rb
+spec/core_ext/array_spec.rb
+spec/core_ext/object_spec.rb
 spec/core_ext/string_spec.rb
 spec/help_formatter_spec.rb
-spec/import_spec.rb
+spec/runner_spec.rb
 spec/spec_helper.rb
 tasks/docs.rake
 tasks/gemspec.rake
 tasks/spec.rake
+test/pbar
+test/ui
 Todo.rdoc

data/README.rdoc

@@ -6,7 +6,7 @@ Commander bridges the gap between other terminal related libraries
 you know and love (OptionParser, HighLine), while providing many new
 features, and an elegant API.
 
-== Features:
+== Features
 
 * Easier than baking cookies
 * Parses options using OptionParser
@@ -18,7 +18,7 @@ features, and an elegant API.
 * Multi-word command name support such as 'drupal module install MOD', rather than 'drupal module_install MOD'
 * Use the 'commander' executable to initialize a commander driven program
 
-== Example:
+== Example
 
 For more option examples view the Commander::Command#option method. Also
 an important feature to note is that when_called may be a class to instantiate,
@@ -48,7 +48,7 @@ as well as an object, specifying a method to call, so view the RDoc for more inf
      end
    end
 
-== HighLine:
+== HighLine
 
 As mentioned above the highline gem is imported into 'global scope', below
 are some quick examples for how to utilize highline in your command(s):
@@ -101,7 +101,7 @@ are some quick examples for how to utilize highline in your command(s):
      end
    end
 
-== HighLine & Interaction Additions:
+== HighLine & Interaction Additions
 
 In addition to highline's fantastic choice of methods we will continue to
 simplify common tasks using the following methods:
@@ -130,19 +130,6 @@ simplify common tasks using the following methods:
   # 'Log' action to stdout
   log "create", "path/to/file.rb"
 
-== FileUtils:
-
-The VerboseFileUtils module is automatically included within the main object for
-global usage. These will output 'log' messages such as:
-
-  remove  doc
-  create  path
-  create  path/to/file.rb
-    move  path/to/something path/to/destination
-  
-If you do not wish to use FileUtils in a verbose manor simply call FileUtil's
-methods directly.
-
 == ASCII Tables
 
 For feature rich ASCII tables for your terminal app check out visionmedia's terminal-table gem at
@@ -154,15 +141,15 @@ http://github.com/visionmedia/terminal-table
    |          |       |    |        | get it while its hot! |
    +----------+-------+----+--------+-----------------------+
 
-== Known Issues:
+== Known Issues
   
 * none
 
-== LICENSE:
+== License
 
 (The MIT License)
 
-Copyright (c) 2008 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2008-2009 TJ Holowaychuk <tj@vision-media.ca>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Todo.rdoc

@@ -1,24 +1,29 @@
 
-* Use $terminal IO stream for progress bar 
-* Fix stupid #program error output 
-* mixins like c.use Commander::TraceOption ? ...
-* add configuration management like release gem
-* test bool switches --[no-]-foo ... document
-* Add option defaults when null / revisit OpenStruct population
-* Refactor specs / improve testing
-* Add option copying / merging capabilities
-* Fix issue with having command name in the args list, #args_without_command
+== Major
+
+* 1.9.x compatability
+* Publish RDoc on mini page / screencasts
+
+== Minor
+
+* 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 aliasing of commands / args / options
-* Non-greedy matching of command name
-* Change; Have VerboseFileUtils only output basename ? 
-* Change; refactor specs
+* 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
-* Add regexp matching for command names
-* Add highline paging ... clean it up
-* Add global options... change runner implementations as well as displaying in terminal formatter, OpenStruct inherit these options?
+* 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 --trace method
+* Add global trapping of INT to end process with less ugly output
 * Add global --options switch for loading options from a filepath
-* Add; dynamically generate padding erb templates, command lists, multi-line text bodies etc
-* Add; display global options with global help
-* Change; consider reversing |options, args| so args make use of ruby block param defaults |options, file, dir = SOME_DIR| etc.. adjust doc
-* Publish rdoc
+* Add argument parser / defaults
+* Add regexp matching for command names

data/bin/commander

@@ -10,43 +10,44 @@ 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, allowing extremely quick creation of commader executables.'
-	c.example 'Create a new file with a commander template.', 'commander init ./bin/my_executable'
+	c.description = 'Initialize an empty <file> with a commander template, allowing extremely quick creation of commader executables.'
+	c.example 'Create a new file with a commander template.', 'commander init bin/my_executable'
 	c.when_called do |args, options|
-	  abort "Provide a filepath." if args.empty?
+	  file = args.shift || abort('file argument required.')
 		name = ask 'Machine name of program: '
 		description = ask 'Describe your program: '
-		commands = ask 'List the sub-commands you wish to create: ', Array
+		commands = ask_for_array 'List the sub-commands you wish to create: '
 		begin
-      File.open(args.first, 'w') do |f|
-        f.write <<-CODE
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'commander'
-require '#{name}'
-
-program :name, '#{name}'
-program :version, #{name.camelcase}::VERSION
-program :description, '#{description}'
- 
-CODE
+      File.open(file, 'w') do |f|
+        f.write <<-"...".gsub!(/^ {10}/, '')
+          #!/usr/bin/env ruby
+          
+          require 'rubygems'
+          require 'commander'
+          require '#{name}'
+          
+          program :name, '#{name}'
+          program :version, #{name.capitalize}::VERSION
+          program :description, '#{description}'
+           
+        ...
         commands.each do |command|
-          f.write <<-CODE
-command :#{command} do |c|
-  c.syntax = ''
-  c.description = ''
-  c.example 'description', 'command example'
-  c.option '--some-switch', 'Some switch that does something'
-  c.when_called do |args, options|
-    # Do something or c.when_called #{name.camelcase}::Commands::#{command.camelcase}
-  end
-end
+          f.write <<-"...".gsub!(/^ {12}/, '')
+            command :#{command} do |c|
+              c.syntax = '#{name} #{command} [options]'
+              c.summary = ''
+              c.description = ''
+              c.example 'description', 'command example'
+              c.option '--some-switch', 'Some switch that does something'
+              c.when_called do |args, options|
+                # Do something or c.when_called #{name.capitalize}::Commands::#{command.capitalize}
+              end
+            end
 
-CODE
+          ...
         end
        end
-       say "Initialized template in #{args.first}"
+       say "Initialized template in #{file}"
 		 rescue Exception => e
        abort e
 		 end

data/commander.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{commander}
-  s.version = "2.5.7"
+  s.version = "3.0.0"
 
   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-11}
+  s.date = %q{2009-03-12}
   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/command.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/kernel.rb", "lib/commander/core_ext/object.rb", "lib/commander/core_ext/string.rb", "lib/commander/core_ext.rb", "lib/commander/fileutils.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/import.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/command.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/kernel.rb", "lib/commander/core_ext/object.rb", "lib/commander/core_ext/string.rb", "lib/commander/core_ext.rb", "lib/commander/fileutils.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/import.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "lib/commander.rb", "Manifest", "Rakefile", "README.rdoc", "spec/commander_spec.rb", "spec/core_ext/string_spec.rb", "spec/help_formatter_spec.rb", "spec/import_spec.rb", "spec/spec_helper.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "Todo.rdoc"]
+  s.extra_rdoc_files = ["bin/commander", "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/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_formatter_spec.rb", "spec/runner_spec.rb", "spec/spec_helper.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "test/pbar", "test/ui", "Todo.rdoc"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/visionmedia/commander}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Commander", "--main", "README.rdoc"]

data/lib/commander.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008 TJ Holowaychuk <tj@vision-media.ca>
+# Copyright (c) 2008-2009 TJ Holowaychuk <tj@vision-media.ca>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -27,23 +27,12 @@ require 'rubygems'
 require 'highline/import'
 require 'commander/version'
 require 'commander/user_interaction'
-require 'commander/fileutils'
 require 'commander/core_ext'
 require 'commander/runner'
 require 'commander/command'
 require 'commander/help_formatters'
-require 'commander/import'
 
 $command_runner = Commander::Runner.new
-
-# Highline terminal settings
 $terminal.wrap_at = HighLine::SystemExtensions.terminal_size.first - 10 rescue 80
-
-# Display friendly interruption message
-trap 'INT' do 
-  say program(:int_message)
-  exit
-end
-
-# Auto-execute command runner
-at_exit { $command_runner.run! } 
+trap('INT') { abort program(:int_message) }
+at_exit { run! } 

data/lib/commander/command.rb

@@ -7,22 +7,26 @@ module Commander
     
     attr_reader :name, :examples, :options, :proxy_options
     attr_accessor :syntax, :description, :summary
+    
+    ##
+    # Options struct.
+    
+    class Options < OpenStruct
+      def default defaults = {}
+        defaults.each do |key, value|
+          send "#{key}=", value if send(key).nil?
+        end
+      end
+    end
         
     ##
-    # Initialize new command with specified _name_.
+    # Initialize new command with specified +name+.
     
     def initialize name
-      @name, @examples, @when_called = name.to_s, [], {}
+      @name, @examples, @when_called = name.to_s, [], []
       @options, @proxy_options = [], []
     end
     
-    #--
-    # Description aliases
-    #++
-    
-    alias :long_description= :description=
-    alias :short_description= :summary=
-    
     ##
     # Add a usage example for this command.
     #
@@ -31,16 +35,13 @@ module Commander
     #
     # === Examples:
     #    
-    #    command :something do |c|
-    #      c.example "Should do something", "my_command something"
-    #    end
+    #   command :something do |c|
+    #     c.example "Should do something", "my_command something"
+    #   end
     #
     
     def example description, command 
-      @examples << {
-        :description => description,
-        :command => command,
-      } 
+      @examples.push description, command
     end
     
     ##
@@ -51,27 +52,27 @@ module Commander
     # passed to handle the option, otherwise the _options_ struct seen below 
     # contains the results of this option. This handles common formats such as:
     #
-    #    -h, --help          options.help           # => bool
-    #    --[no-]feature      options.feature        # => bool
-    #    --large-switch      options.large_switch   # => bool
-    #    --file FILE         options.file           # => file passed
-    #    --list WORDS        options.list           # => array
-    #    --date [DATE]       options.date           # => date or nil when optional argument not set
+    #   -h, --help          options.help           # => bool
+    #   --[no-]feature      options.feature        # => bool
+    #   --large-switch      options.large_switch   # => bool
+    #   --file FILE         options.file           # => file passed
+    #   --list WORDS        options.list           # => array
+    #   --date [DATE]       options.date           # => date or nil when optional argument not set
     #
     # === Examples:
     #    
-    #    command :something do |c|
-    #      c.option '--recursive', 'Do something recursively'
-    #      c.option '--file FILE', 'Specify a file'
-    #      c.option('--info', 'Display info') { puts "handle with block" }
-    #      c.option '--[no-]feature', 'With or without feature'
-    #      c.option '--list FILES', Array, 'List the files specified'
-    #
-    #      c.when_called do |args, options|
-    #        do_something_recursively if options.recursive
-    #        do_something_with_file options.file if options.file
-    #      end 
-    #    end
+    #   command :something do |c|
+    #     c.option '--recursive', 'Do something recursively'
+    #     c.option '--file FILE', 'Specify a file'
+    #     c.option('--info', 'Display info') { puts "handle with block" }
+    #     c.option '--[no-]feature', 'With or without feature'
+    #     c.option '--list FILES', Array, 'List the files specified'
+    #   
+    #     c.when_called do |args, options|
+    #       do_something_recursively if options.recursive
+    #       do_something_with_file options.file if options.file
+    #     end 
+    #   end
     #
     # === Help Formatters:
     #
@@ -82,16 +83,17 @@ module Commander
     #
     # === Input Parsing:
     #
-    # Since Commander utilizes OptionParser you can pre-parser and evaluate
-    # option arguments. Simply require 'optparse/time', or 'optparse/date', etc.
+    # Since Commander utilizes OptionParser you can pre-parse and evaluate
+    # option arguments. Simply require 'optparse/time', or 'optparse/date', as these
+    # objects must respond to #parse.
     #
     #   c.option '--time TIME', Time
     #   c.option '--date [DATE]', Date
     #
     
     def option *args, &block
-      switches, description = seperate_switches_from_description args
-      proc = block_given? ? block : populate_options_to_when_called(switches)
+      switches, description = seperate_switches_from_description *args
+      proc = block || option_proc(switches)
       @options << {
         :args => args,
         :proc => proc,
@@ -101,42 +103,29 @@ module Commander
     end
     
     ##
-    # Handle execution of command.
-    #
-    # An array of _args_ are passed to the handler, as well as an OpenStruct
-    # containing option values (populated regardless of them being declared).
-    # The handler may be a class, object, or block (see examples below).
+    # Handle execution of command. The handler may be a class, 
+    # object, or block (see examples below).
     #
     # === Examples:
     #    
-    #     # Simple block handling
-    #     c.when_called do |args, options|
-    #        # do something
-    #     end 
-    #
-    #     # Create inst of Something and pass args / options
-    #     c.when_called MyLib::Command::Something
-    #
-    #     # Create inst of Something and use arbitrary method
-    #      c.when_called MyLib::Command::Something, :some_method
-    #
-    #     # Pass an object to handle callback (requires method symbol)
-    #     c.when_called SomeObject, :some_method
+    #   # Simple block handling
+    #   c.when_called do |args, options|
+    #      # do something
+    #   end 
+    #   
+    #   # Create inst of Something and pass args / options
+    #   c.when_called MyLib::Command::Something
+    #   
+    #   # Create inst of Something and use arbitrary method
+    #    c.when_called MyLib::Command::Something, :some_method
+    #   
+    #   # Pass an object to handle callback (requires method symbol)
+    #   c.when_called SomeObject, :some_method
     #
     
     def when_called *args, &block
-      h = @when_called
-      unless args.empty?
-        case args.first
-        when Class
-          h[:class] = args.shift
-          h[:method] = args.shift
-        else
-          h[:object] = args.shift
-          h[:method] = args.shift
-        end
-      end
-      h[:proc] = block if block_given?
+      raise ArgumentError, 'must pass an object, class, or block.' if args.empty? and !block
+      @when_called = block ? [block] : args
     end
     
     ##
@@ -146,83 +135,79 @@ module Commander
     # * invokes when_called proc
     #
     
-    def run args = [] 
-      call parse_options_and_call_procs(args)
+    def run *args
+      call parse_options_and_call_procs(*args)
     end
     
     ##
-    # Parses options and calls associated procs
-    # returning the arguments left.
+    # Parses options and calls associated procs, 
+    # returning the arguments remaining.
     
-    def parse_options_and_call_procs args = [] 
+    def parse_options_and_call_procs *args
       return args if args.empty?
-      opts = OptionParser.new
-      @options.each { |o| opts.on(*o[:args], &o[:proc]) }
-      opts.parse! args
-      args
+      @options.inject OptionParser.new do |opts, option| 
+        opts.on *option[:args], &option[:proc]
+        opts
+      end.parse! args
     end
     
     ##
-    # Call the commands when_called block with _args_.
-    
-    def call args = [] 
-      h = @when_called
-      case 
-      when h[:class]
-        if h[:method].nil?
-          h[:class].new args, proxy_option_struct
-        else
-          h[:class].new.send h[:method], args, proxy_option_struct
-        end
-      when h[:object] : h[:object].send(h[:method], args, proxy_option_struct)
-      when h[:proc] : h[:proc].call args, proxy_option_struct
-      end
+    # Call the commands when_called block with +args+.
+    
+    def call args = []
+      object = @when_called.shift
+      meth = @when_called.shift || :call
+      options = proxy_option_struct
+      case object
+      when Proc  ; object.call(args, options)
+      when Class ; meth != :call ? object.new.send(meth, args, options) : object.new(args, options)
+      else         object.send(meth, args, options) if object
+      end 
     end
     
     ##
-    # Attempts to generate a method name symbol from _switch_.
+    # Attempts to generate a method name symbol from +switch+.
     # For example:
     # 
     #   -h                 # => :h
     #   --trace            # => :trace
     #   --some-switch      # => :some_switch
-    #   --[with]-feature   # => :feature
+    #   --[no-]feature     # => :feature
     #   --file FILE        # => :file
-    #   --list of, things  # => :list
-    
-    def sym_from_switch switch
-      switch.gsub(/\[.*\]/, '').scan(/-([a-z]+)/).join('_').to_sym rescue nil
-    end
+    #   --list of,things   # => :list
     
-    def inspect #:nodoc:
-      "#<Commander::Command:#{@name}>"
+    def switch_to_sym switch
+      switch.scan(/[\-\]](\w+)/).join('_').to_sym rescue nil
     end
     
-    private 
-    
-    def proxy_option_struct #:nodoc:
-      options = OpenStruct.new
-      @proxy_options.each { |o| options.send("#{o[:method]}=", o[:value]) } 
-      options
+    ##
+    # Return switches and description seperated from the +args+ passed.
+
+    def seperate_switches_from_description *args
+      switches = args.find_all { |arg| arg.to_s =~ /^-/ } 
+      description = args.last unless !args.last.is_a? String or args.last.match(/^-/)
+      return switches, description
     end
+        
+    ##
+    # Creates an Options instance populated with the option values
+    # collected by the #option_proc.
     
-    def seperate_switches_from_description args #:nodoc:
-      # TODO: refactor this goodness
-      switches = args.find_all { |a| a.index('-') == 0 if a.is_a? String } 
-      description = args.last unless !args.last.is_a? String or args.last.index('-') == 0
-      [switches, description]
+    def proxy_option_struct
+      @proxy_options.inject Options.new do |options, (option, value)|
+        options.send :"#{option}=", value if option
+        options
+      end
     end
     
     ##
-    # Pass option values to the when_called proc when a block
-    # is not specifically supplied to #option.
-    
-    def populate_options_to_when_called switches #:nodoc:
-      Proc.new do |args|
-        @proxy_options << {
-          :method => sym_from_switch(switches.last),
-          :value => args,
-        }
+    # Option proxy proc used when a block is not explicitly passed
+    # via the #option method. This allows commander to auto-populate
+    # and work with option values.
+    
+    def option_proc switches
+      Proc.new do |value|
+        @proxy_options.push [switch_to_sym(switches.last), value]
       end 
     end