optitron 0.1.3 → 0.1.4

data/Gemfile.lock

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

data/lib/optitron/class_dsl.rb

@@ -130,6 +130,7 @@ class Optitron
 
       def build
         unless @built
+          target = optitron_parser.target
           optitron_dsl.root.help unless send(:class_variable_defined?, :@@suppress_help)
           @cmds.each do |(cmd_name, cmd_desc, opts)|
             args = method_args[cmd_name.to_sym]
@@ -139,8 +140,11 @@ class Optitron
               opts.each { |o| opt *o }
               args.each do |(arg_name, arg_type, arg_default)|
                 possible_arg_type = arg_name.to_s[/_(string|hash|array|numeric|int|float)$/, 1]
-                possible_arg_type &&= possible_arg_type.to_sym
-                arg_opts = { :default => arg_default && eval(arg_default), :type => arg_types && arg_types.shift || possible_arg_type }
+                if possible_arg_type && (arg_types.nil? || !arg_types.first)
+                  possible_arg_type = possible_arg_type.to_sym
+                  arg_name = arg_name.to_s[/^(.*)_(?:string|hash|array|numeric|int|float)$/, 1]
+                end
+                arg_opts = { :default => arg_default && target.instance_eval(arg_default), :type => arg_types && arg_types.shift || possible_arg_type }
                 case arg_type
                 when :required
                   arg arg_name.to_s, arg_opts
@@ -158,8 +162,8 @@ class Optitron
       end
 
       def dispatch(args = ARGV, &blk)
-        build
         optitron_parser.target = blk ? blk.call : new
+        build
         response = optitron_parser.parse(args)
         if response.valid?
           optitron_parser.target.params = response.params

data/lib/optitron/help.rb

@@ -35,6 +35,9 @@ class Optitron
       if arg.default
         arg_line << "=#{arg.default.inspect}"
       end
+      if arg.type and !arg.greedy? and !arg.string?
+        arg_line << "(#{arg.type.to_s.upcase})"
+      end
       arg_line << (arg.required? ? ']' : '>')
       arg_line
     end

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/cli_spec.rb

@@ -69,7 +69,7 @@ end
 describe "Optitron::Parser defaults" do
   it "should generate the correct help" do
     CLIExample.build
-    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"
+    CLIExample.optitron_parser.help.strip.should == "Commands\n\nuse                                     # Use this\n  -u/--use_opt                          \nuse_too [one(HASH)] <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
@@ -93,6 +93,11 @@ describe "Optitron::Parser defaults" do
     capture(:stdout) { NoHelpExample.dispatch(%w(--help)) }.should == "Unknown command\nHelp is unrecognized\n"
   end
 
+  it "should strip the type information from the names when its using the _type info" do
+    CLIExampleWithArgHinting.build
+    CLIExampleWithArgHinting.optitron_parser.help.strip.should == "Commands\n\nuse_too [one] [two(NUMERIC)]       # Use this too\n\nGlobal options\n\n-?/--help                          # Print help message"
+  end
+
   it "should get type hinting from arg names" do
     capture(:stdout) { CLIExampleWithArgHinting.dispatch(%w(use_too asd 123)) }.should == "using this too \"asd\" 123\n"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -07:00
+date: 2010-08-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency