optitron 0.0.6 → 0.0.7

data/lib/optitron/option.rb

@@ -76,16 +76,24 @@ class Optitron
         tok.respond_to?(:name) and [name, short_name].include?(tok.name)
       end
 
+      def find_matching_token(tokens)
+        tokens.find do |t|
+          if t.respond_to?(:name) and (t.name == name or t.name == short_name)
+            t.respond_to?(:value) ^ (t.name == short_name)
+          end
+        end
+      end
+
       def consume(response, tokens)
-        if opt_tok = tokens.find{|t| t.respond_to?(:name) and (t.name == short_name or t.name == name)}
+        if opt_tok = find_matching_token(tokens)
           opt_tok_index = tokens.index(opt_tok)
           tokens.delete_at(opt_tok_index)
           case @type
           when :boolean
             value = if opt_tok.respond_to?(:value)
               opt_tok.value
-            elsif opt_tok.name == short_name and tokens[opt_tok_index].respond_to?(:val) and BOOLEAN_VALUES.include?(tokens[opt_tok_index].val)
-              tokens.delete_at(opt_tok_index).val
+            elsif opt_tok.name == short_name and tokens[opt_tok_index].respond_to?(:lit) and BOOLEAN_VALUES.include?(tokens[opt_tok_index].lit)
+              tokens.delete_at(opt_tok_index).lit
             end
             response.params_array << [self, value.nil? ? !default : value]
           when :numeric, :string
@@ -95,8 +103,8 @@ class Optitron
               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 tokens[opt_tok_index].respond_to?(:lit)
+              tokens.delete_at(opt_tok_index).lit
             elsif default
               default
             else
@@ -106,8 +114,8 @@ class Optitron
           when :array
             values = []
             values << opt_tok.value if opt_tok.respond_to?(:value)
-            while tokens[opt_tok_index].respond_to?(:val)
-              values << tokens.delete_at(opt_tok_index).val
+            while tokens[opt_tok_index].respond_to?(:lit)
+              values << tokens.delete_at(opt_tok_index).lit
             end
             response.params_array << [self, values]
           when :hash
@@ -116,8 +124,8 @@ class Optitron
               response.add_error("not in the form key:value", name) if opt_tok.value[':'].nil?
               values << opt_tok.value.split(':', 2)
             end
-            while tokens[opt_tok_index].respond_to?(:val) and !tokens[opt_tok_index].val[':'].nil?
-              values << tokens.delete_at(opt_tok_index).val.split(':', 2)
+            while tokens[opt_tok_index].respond_to?(:lit) and !tokens[opt_tok_index].lit[':'].nil?
+              values << tokens.delete_at(opt_tok_index).lit.split(':', 2)
             end
             response.params_array << [self, Hash[values]]
           else
@@ -153,7 +161,7 @@ class Optitron
       end
       
       def consume(response, tokens)
-        arg_tokens = tokens.select{ |tok| tok.respond_to?(:val) }
+        arg_tokens = tokens.select{ |tok| tok.respond_to?(:lit) }
         if type == :greedy
           response.args_with_tokens << [self, []]
           while !arg_tokens.size.zero?

data/lib/optitron/parser.rb

@@ -19,15 +19,15 @@ class Optitron
       options = @options 
       args = @args
       if !@commands.empty?
-        potential_cmd_toks = tokens.select { |t| t.respond_to?(:val) }
-        if cmd_tok = potential_cmd_toks.find { |t| @commands[t.val] }
+        potential_cmd_toks = tokens.select { |t| t.respond_to?(:lit) }
+        if cmd_tok = potential_cmd_toks.find { |t| @commands[t.lit] }
           tokens.delete(cmd_tok)
-          response.command = cmd_tok.val
-          options += @commands[cmd_tok.val].options
-          args = @commands[cmd_tok.val].args
+          response.command = cmd_tok.lit
+          options += @commands[cmd_tok.lit].options
+          args = @commands[cmd_tok.lit].args
         else
           potential_cmd_toks.first ?
-            response.add_error('an unknown command', potential_cmd_toks.first.val) :
+            response.add_error('an unknown command', potential_cmd_toks.first.lit) :
             response.add_error('unknown command')
         end
       end

data/lib/optitron/response.rb

@@ -35,10 +35,10 @@ class Optitron
       compile_params
       @args = @args_with_tokens.map { |(arg, tok)| 
         begin
-          tok.is_a?(Array) ? tok.map{ |t| arg.validate(t.val) } : arg.validate(tok.val)
+          tok.is_a?(Array) ? tok.map{ |t| arg.validate(t.lit) } : arg.validate(tok.lit)
         rescue
           add_error('invalid', arg.name)
-          tok.is_a?(Array) ? tok.map{ |t| t.val } : tok.val
+          tok.is_a?(Array) ? tok.map{ |t| t.lit } : tok.lit
         end
       }
       @args.flatten!
@@ -50,7 +50,7 @@ class Optitron
         
         if @errors.empty?
           @tokens.each do |token|
-            add_error('unrecognized', token.val)
+            add_error('unrecognized', token.lit)
           end
         end
       end

data/lib/optitron/tokenizer.rb

@@ -6,7 +6,7 @@ class Optitron
       tokenize
     end
 
-    Value = Struct.new(:val)
+    Value = Struct.new(:lit)
     Named = Struct.new(:name)
     NamedWithValue = Struct.new(:name, :value)
 
@@ -15,9 +15,9 @@ class Optitron
         @tokens = @opts.map {|t|
           case t
           when /^--([^=]+)=([^=]+)$/ then NamedWithValue.new($1, $2)
-          when /^--([^=]+)$/         then Named.new($1)
+          when /^--([^=]+)$/         then NamedWithValue.new($1, nil)
           when /^-(.*)/              then $1.split('').map{|letter| Named.new(letter)}
-          else                          Value.new(t)
+          else                            Value.new(t)
           end
         }
         @tokens.flatten!

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/option_spec.rb

@@ -44,6 +44,10 @@ describe "Optitron::Parser options" do
       @parser.parse(%w(--verbose true)).valid?.should be_false
     end
 
+    it "shouldn't parse '--v'" do
+      @parser.parse(%w(--v)).valid?.should be_false
+    end
+
     it "shouldn't parse '--verbose=true'" do
       @parser.parse(%w(--verbose=true)).valid?.should be_true
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -07:00
+date: 2010-08-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency