ejt_command_line 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGJjNDk5YTA2MzhiN2NhZTliNzlmZDBiMDNkZDkyOGVjOGZkNzcwYQ==
+    NzFiZTljMTMyMDIwOWU5MTUxN2UwOTc2OTNkNGQzN2ZlMTE3ZTc1OQ==
   data.tar.gz: !binary |-
-    Mjc0NGRjZjYwZTdjYTA4N2E2YjcwY2Q3NmUwMTVhMjNhYTQ3OWEyNQ==
-!binary "U0hBNTEy":
+    ZjU1MmE5YjczNmViMmUwNDEyN2ViNmFmMDNhOWIyNjllY2EwMTMzYw==
+SHA512:
   metadata.gz: !binary |-
-    MzQ1Mzk1ZWUzYWM5MGQyYzIzMzk1MWZkMmYxZmI2MzM4N2RiOWVjM2E0YWI0
-    NWQ5NDA4YzFiZjlhZTliNzkxZGFiYzdmMDlkNzhlNTNmOGVkMGY1YWZhZDdj
-    OTlkY2YxYWU3ZDUwNTJmM2EwOTU3MzM0NThiYjQ3YjlmYmQ3YmY=
+    NTA1YTcwYjQ4YTE5YWQzNTRkMzcxMGVmZDk1NTA5NDUyMmQ1YTJhZWU1YTIz
+    YjQ3ZGMwNmNmODY2OWYzNGYyNTUyMDllZjg2ZDIyZjNhNDZlNDAwNGM1OWZk
+    OTRhYzRmZjBjNWViNDRmNDllYWU1ZDhmYzZjYTY1NTgwMjFmZjY=
   data.tar.gz: !binary |-
-    NGI5Y2M5NGNmMDZlZTQ4NTUxODIxZGM0NjBiMzliODAxZGQxODhmOWYyZDM1
-    NDJlYTQ4OTkxMjBmNWQzOWU4M2JhOTk3ZTk0YmRlNjczZWRiZGIzNjhiYWY3
-    NzFlZDFmNTA0OGU3MjY5NzZmNDZkNzg2MDQ1YWFkYjNlOGZjOTk=
+    MzIyM2RkNmQwNTk3N2QxNWEwZGY2ZGQ1YTY2MGY3MDlhZGQxMGU0NjcxYTlj
+    ZjQyZjEzMjc0MzZiNmRiZDk3NjdlNzJiYmZiZGFhYTVhNTdiYzZlNTM1MTZm
+    Y2NkOTk4Y2ZjYzc4ZmEzODJhZDQxNzNhOTdmMjBmYjA0OTVjNjE=

data/lib/ejt_command_line/version.rb

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

data/lib/ejt_command_line.rb

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

data/spec/command_line_spec.rb

@@ -15,7 +15,7 @@ describe "Parser" do
 
   describe "creation" do
     it "should take a config block" do
-      block_watcher = mock()
+      block_watcher = double()
       block_watcher.should_receive(:executed)
 
       clh = Parser.new do
@@ -54,6 +54,32 @@ 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
@@ -123,18 +149,18 @@ describe "Parser" do
   describe "parsing" do
     describe "global command" do
       it "should handle no switches" do
-        handler = mock()
+        handler = double()
         handler.should_receive(:global_command).with({}, [])
         @clh.parse(handler)
       end
 
       it "should raise a ParseError if an unrecognised switch is used" do
-        handler = mock()
+        handler = double()
         expect {@clh.parse(handler, '--go-back-in-time')}.to raise_error(ParseError, /--go-back-in-time/)
       end
 
       it "should handle binary switches" do
-        handler = mock()
+        handler = double()
         handler.should_receive(:global_command).with({:help => true}, [])
 
         @clh.configure do
@@ -148,7 +174,7 @@ describe "Parser" do
       end
 
       it "should handle multiple binary switches" do
-        handler = mock()
+        handler = double()
         handler.should_receive(:global_command).with({:help => true, :ro => true}, [])
 
         @clh.configure do
@@ -164,7 +190,7 @@ describe "Parser" do
       end
 
       it "should handle valued switches" do
-        handler = mock()
+        handler = double()
 
         @clh.configure do
           value_type :int do |str|
@@ -187,8 +213,27 @@ describe "Parser" do
         @clh.parse(handler, 'one', '-c', '17', 'two')
       end
 
+      it "should handle multivalued switches" do
+        handler = double()
+
+        @clh.configure do
+          multivalue_type :ints do |str|
+            str.to_i
+          end
+
+          value_switch :counts, :ints, '--count'
+          global do
+            switches :counts
+          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')
+      end
+
       it "should raise an ArgumentError if no value is given for a valued switch" do
-        handler = mock()
+        handler = double()
 
         @clh.configure do
           value_type :int do |str|
@@ -208,7 +253,7 @@ describe "Parser" do
       end
 
       it "should filter non-switches out" do
-        handler = mock()
+        handler = double()
         handler.should_receive(:global_command).
           with({:help => true, :ro => true}, ['my_file', 'my_other_file'])
 
@@ -232,7 +277,7 @@ describe "Parser" do
           end
         end
 
-        handler = mock()
+        handler = double()
         handler.should_receive(:create).with({}, ['fred'])
         @clh.parse(handler, 'create', 'fred')
       end
@@ -265,13 +310,13 @@ describe "Parser" do
       end
 
       it "should allow you to define a sub command" do
-        handler = mock()
+        handler = double()
         handler.should_receive(:resize).with({:grow_to => 12345}, ['fred'])
         @clh.parse(handler, 'resize', '--grow-to', '12345', 'fred')
       end
 
       it "should prevent you calling two sub commands on the same line" do
-        handler = mock()
+        handler = double()
         handler.should_receive(:resize).
           with({:grow_to => 1234, :shrink_to => 2345}, ['shrink', 'fred'])
         @clh.parse(handler, 'resize', '--grow-to', '1234', 'shrink', '--shrink-to', '2345', 'fred')
@@ -297,14 +342,14 @@ describe "Parser" do
       end
 
       it "should parse one exclusive switch" do
-        handler = mock()
+        handler = double()
         handler.should_receive(:resize).
           with({:grow_to => 1234}, ['fred'])
         @clh.parse(handler, 'resize', '--grow-to', '1234', 'fred')
       end
 
       it "should raise a ParseError if more than one switch from an exclusive set is defined" do
-        handler = mock()
+        handler = double()
         expect do
           @clh.parse(handler, 'resize', '--grow-to', '1234', '--shrink-by', '2345', 'fred')
         end.to raise_error(ParseError, /mutually exclusive/)
@@ -340,14 +385,14 @@ describe "Parser" do
     end
 
     it "should parse ok if mandatory switch is given" do
-      handler = mock()
+      handler = double()
       handler.should_receive(:resize).
         with({:grow_to => 3}, ['fred'])
       @clh.parse(handler, 'resize', '--grow-to', '3', 'fred')
     end
 
     it "should raise a ParseError if a mandatory switch is omitted" do
-      handler = mock()
+      handler = double()
       expect do
         @clh.parse(handler, 'resize', 'fred')
       end.to raise_error(ParseError, /grow_to/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ejt_command_line
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Joe Thornber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command line parser