ejt_command_line 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzFiZTljMTMyMDIwOWU5MTUxN2UwOTc2OTNkNGQzN2ZlMTE3ZTc1OQ==
+    ZTM3ZWUyYmQzMjg2YzRlMjI0MmExY2VhZjUzNGQ5ZTRjNDVkNGQ0Yg==
   data.tar.gz: !binary |-
-    ZjU1MmE5YjczNmViMmUwNDEyN2ViNmFmMDNhOWIyNjllY2EwMTMzYw==
+    Y2M5OGYyY2YwZjRkNDA2NTVhN2U0N2EyNjMxMjA2ODYzYmFhMDBiMQ==
 SHA512:
   metadata.gz: !binary |-
-    NTA1YTcwYjQ4YTE5YWQzNTRkMzcxMGVmZDk1NTA5NDUyMmQ1YTJhZWU1YTIz
-    YjQ3ZGMwNmNmODY2OWYzNGYyNTUyMDllZjg2ZDIyZjNhNDZlNDAwNGM1OWZk
-    OTRhYzRmZjBjNWViNDRmNDllYWU1ZDhmYzZjYTY1NTgwMjFmZjY=
+    MmFjNDQ5N2E2NThkMmNjODAxMGY3YmFjYjA1NGQyYmRhYWFkZTI2NTA5MmNk
+    YzIxYTRjOWEyNTZkYTdlMDc2YjVkNTE4YzBmNTk3ZTk2NmNlMDc2ZDhlY2Zi
+    MjM4NmQ2YmViZjllOTdmZWQwMDMxOWZmNzY0NTIwM2E3OWNkZDc=
   data.tar.gz: !binary |-
-    MzIyM2RkNmQwNTk3N2QxNWEwZGY2ZGQ1YTY2MGY3MDlhZGQxMGU0NjcxYTlj
-    ZjQyZjEzMjc0MzZiNmRiZDk3NjdlNzJiYmZiZGFhYTVhNTdiYzZlNTM1MTZm
-    Y2NkOTk4Y2ZjYzc4ZmEzODJhZDQxNzNhOTdmMjBmYjA0OTVjNjE=
+    ZWExNWYzYjU2ZDM2NjFjYzVmN2VlYmFjNTM3YTc5MmFkOGIxNzJiZWFmMzVk
+    MWRhMDIwNGFmN2NiYjJjZTMyZTliZDBjMjFhNTVhNjI3OWQxNTYyYTZiZGFl
+    ZmZkODVmZjJiYzQ3MjZiZGJiYjhjNjhhZDFjNTI0ZjcwMmYyMzA=

data/lib/ejt_command_line.rb

@@ -25,14 +25,13 @@ module CommandLine
 
   #----------------------------------------------------------------
 
-  ValueType = Struct.new(:parser, :multi)
-
   class Switch
-    attr_reader :flags, :value_type
+    attr_reader :flags, :parser, :multi
 
-    def initialize(flags, value_type = nil)
+    def initialize(flags, parser = nil, multi = false)
       @flags = flags
-      @value_type = value_type
+      @parser = parser
+      @multi = multi
     end
 
     def has_flag?(flag)
@@ -125,15 +124,7 @@ module CommandLine
         raise ConfigureError, "duplicate value type '#{sym}'"
       end
 
-      @value_types[sym] = ValueType.new(parser, false)
-    end
-
-    def multivalue_type(sym, &parser)
-      if @value_types.member?(sym)
-        raise ConfigureError, "duplicate value type '#{sym}'"
-      end
-
-      @value_types[sym] = ValueType.new(parser, true)
+      @value_types[sym] = parser
     end
 
     def simple_switch(sym, *flags)
@@ -141,7 +132,11 @@ module CommandLine
     end
 
     def value_switch(sym, value_sym, *flags)
-      @switches[sym] = Switch.new(flags, get_value_type(value_sym))
+      @switches[sym] = Switch.new(flags, get_value_parser(value_sym))
+    end
+
+    def multivalue_switch(sym, value_sym, *flags)
+      @switches[sym] = Switch.new(flags, get_value_parser(value_sym), true)
     end
 
     def global(&block)
@@ -184,23 +179,19 @@ module CommandLine
     end
 
     private
-    def parse_value(arg, s, args, old_value)
-      if s.value_type
+    def parse_value(arg, s, args, old_value = nil)
+      if s.parser
         if args.size == 0
           raise ParseError, "no value specified for switch '#{arg}'"
         end
 
         value = args.shift
         begin
-          v = s.value_type.parser.call(value)
-          if s.value_type.multi
-            if old_value.nil?
-              [v]
-            else
-              old_value << v
-            end
-          else
+          v = s.parser.call(value)
+          if old_value.nil?
             v
+          else
+            old_value << v
           end
         rescue => e
           raise ParseError, "couldn't parse value '#{arg}=#{value}'\n#{e}"
@@ -222,7 +213,12 @@ module CommandLine
 
         if arg =~ /^-/
           sym, s = find_switch(valid_switches, arg)
-          opts[sym] = parse_value(arg, s, args, opts[sym])
+
+          if s.multi
+            opts[sym] = parse_value(arg, s, args, opts[sym] || [])
+          else
+            opts[sym] = parse_value(arg, s, args)
+          end
 
         else
           cmd = arg.intern
@@ -261,9 +257,12 @@ module CommandLine
       end
     end
 
-    def get_value_type(sym)
-      raise ConfigureError, "unknown value type '#{sym}'" unless @value_types.member?(sym)
-      @value_types[sym]
+    def get_value_parser(sym)
+      if @value_types.member?(sym)
+        @value_types[sym]
+      else
+        raise ConfigureError, "unknown value type '#{sym}'"
+      end
     end
 
     def bracket_(release)

data/lib/ejt_command_line/version.rb

@@ -1,3 +1,3 @@
 module EjtCommandLine
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/command_line_spec.rb

@@ -54,32 +54,6 @@ describe "Parser" do
     end
   end
 
-  describe "multi value types" do
-    it "should allow you to register new multi value types" do
-      @clh.configure do
-        multivalue_type :string do |str|
-          str
-        end
-
-        multivalue_type :int do |str|
-          str.to_i
-        end
-      end
-    end
-
-    it "should fail it you try and define a duplicate value type" do
-      @clh.value_type :string do |str|
-        str
-      end
-
-      expect do
-        @clh.value_type :string do |str|
-          str
-        end
-      end.to raise_error(ConfigureError, /string/)
-    end
-  end
-
   describe "switches are defined separately from commands" do
     it "should let you define binary switch" do
       help_switch
@@ -98,6 +72,16 @@ describe "Parser" do
         value_switch :resize_to, :volume_size, '--resize-to'
       end
     end
+
+    it "should let you define an option that can occur multiple times" do
+      @clh.configure do
+        value_type :filter do |str|
+          str
+        end
+
+        multivalue_switch :test_class, :filter, '--test-class'
+      end
+    end
   end
 
   describe "global switches" do
@@ -213,23 +197,24 @@ describe "Parser" do
         @clh.parse(handler, 'one', '-c', '17', 'two')
       end
 
-      it "should handle multivalued switches" do
+      it "should handle multivalue switches" do
         handler = double()
 
         @clh.configure do
-          multivalue_type :ints do |str|
+          value_type :int do |str|
             str.to_i
           end
 
-          value_switch :counts, :ints, '--count'
+          multivalue_switch :port, :int, '--port', '-p'
+
           global do
-            switches :counts
+            switches :port
           end
         end
 
         handler.should_receive(:global_command).
-          with({:counts => [1, 3, 5]}, ['one', 'two'])
-        @clh.parse(handler, 'one', '--count', '1', 'two', '--count', '3', '--count', '5')
+          with({:port => [8080, 8081]}, ['one', 'two'])
+        @clh.parse(handler, *%w[-p 8080 one -p 8081 two])
       end
 
       it "should raise an ArgumentError if no value is given for a valued switch" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ejt_command_line
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Joe Thornber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler