optitron 0.1.2 → 0.1.3

data/Gemfile.lock

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

data/README.rdoc

@@ -102,6 +102,13 @@ Will produce the error <tt>Truth is invalid</tt>. Calling with
   
 however, will correctly invoke the method.
 
+These same arg type hints can be provided by ending your arguments in _type. The accepted types are: float, string, int, numeric, array, hash. For example
+
+  desc "Does something awesome"
+  def start(number_int, something_string, opt_boolean)
+    # ... does something
+  end
+
 
 === Options
 

data/lib/optitron/class_dsl.rb

@@ -138,13 +138,16 @@ class Optitron
             optitron_dsl.root.cmd(cmd_name, cmd_desc) do
               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 }
                 case arg_type
                 when :required
-                  arg arg_name.to_s, :default => arg_default && eval(arg_default), :type => arg_types && arg_types.shift
+                  arg arg_name.to_s, arg_opts
                 when :optional
-                  arg arg_name.to_s, :default => arg_default && eval(arg_default), :required => false, :type => arg_types && arg_types.shift
+                  arg arg_name.to_s, arg_opts.merge(:required => false)
                 when :greedy
-                  arg arg_name.to_s, :default => arg_default && eval(arg_default), :type => :greedy
+                  arg arg_name.to_s, arg_opts.merge(:type => :greedy)
                 end
               end
             end

data/lib/optitron/option.rb

@@ -1,7 +1,7 @@
 class Optitron
   class Option
-    attr_reader :inclusion_test
-    attr_accessor :required, :name, :default, :parameterize, :type, :desc, :has_default
+    attr_reader :inclusion_test, :type
+    attr_accessor :required, :name, :default, :parameterize, :desc, :has_default
     alias_method :required?, :required
     alias_method :has_default?, :has_default
     alias_method :parameterize?, :parameterize
@@ -21,6 +21,14 @@ class Optitron
       @inclusion_test = tester
     end
     
+    def type=(type)
+      @type = case type
+      when :int then :numeric
+      when :float, :numeric, :string, :array, :hash, :boolean, :greedy, nil then type
+      else raise("Unknown type #{type.inspect}")
+      end
+    end
+    
     def interpolate_type(default)
       @type = case default
       when nil
@@ -78,6 +86,8 @@ class Optitron
         Integer(val)
       when :array
         Array(val)
+      when :float
+        Float(val)
       when :hash
         val.is_a?(Hash) ? val : raise
       when :greedy, nil, :string
@@ -129,7 +139,7 @@ class Optitron
               tokens.delete_at(opt_tok_index).lit
             end
             response.params_array << [self, value.nil? ? !default : value]
-          when :numeric, :string
+          when :numeric, :string, :float
             value = if opt_tok.name == name
               if opt_tok.respond_to?(:value)
                 opt_tok.value

data/lib/optitron/version.rb

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

data/spec/cli_spec.rb

@@ -17,7 +17,7 @@ class CLIExample < Optitron::CLI
   opt 'another_opt'
   arg_types :hash
   def use_too(one, two = 'three')
-    puts "one: #{one.inspect} #{two.inspect}"
+    puts "one: #{one.to_a.sort.inspect} #{two.inspect}"
   end
 
   desc "Use this three"
@@ -58,6 +58,13 @@ class NoHelpExample < Optitron::CLI
   end
 end
 
+class CLIExampleWithArgHinting < Optitron::CLI
+  desc "Use this too"
+  def use_too(one_string, two_int)
+    puts "using this too #{one_string.inspect} #{two_int.inspect}"
+  end
+end
+
 
 describe "Optitron::Parser defaults" do
   it "should generate the correct help" do
@@ -70,7 +77,7 @@ describe "Optitron::Parser defaults" do
   end
 
   it "should dispatch with the type hinting" do
-    capture(:stdout) { CLIExample.dispatch(%w(use_too one:two three:four))}.should == "one: {\"three\"=>\"four\", \"one\"=>\"two\"} \"three\"\n"
+    capture(:stdout) { CLIExample.dispatch(%w(use_too one:two three:four))}.should == 'one: [["one", "two"], ["three", "four"]] "three"' + "\n"
   end
 
   it "should generate the correct help" do
@@ -85,4 +92,8 @@ describe "Optitron::Parser defaults" do
   it "should be able to suppress help" do
     capture(:stdout) { NoHelpExample.dispatch(%w(--help)) }.should == "Unknown command\nHelp is unrecognized\n"
   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
 end

data/spec/validation_spec.rb

@@ -51,6 +51,70 @@ describe "Optitron::Parser types" do
     end
   end
 
+  context "float" do
+    context "on args" do
+      before(:each) {
+        @parser = Optitron.new {
+          cmd "kill" do
+            arg 'volumne', :type => :float
+          end
+        }
+      }
+
+      it "should parse 'kill 123'" do
+        response = @parser.parse(%w(kill 123))
+        response.command.should == 'kill'
+        response.args.first.should == 123
+        response.valid?.should be_true
+      end
+
+      it "should parse 'kill 123.345'" do
+        response = @parser.parse(%w(kill 123.345))
+        response.command.should == 'kill'
+        response.args.first.should == 123.345
+        response.valid?.should be_true
+      end
+
+      it "shouldn't parse 'kill asd'" do
+        response = @parser.parse(%w(kill asd))
+        response.command.should == 'kill'
+        response.args.first.should == 'asd'
+        response.valid?.should be_false
+      end
+    end
+
+    context "on opts" do
+      before(:each) do
+        @parser = Optitron.new do
+          cmd "kill" do
+            opt 'pid', :type => :float
+          end
+        end
+      end
+
+      it "should parse 'kill --pid=123'" do
+        response = @parser.parse(%w(kill --pid=123))
+        response.command.should == 'kill'
+        response.params['pid'].should == 123
+        response.valid?.should be_true
+      end
+
+      it "should parse 'kill --pid=123.345'" do
+        response = @parser.parse(%w(kill --pid=123.345))
+        response.command.should == 'kill'
+        response.params['pid'].should == 123.345
+        response.valid?.should be_true
+      end
+
+      it "shouldn't parse 'kill --pid=asd'" do
+        response = @parser.parse(%w(kill --pid=asd))
+        response.command.should == 'kill'
+        response.params['pid'].should == 'asd'
+        response.valid?.should be_false
+      end
+    end
+  end
+
   context "array" do
     context "on opt" do
       before(:each) {

metadata

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