optitron 0.0.3 → 0.0.4

data/lib/optitron/option.rb

@@ -14,6 +14,11 @@ class Optitron
       interpolate_type(default)
       @default = default
     end
+
+    def inclusion_test=(tester)
+      interpolate_type(tester.first)
+      @inclusion_test = tester
+    end
     
     def interpolate_type(default)
       @type = case default
@@ -31,7 +36,7 @@ class Optitron
     end
 
     def validate(val)
-      case @type
+      validated_type = case @type
       when :boolean
         if TRUE_BOOLEAN_VALUES.include?(val)
           true
@@ -51,6 +56,8 @@ class Optitron
       else
         raise
       end
+      @inclusion_test.include?(validated_type) or raise if @inclusion_test
+      validated_type
     end
 
     class Opt < Option
@@ -61,6 +68,7 @@ class Optitron
         end
         @name, @desc = name, desc
         @type = opts && opts[:type] || :boolean
+        self.inclusion_test = opts[:in] if opts && opts[:in]
         self.default = opts && opts.key?(:default) ? opts[:default] : (@type == :boolean ? false : nil)
       end
 
@@ -80,15 +88,19 @@ class Optitron
               tokens.delete_at(opt_tok_index).val
             end
             response.params_array << [self, value.nil? ? !default : value]
-          when :numeric
-            value = if opt_tok.name == name and opt_tok.respond_to?(:value)
-              opt_tok.value
+          when :numeric, :string
+            value = if opt_tok.name == name
+              if opt_tok.respond_to?(:value)
+                opt_tok.value
+              else
+                response.add_error("missing", opt_tok.name)
+              end
             elsif tokens[opt_tok_index].respond_to?(:val)
               tokens.delete_at(opt_tok_index).val
             elsif default
               default
             else
-              response.add_error("required", opt.name)
+              response.add_error("required", opt_tok.name)
             end
             response.params_array << [self, value]
           when :array
@@ -128,13 +140,14 @@ class Optitron
     end
     
     class Arg < Option
-      attr_accessor :greedy
+      attr_accessor :greedy, :inclusion_test
       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]
         @required = opts && opts.key?(:required) ? opts[:required] : true
         @type = opts && opts[:type]
       end

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/option_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe "Optitron::Parser options" do
+  context "long names vs short names" do
+    before(:each) do
+      @parser = Optitron.new {
+        opt "option", :type => :string
+      }
+    end
+    
+    it "should parse '-o test'" do
+      @parser.parse(%w(-o test)).params.should == {'option' => 'test'}
+    end
+
+    it "should parse '--option=test'" do
+      @parser.parse(%w(--option=test)).params.should == {'option' => 'test'}
+    end
+
+    it "shouldn't parse '--option test'" do
+      @parser.parse(%w(--option test)).valid?.should be_false
+    end
+
+    it "shouldn't parse '-option test'" do
+      @parser.parse(%w(-option test)).valid?.should be_false
+    end
+  end
+
+  context "multiple options" do
+    before(:each) do
+      @parser = Optitron.new {
+        opt "1"
+        opt "2"
+        opt "3"
+        opt "option", :type => :string
+      }
+    end
+    
+    it "should parse '-123o test'" do
+      @parser.parse(%w(-123o test)).params.should == {'option' => 'test', '1' => true, '2' => true, '3' => true}
+    end
+  end
+end

data/spec/{type_spec.rb → validation_spec.rb}

@@ -102,4 +102,29 @@ describe "Optitron::Parser types" do
       end
     end
   end
+
+  context "inclusion" do
+    before(:each) {
+      @parser = Optitron.new {
+        opt 'pid', :in => [1, 2, 3, 4]
+        opt 'range', :in => 0...100
+      }
+    }
+
+    it "should parse 'parse --pid=3'" do
+      @parser.parse(%w(--pid=3)).params.should == {'pid' => 3}
+    end
+
+    it "should parse 'parse --range=56'" do
+      @parser.parse(%w(--range=56)).params.should == {'range' => 56}
+    end
+
+    it "shouldn't parse 'parse --range=156'" do
+      @parser.parse(%w(--range=156)).valid?.should be_false
+    end
+
+    it "shouldn't parse 'parse --pid=9'" do
+      @parser.parse(%w(--pid=9)).valid?.should be_false
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Joshua Hull
@@ -62,12 +62,13 @@ files:
 - spec/default_spec.rb
 - spec/dispatch_spec.rb
 - spec/errors_spec.rb
+- spec/option_spec.rb
 - spec/other_spec.rb
 - spec/short_name_spec.rb
 - spec/simple_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/type_spec.rb
+- spec/validation_spec.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/optitron
 licenses: []