optitron 0.1.7 → 0.1.8

data/Gemfile.lock

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

data/README.rdoc

@@ -232,3 +232,28 @@ If you try parsing invalid parameters, you can get back friendly error messages
   => ["File is required"]
   @parser.parse(%w(kill --pid=something)).error_messages
   => ["Pid is invalid"]
+
+The response from #parse can also be used to dispatch. All that's required is the target object be able to respond to <tt>params=</tt>.
+
+For example
+
+  class Runner
+    attr_accessor :params
+    def install(file)
+      puts "I'm installing #{file} with #{params.inspect}"
+    end
+  end
+  
+  parser = Optitron.new {
+    help
+    opt 'verbose', "Be very loud"
+    cmd "install", "This installs things" do
+      arg "file", "The file to install"
+    end
+  }
+  
+  parser.parse(%w(install this_file -v)).dispatch(Runner.new)
+  
+Will output
+
+  I'm installing this_file with {"help"=>false, "verbose"=>true}

data/lib/optitron/help.rb

@@ -49,7 +49,7 @@ class Optitron
         cmd.args.each do |arg|
           cmd_line << " " << help_line_for_arg(arg)
         end
-        cmds << [cmd_line, cmd.desc]
+        cmds << [cmd_line, cmd]
         cmd.options.each do |opt|
           cmds.assoc(cmd_line) << help_line_for_opt(opt)
         end
@@ -72,8 +72,14 @@ class Optitron
         help_output << "Commands\n\n" + cmds.map do |(cmd, *opts)|
           cmd_text = ""
           cmd_text << "%-#{longest_line}s     " % cmd
-          cmd_desc = opts.shift
-          cmd_text << "# #{cmd_desc}" if cmd_desc
+          cmd_obj = opts.shift
+          cmd_text << "# #{cmd_obj.desc}" if cmd_obj.desc
+          cmd_obj.args.each do |arg|
+            if arg.desc
+              cmd_text << "\n%-#{longest_line}s     " % ""
+              cmd_text << "#   #{arg.name} -- #{arg.desc}"
+            end
+          end
           opts.each do |opt|
             cmd_text << "\n  %-#{longest_line}s   " % opt.first
             cmd_text << "# #{opt.last}" if opt.last

data/lib/optitron/response.rb

@@ -62,5 +62,14 @@ class Optitron
     def valid?
       @errors.empty?
     end
+
+    def dispatch(target)
+      if valid?
+        target.params = params
+        target.send(command.to_sym, *args)
+      else
+        puts response.error_messages.join("\n")
+      end
+    end
   end
 end

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/dispatch_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe "Optitron::Response dispatch" do
+  it "should dispatch" do
+    target = mock('target')
+    target.should_receive(:params=).with({'verbose' => false})
+    target.should_receive(:install).with('thefile')
+    @parser = Optitron.new {
+      opt 'verbose', "Be very loud"
+      cmd "install", "This installs things" do
+        arg "file", "The file to install"
+      end
+    }
+    @parser.parse(%w(install thefile)).dispatch(target)
+  end
+end

data/spec/help_spec.rb

@@ -20,7 +20,7 @@ describe "Optitron::Parser help" do
         arg "thing", "Stuff to join", :type => :greedy, :required => true
       end
     }
-    @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"
+    @parser.help.should == "Commands\n\ninstall [file]                 # This installs things\n                               #   file -- The file to install\nshow [first] <second>          # This shows things\n                               #   first -- The first thing to show\n                               #   second -- The second optional thing to show\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                               #   thing -- Stuff to join\n\nGlobal options\n\n-v/--verbose                   # Be very loud"
   end
 
   it "generate help for non-command parsers" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -05:00
+date: 2010-08-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,6 +157,7 @@ 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