optitron 0.0.11 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    optitron (0.0.10)
+    optitron (0.0.11)
       callsite (= 0.0.4)
       ruby2ruby (= 1.2.4)
       ruby_parser (>= 2.0)

data/README.rdoc

@@ -2,7 +2,108 @@
 
 == Sensible options parsing
 
-You can specify lots of different commands with options
+Optitron strives to be simple, minimal and to do the "right thing" most of the time. The structure is simple, you have global options, a list of commands, and each of those commands takes a number of arguments and options.
+
+== Usage
+
+To create an Optitron CLI, start with a class you want to wire up as a CLI. In our example, we'll use the class Runner, which we want to work as a CLI.
+
+  class Runner
+    def start
+      # ... starts
+    end
+    
+    def stop
+      # ... stops
+    end
+    
+    def status
+      # ... reports status
+    end
+  end
+
+To make this class suitable for use as a CLI, either extend <tt>Optitron::CLI</tt> or include <tt>Optitron::ClassDsl</tt>. Then, describe each argument as follows:
+
+  class Runner < Optitron::CLI
+    desc "Starts the process"
+    def start
+      # ... starts
+    end
+    
+    desc "Stops the process"
+    def stop
+      # ... stops
+    end
+    
+    desc "Report the status"
+    def status
+      # ... reports status
+    end
+  end
+
+Only methods described will be available to the CLI. If you have a method that needs arguments, simply include them as method arguments. It will respect splats and defaults. Options are specified with the +opt+ method in your class, as follows:
+
+  class Runner < Optitron::CLI
+    desc "Starts the process"
+    opt "verbose"
+    opt "environment", :in => ['development', 'production', 'staging', 'test']
+    def start
+      # ... starts
+    end
+    
+    # .. more methods
+
+  end
+
+
+If you need an option available for all methods, use +class_opt+ to specify it.
+
+  class Runner < Optitron::CLI
+    class_opt "verbose", "Be loud"
+  
+    # ... your methods
+  end
+
+The last line in your runner has to be the class name and dispatch. This will parse <tt>ARGV</tt> and execute normal dispatching on it.
+
+  class Runner < Optitron::CLI
+    # ... your methods
+  end
+  Runner.dispatch
+  
+As well, help is added by default, but, if you don't want to use this, include the command +dont_use_help+ in your class.
+  
+== How to configure options
+
+Options can have defaults, types and inclusion checks. Here are all the options available on an opt:
+
+=== <tt>:default</tt>
+
+This allows you to specify a default value. The type of value is used to infer the type required for this option. This can be over-ridden with <tt>:type</tt>.
+
+=== <tt>:short_name</tt>
+
+This allows you to set a short name for the option, though, one will be assigned automatically from the short names available.
+
+=== <tt>:run</tt>
+
+This allows you to run an arbitrary block for an option. The proc will be called with the value, and the response object.
+
+=== <tt>:in</tt>
+
+This allows you to test for inclusion in a range or array (or anything that responds to <tt>#include?</tt> and <tt>#first</tt>). The first item in the object will be used to infer the type. This can be over-ridden with <tt>:type</tt>.
+
+=== <tt>:required</tt>
+
+This allows you to force an option to be required. False by default.
+
+==== <tt>:type</tt>
+
+This allows you to specify the type. Acceptable options are <tt>:numeric</tt>, <tt>:array</tt>, <tt>:hash</tt>, <tt>:string</tt> or <tt>:boolean</tt>.
+
+== Stand alone usage
+
+You can create parsers and parse using them.
 
   @parser = Optitron.new {
     help
@@ -24,11 +125,11 @@ You can specify lots of different commands with options
     end
   }
 
-Want to see the help?
+To generate help, use the <tt>#help</tt> method.
 
   @parser.help
 
-Will output:
+Which returns,
 
   Commands
   
@@ -44,7 +145,7 @@ Will output:
   
   -v/--verbose                   # Be very loud
 
-And <tt>@parser.parse(%w(-v install file))</tt> gives back:
+The parse method can parse a list of arguments. For example, <tt>@parser.parse(%w(-v install file))</tt> gives back:
 
   response = @parser.parse(%w(-v install file))
   response.command
@@ -54,7 +155,7 @@ And <tt>@parser.parse(%w(-v install file))</tt> gives back:
   response.params
   => {"verbose" => true}
 
-If you try parsing invalid parameters, get back friendly error messages
+If you try parsing invalid parameters, you can get back friendly error messages using <tt>#error_messages</tt>.
 
   @parser.parse(%w()).error_messages
   => ["Unknown command"]
@@ -64,88 +165,3 @@ If you try parsing invalid parameters, get back friendly error messages
   => ["File is required"]
   @parser.parse(%w(kill --pid=something)).error_messages
   => ["Pid is invalid"]
-
-== Usage in a binary
-
-To use this in a file, create a parser, and tell it to dispatch to your favourite object. For instance, save this down to <tt>test.rb</tt>
-
-  class Runner
-    def install(file, opts)
-      puts "installing #{file} with #{opts}!"
-    end
-  end
-
-  Optitron.dispatch(Runner.new) {
-    opt 'verbose', "Be very loud"
-    cmd "install", "This installs things" do
-      arg "file", "The file to install"
-    end
-    cmd "show", "This shows things" do
-      arg "first", "The first thing to show"
-      arg "second", "The second optional thing to show", :required => false
-    end
-    cmd "kill", "This kills things" do
-      opt "pids", "A list of pids to kill", :type => :array
-      opt "pid", "A pid to kill", :type => :numeric
-      opt "names", "Some sort of hash", :type => :hash
-    end
-    cmd "join", "This joins things" do
-      arg "thing", "Stuff to join", :type => :greedy
-    end
-  }
-
-Now, try running it.
-
-  crapbook-pro:optitron joshua$ ruby test.rb 
-  Unknown command
-  
-  crapbook-pro:optitron joshua$ ruby test.rb install
-  File is required
-  
-  crapbook-pro:optitron joshua$ ruby test.rb install file
-  installing file with {"verbose"=>false}!
-
-  crapbook-pro:optitron joshua$ ruby test.rb install file --verbose
-  installing file with {"verbose"=>true}!
-
-== Usage in a class
-
-  require 'optitron'
-  
-  class Runner < Optitron::CLI
-  
-    class_opt 'verbose'
-  
-    desc "Install stuff"
-    opt 'force'
-    def install(file, source)
-      puts "install some things #{file} from #{source.inspect} #{params.inspect}"
-    end
-  end
-  
-  Runner.dispatch
-  
-Running this gives you
-
-  crapbook-pro:optitron joshua$ ruby ideal.rb --help
-  Commands
-
-  install [file] <required="yourmom">       # Install stuff
-    -f/--force                              
-
-  Global options
-
-  -v/--verbose                              
-  -?/--help                                 # Print help message
-
-  crapbook-pro:optitron joshua$ ruby ideal.rb install
-  File is required
-
-  crapbook-pro:optitron joshua$ ruby ideal.rb install file
-  installing file from yourmom with params: {"help"=>false, "force"=>false, "verbose"=>false}
-
-  crapbook-pro:optitron joshua$ ruby ideal.rb install file yourdad
-  installing file from yourdad with params: {"help"=>false, "force"=>false, "verbose"=>false}
-
-  crapbook-pro:optitron joshua$ ruby ideal.rb install file yourdad -v
-  installing file from yourdad with params: {"help"=>false, "force"=>false, "verbose"=>true}

data/lib/optitron.rb

@@ -25,12 +25,6 @@ class Optitron
     Optitron.new(&blk).parse(args)
   end
 
-  def self.dispatch(target = nil, args = ARGV, &blk)
-    optitron = Optitron.new(&blk)
-    optitron.parser.target = target
-    optitron.parser.parse(args).dispatch
-  end
-
   def help
     @parser.help
   end

data/lib/optitron/class_dsl.rb

@@ -96,12 +96,12 @@ class Optitron
       end
 
       def build_method_args(file)
-        unless self.send(:class_variable_defined?, :@@method_args)
+        unless send(:class_variable_defined?, :@@method_args)
           parser = RubyParser.new
           sexp = parser.process(File.read(file))
           method_args = MethodArgs.new(self)
           method_args.process(sexp)
-          self.send(:class_variable_set, :@@method_args, method_args.method_map)
+          send(:class_variable_set, :@@method_args, method_args.method_map)
         end
         send(:class_variable_get, :@@method_args)
       end
@@ -111,7 +111,7 @@ class Optitron
       end
 
       def dont_use_help
-        optitron_dsl.root.help
+        send(:class_variable_set, :@@suppress_help, true)
       end
 
       def desc(desc)
@@ -126,7 +126,7 @@ class Optitron
 
       def build
         unless @built
-          optitron_dsl.root.help
+          optitron_dsl.root.help# if send(:class_variable_defined?, :@@suppress_help)
           @cmds.each do |(cmd_name, cmd_desc, opts)|
             args = method_args[cmd_name.to_sym]
             arity = instance_method(cmd_name).arity
@@ -156,8 +156,8 @@ class Optitron
         if response.valid?
           optitron_parser.target.params = response.params
           args = response.args
-          while (args.size < optitron_parser.commands[response.command].args.size)
-            args << optitron_parser.commands[response.command].args[args.size].default
+          while (args.size < optitron_parser.commands.assoc(response.command).last.args.size)
+            args << optitron_parser.commandsassoc(response.command).last.args[args.size].default
           end
           optitron_parser.target.send(response.command.to_sym, *response.args)
         else

data/lib/optitron/dsl.rb

@@ -40,8 +40,8 @@ class Optitron
       end
       
       def arg(name, description = nil, opts = nil)
-        arg_option = Option::Arg.new(name, description, opts)
-        raise InvalidParser.new if @target.args.last and !@target.args.last.required? and arg_option.required?
+        arg_option = Option::Arg.new(name, description, opts)                                                                         
+        raise InvalidParser.new if @target.args.last and !@target.args.last.required? and arg_option.required? and arg_option.type != :greedy
         raise InvalidParser.new if @target.args.last and @target.args.last.type == :greedy
         @target.args << arg_option
         arg_option
@@ -100,7 +100,7 @@ class Optitron
       def cmd(name, description = nil, opts = nil, &blk)
         command_option = Option::Cmd.new(name, description, opts)
         CmdParserDsl.new(self, command_option).configure_with(&blk) if blk
-        @target.commands[name] = command_option
+        @target.commands << [name, command_option]
       end
     end
   end

data/lib/optitron/help.rb

@@ -4,10 +4,23 @@ class Optitron
       @parser = parser
     end
 
+    def help_line_for_opt_value(opt)
+      if opt.inclusion_test
+        case opt.inclusion_test
+        when Array
+          opt.inclusion_test.join(', ')
+        else
+          opt.inclusion_test.inspect
+        end
+      else
+        opt.type.to_s.upcase
+      end
+    end
+
     def help_line_for_opt(opt)
       opt_line = ''
       opt_line << [opt.short_name ? "-#{opt.short_name}" : nil, "--#{opt.name}"].compact.join('/')
-      opt_line << "=[#{opt.type.to_s.upcase}]" unless opt.boolean?
+      opt_line << "=[#{help_line_for_opt_value(opt)}]" unless opt.boolean?
       [opt_line, opt.desc]
     end
 
@@ -27,15 +40,15 @@ class Optitron
     end
 
     def generate
-      cmds = {}
-      @parser.commands.each do |cmd_name, cmd|
+      cmds = []
+      @parser.commands.each do |(cmd_name, cmd)|
         cmd_line = "#{cmd_name}"
         cmd.args.each do |arg|
           cmd_line << " " << help_line_for_arg(arg)
         end
-        cmds[cmd_line] = [cmd.desc]
+        cmds << [cmd_line, cmd.desc]
         cmd.options.each do |opt|
-          cmds[cmd_line] << help_line_for_opt(opt)
+          cmds.assoc(cmd_line) << help_line_for_opt(opt)
         end
       end
       opts_lines = @parser.options.map do |opt|
@@ -45,7 +58,7 @@ class Optitron
       args_lines = @parser.args.empty? ? nil : [@parser.args.map{|arg| help_line_for_arg(arg)}.join(' '), @parser.args.map{|arg| arg.desc}.join(', ')]
 
       longest_line = 0
-      longest_line = [longest_line, cmds.keys.map{|k| k.size}.max].max unless cmds.empty?
+      longest_line = [longest_line, cmds.map{|cmd| cmd.first.size}.max].max unless cmds.empty?
       opt_lines = cmds.map{|k,v| k.size + 2}.flatten
       longest_line = [longest_line, args_lines.first.size].max if args_lines
       longest_line = [longest_line, opt_lines.max].max unless opt_lines.empty?
@@ -53,7 +66,7 @@ class Optitron
       help_output = []
 
       unless cmds.empty?
-        help_output << "Commands\n\n" + cmds.map do |cmd, opts|
+        help_output << "Commands\n\n" + cmds.map do |(cmd, *opts)|
           cmd_text = ""
           cmd_text << "%-#{longest_line}s     " % cmd
           cmd_desc = opts.shift

data/lib/optitron/option.rb

@@ -1,5 +1,6 @@
 class Optitron
   class Option
+    attr_reader :inclusion_test
     attr_accessor :required, :name, :default, :parameterize, :type, :desc, :has_default
     alias_method :required?, :required
     alias_method :has_default?, :has_default
@@ -89,16 +90,18 @@ class Optitron
     end
 
     class Opt < Option
-      attr_accessor :short_name, :run, :parent_cmd
+      attr_accessor :short_name, :run, :parent_cmd, :include_in_params
+      alias_method :include_in_params?, :include_in_params
       def initialize(name, desc = nil, opts = nil)
         if desc.is_a?(Hash)
           desc, opts = nil, desc
         end
         @name, @desc = name, desc
-        @type = opts && opts[:type] || :boolean
+        self.type = opts && opts[:type] || :boolean
         self.short_name = opts[:short_name] if opts && opts[:short_name]
         self.run = opts[:run] if opts && opts[:run]
         self.inclusion_test = opts[:in] if opts && opts[:in]
+        self.required = opts && opts.key?(:required) ? opts[:required] : false
         self.default = opts && opts.key?(:default) ? opts[:default] : (@type == :boolean ? false : nil)
       end
 
@@ -180,16 +183,15 @@ class Optitron
     
     class Arg < Option
       attr_accessor :greedy, :inclusion_test, :parent_cmd
-      alias_method :greedy?, :greedy
       def initialize(name = nil, desc = nil, opts = nil)
         if desc.is_a?(Hash)
           desc, opts = nil, desc
         end
         @name, @desc = name, desc
         self.inclusion_test = opts[:in] if opts && opts[:in]
-        @default = opts && opts[:default]
-        @required = opts && opts.key?(:required) ? opts[:required] : @default.nil?
-        @type = opts && opts[:type]
+        self.default = opts && opts[:default]
+        self.type = opts && opts[:type]
+        self.required = opts && opts.key?(:required) ? opts[:required] : (@default.nil? and !greedy?)
       end
       
       def consume(response, tokens)
@@ -199,7 +201,7 @@ class Optitron
           while !arg_tokens.size.zero?
             arg_tok = arg_tokens.shift
             tokens.delete_at(tokens.index(arg_tok))
-            response.args_with_tokens.last.last << arg_tok
+            response.args_with_tokens.last.last << arg_tok.lit
           end
           if required? and response.args_with_tokens.last.last.size.zero?
             response.add_error("required", name)
@@ -210,7 +212,9 @@ class Optitron
           elsif !arg_tokens.size.zero?
             arg_tok = arg_tokens.shift
             tokens.delete_at(tokens.index(arg_tok))
-            response.args_with_tokens << [self, arg_tok]
+            response.args_with_tokens << [self, arg_tok.lit]
+          elsif has_default
+            response.args_with_tokens << [self, default]
           end
         end
       end

data/lib/optitron/parser.rb

@@ -5,7 +5,7 @@ class Optitron
     
     def initialize
       @options = []
-      @commands = {}
+      @commands = []
       @args = []
       @short_opts = {}
       @help = Help.new(self)
@@ -22,11 +22,11 @@ class Optitron
       args = @args
       unless @commands.empty?
         potential_cmd_toks = tokens.select { |t| t.respond_to?(:lit) }
-        if cmd_tok = potential_cmd_toks.find { |t| @commands[t.lit] }
+        if cmd_tok = potential_cmd_toks.find { |t| @commands.assoc(t.lit) }
           tokens.delete(cmd_tok)
           response.command = cmd_tok.lit
-          options += @commands[cmd_tok.lit].options
-          args = @commands[cmd_tok.lit].args
+          options += @commands.assoc(cmd_tok.lit).last.options
+          args = @commands.assoc(cmd_tok.lit).last.args
         else
           potential_cmd_toks.first ?
             response.add_error('an unknown command', potential_cmd_toks.first.lit) :
@@ -45,12 +45,14 @@ class Optitron
         if opt_tok = tokens.find { |tok| opt.match?(tok) }
           opt_tok_index = tokens.index(opt_tok)
           opt.consume(response, tokens)
+        elsif opt.required?
+          response.add_error("required", opt.name)
         end
       end
     end
     
     def parse_args(tokens, args, response)
-      args.each { |arg| arg.consume(response, tokens) } if args
+      args.each { |arg| arg.consume(response, tokens) }
     end
   end
 end

data/lib/optitron/response.rb

@@ -1,6 +1,6 @@
 class Optitron
   class Response
-    attr_reader :params_array, :args, :params, :args_with_tokens, :errors
+    attr_reader :params_array, :args, :params, :args_with_tokens, :errors, :args_hash
     attr_accessor :command
     def initialize(parser, tokens)
       @parser, @tokens = parser, tokens
@@ -34,15 +34,17 @@ class Optitron
     def validate
       compile_params
       @params_array.each { |(key, value)| key.run.call(params[key.name], self) if key.run }
-      @args = @args_with_tokens.map { |(arg, tok)| 
+      @args_array = @args_with_tokens.map { |(arg, val)| 
         begin
-          tok.is_a?(Array) ? tok.map{ |t| arg.validate(t.lit) } : arg.validate(tok.lit)
+          [arg, arg.validate(val)]
         rescue
           add_error('invalid', arg.name)
-          tok.is_a?(Array) ? tok.map{ |t| t.lit } : tok.lit
+          [arg, val]
         end
       }
-      @args.flatten!
+      @args_hash = Hash[@args_array.map{|(arg, val)| [arg.name, val]}]
+      
+      @args = @args_array.inject([]) {|args, (arg, val)| arg.greedy? ? args.concat(val) : args.push(val); args}
       unless @tokens.empty?
         @tokens.select{|t| t.respond_to?(:name)}.each do |named_token|
           @tokens.delete(named_token)
@@ -57,16 +59,6 @@ class Optitron
       end
     end
 
-    def dispatch
-      raise unless @parser.target
-      if valid?
-        dispatch_args = params.empty? ? args : args + [params]
-        @parser.target.send(command.to_sym, *dispatch_args)
-      else
-        puts error_messages.join("\n")
-      end
-    end
-
     def valid?
       @errors.empty?
     end

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.0.11"
+  VERSION = "0.1.0"
 end

data/spec/arg_spec.rb

@@ -90,11 +90,11 @@ describe "Optitron::Parser arg spec" do
     end
   end
 
-  context "one greedy arg" do
+  context "one required greedy arg" do
     before(:each) {
       @parser = Optitron.new {
         cmd "install" do
-          arg "files", :type => :greedy
+          arg "files", :type => :greedy, :required => true
         end
       }
     }
@@ -120,6 +120,25 @@ describe "Optitron::Parser arg spec" do
     end
   end
 
+  context "one optional + one greedy arg" do
+    before(:each) {
+      @parser = Optitron.new {
+        cmd "install" do
+          arg "values", :default => [1,2,3]
+          arg "files", :type => :greedy
+        end
+      }
+    }
+
+    it "should parse 'install'" do
+      response = @parser.parse(%w(install))
+      response.command.should == 'install'
+      response.args.should == [[1,2,3]]
+      response.valid?.should be_true
+    end
+
+  end
+
   context "invalid parsers" do
     it "shouldn't allow a required arg after an optional arg" do
       proc {

data/spec/cli_spec.rb

@@ -43,11 +43,24 @@ class AnotherCLIExample < Optitron::CLI
   end
 end
 
+class NoHelpExample < Optitron::CLI
+
+  dont_use_help
+
+  class_opt 'verbose'
+
+  desc "Use this too"
+  opt 'another_opt'
+  def use_too(one, two = 'three')
+    puts "using this too #{one} #{two} #{params['another_opt']} #{@env}"
+  end
+end
+
 
 describe "Optitron::Parser defaults" do
   it "should generate the correct help" do
     CLIExample.build
-    CLIExample.optitron_parser.help.strip.should == "Commands\n\nuse_greedy [one] [two1 two2 ...]       # Use this three\n  -A/--another_opt_as_well=[NUMERIC]   \nuse                                    # Use this\n  -u/--use_opt                         \nwith_array <ary=[1, 2, 3]>             # something with an array\nuse_too [one] <two=\"three\">            # Use this too\n  -a/--another_opt                     \n\nGlobal options\n\n-v/--verbose                           \n-?/--help                              # Print help message"
+    CLIExample.optitron_parser.help.strip.should == "Commands\n\nuse                                    # Use this\n  -u/--use_opt                         \nuse_too [one] <two=\"three\">            # Use this too\n  -a/--another_opt                     \nuse_greedy [one] <two1 two2 ...>       # Use this three\n  -A/--another_opt_as_well=[NUMERIC]   \nwith_array <ary=[1, 2, 3]>             # something with an array\n\nGlobal options\n\n-v/--verbose                           \n-?/--help                              # Print help message"
   end
 
   it "should dispatch" do
@@ -62,4 +75,8 @@ describe "Optitron::Parser defaults" do
   it "should dispatch with a custom initer" do
     capture(:stdout) { AnotherCLIExample.dispatch(%w(use_too three four --another_opt)) { AnotherCLIExample.new("test") }  }.should == "using this too three four true test\n"
   end
+
+  it "should be able to suppress help" do
+    capture(:stdout) { NoHelpExample.dispatch(%w(--help)) }.should == "Unknown command\nHelp is unrecognized\n"
+  end
 end

data/spec/help_spec.rb

@@ -17,10 +17,10 @@ describe "Optitron::Parser help" do
         opt "names", "Some sort of hash", :type => :hash
       end
       cmd "join", "This joins things" do
-        arg "thing", "Stuff to join", :type => :greedy
+        arg "thing", "Stuff to join", :type => :greedy, :required => true
       end
     }
-    @parser.help.should == "Commands\n\nshow [first] <second>          # This shows things\ninstall [file]                 # This installs things\nkill                           # This kills things\n  -p/--pids=[ARRAY]            # A list of pids to kill\n  -P/--pid=[NUMERIC]           # A pid to kill\n  -n/--names=[HASH]            # Some sort of hash\njoin [thing1 thing2 ...]       # This joins things\n\nGlobal options\n\n-v/--verbose                   # Be very loud"
+    @parser.help.should == "Commands\n\ninstall [file]                 # This installs things\nshow [first] <second>          # This shows things\nkill                           # This kills things\n  -p/--pids=[ARRAY]            # A list of pids to kill\n  -P/--pid=[NUMERIC]           # A pid to kill\n  -n/--names=[HASH]            # Some sort of hash\njoin [thing1 thing2 ...]       # This joins things\n\nGlobal options\n\n-v/--verbose                   # Be very loud"
   end
 
   it "generate help for non-command parsers" do

data/spec/option_spec.rb

@@ -112,4 +112,25 @@ describe "Optitron::Parser options" do
       @parser.parse(%w(-123o test)).params.should == {'option' => 'test', '1' => true, '2' => true, '3' => true}
     end
   end
+
+  context "required options" do
+    before(:each) do
+      @parser = Optitron.new {
+        cmd "install" do
+          opt "environment", :type => :string, :required => true
+        end
+      }
+    end
+    
+    it "shouldn't parse 'install'" do
+      @parser.parse(%w(install)).valid?.should be_false
+    end
+
+    it "should parse 'install -esomething'" do
+      response = @parser.parse(%w(install -esomething))
+      response.valid?.should be_true
+      response.params.should == {'environment' => 'something'}
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 11
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 -07:00
+date: 2010-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -156,7 +156,6 @@ files:
 - spec/arg_spec.rb
 - spec/cli_spec.rb
 - spec/default_spec.rb
-- spec/dispatch_spec.rb
 - spec/errors_spec.rb
 - spec/help_spec.rb
 - spec/option_spec.rb

data/spec/dispatch_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe "Optitron::Parser dispatching" do
-  it "should dispatch 'install'" do
-    m = mock('mock')
-    m.should_receive('install').with()
-    Optitron.dispatch(m, %w(install)) {
-      cmd "install"
-    }
-  end
-
-  it "should dispatch 'install file'" do
-    m = mock('mock')
-    m.should_receive('install').with('file.rb')
-    Optitron.dispatch(m, %w(install file.rb)) {
-      cmd "install" do
-        arg "file"
-      end
-    }
-  end
-
-  it "should dispatch 'install file --noop'" do
-    m = mock('mock')
-    m.should_receive('install').with('file.rb', {'noop' => true})
-    Optitron.dispatch(m, %w(install file.rb --noop)) {
-      cmd "install" do
-        opt 'noop'
-        arg "file"
-      end
-    }
-  end
-end