optitron 0.0.10 → 0.0.11

data/Gemfile.lock

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

data/README.rdoc

@@ -115,7 +115,6 @@ Now, try running it.
   class Runner < Optitron::CLI
   
     class_opt 'verbose'
-    use_help
   
     desc "Install stuff"
     opt 'force'
@@ -130,14 +129,14 @@ Running this gives you
 
   crapbook-pro:optitron joshua$ ruby ideal.rb --help
   Commands
-  
-  install [file] <source>       # Install stuff
-    -f/--force                  
-  
+
+  install [file] <required="yourmom">       # Install stuff
+    -f/--force                              
+
   Global options
-  
-  -v/--verbose                  
-  -?/--help                     # Print help message
+
+  -v/--verbose                              
+  -?/--help                                 # Print help message
 
   crapbook-pro:optitron joshua$ ruby ideal.rb install
   File is required

data/lib/optitron/class_dsl.rb

@@ -47,9 +47,12 @@ class Optitron
           when :block
             lasgn = t.shift
             lasgn.shift
-            arg_list[-1].shift
-            arg_list[-1] << :optional
-            arg_list[-1] << @ruby2ruby.process(lasgn.last)
+            name = lasgn.shift
+            sub_part = arg_list.find{|arg| arg.first == name}
+            sub_part.clear
+            sub_part << name
+            sub_part << :optional
+            sub_part << @ruby2ruby.process(lasgn.last)
           end
         end
       end

data/lib/optitron/version.rb

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

data/spec/cli_spec.rb

@@ -22,6 +22,10 @@ class CLIExample < Optitron::CLI
   opt 'another_opt_as_well', :default => 123
   def use_greedy(one, *two)
   end
+
+  desc "something with an array"
+  def with_array(ary=[1,2,3])
+  end
 end
 
 class AnotherCLIExample < Optitron::CLI
@@ -43,7 +47,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_greedy [one] [two1 two2 ...]       # Use this three\n  -A/--another_opt_as_well=[NUMERIC]   \nuse_too [one] <required=\"three\">       # Use this too\n  -a/--another_opt                     \nuse                                    # Use this\n  -u/--use_opt                         \n\nGlobal options\n\n-v/--verbose                           \n-?/--help                              # Print help message"
+    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"
   end
 
   it "should dispatch" do
@@ -52,7 +56,7 @@ describe "Optitron::Parser defaults" do
 
   it "should generate the correct help" do
     AnotherCLIExample.build
-    AnotherCLIExample.optitron_parser.help.strip.should == "Commands\n\nuse_too [one] <required=\"three\">       # Use this too\n  -a/--another_opt                     \n\nGlobal options\n\n-v/--verbose                           \n-?/--help                              # Print help message"
+    AnotherCLIExample.optitron_parser.help.strip.should == "Commands\n\nuse_too [one] <two=\"three\">       # Use this too\n  -a/--another_opt                \n\nGlobal options\n\n-v/--verbose                      \n-?/--help                         # Print help message"
   end
 
   it "should dispatch with a custom initer" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Joshua Hull