argument_parser 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feb0e8be78d5fc392980f1ac65520b131c34641207cc31b11d05badb7edf7fcc
-  data.tar.gz: a74b6300dec4d61257f941e57ff93cd7106190da441d1f09da621e6025f35320
+  metadata.gz: eecd312b1eb1999115cf96c25726e8e10f7b7e565fb0f21788dee9b4678604ab
+  data.tar.gz: a40f633e72a831c0b61e4a9cd0d86044b712563f161ccce9b427a85b07fc60e5
 SHA512:
-  metadata.gz: 9ad1572e3a661121609cfeffed61b1654bdbb94862e317944a5a1c1da9317b6315c5a6219258743275b670bb9c002ddee4188059526e1b2b55a333c34c2b1d0d
-  data.tar.gz: 9656697885fe68d0de72bcf459796f2cf16cb85c94aff6d258ac9ad595a2ccd6f92615f0eb419f6f7068c4e47d8a080013143bf63e994e0cb8813776b85fd76f
+  metadata.gz: 28f476cd2f2d61fc2f96ed1b25cf99b397a076bfab0b13b758404b427f922ec418c278515f06e993d019f1edfe15ea6c0389eef63b2fdb0b61374912a09ec947
+  data.tar.gz: 577cf49763a1fbaff672078ac2764b37af678a35226f4d7b1401dd48dc6dc5cae0e4ec85a664c05223842558640acb533efe70dc955399a6e250b6e421e55072

data/lib/argument_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArgumentParser
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/argument_parser.rb

@@ -19,18 +19,19 @@ module ArgumentParser
         in :required
           arg = argv[i]
           raise MissingArgument, "missing required argument: #{rule.name}" if arg.nil?
-          arg = validate!(arg, rule.options)
+          arg = validate_pattern!(arg, rule.options)
 
           result[rule.name] = arg
           i += 1
         in :optional
-          arg = validate!(argv[i], rule.options)
+          arg = validate_pattern!(argv[i], rule.options)
 
           result[rule.name] = arg || rule.options[:default]
           i += 1 if arg
         in :rest
           rest_args = argv.dup[i..] || []
-          rest_args.map! { |it| validate!(it, rule.options) }
+          validate_size(rest_args, rule.options)
+          rest_args.map! { |it| validate_pattern!(it, rule.options) }
 
           result[rule.name] = rest_args
           i = argv.size
@@ -44,27 +45,40 @@ module ArgumentParser
 
     private
 
-    def validate!(arg, options)
-      coerced_arg = coerce!(arg, options)
-      return coerced_arg unless options[:pattern]
+    def validate_pattern!(arg, options)
+      coerced_arg = coerce!(arg, options[:type])
+      pattern = options[:pattern]
+      return coerced_arg unless pattern
       return coerced_arg unless arg
-      return coerced_arg if options[:pattern] === coerced_arg
+      return coerced_arg if pattern === coerced_arg
+      return pattern[coerced_arg] if pattern.respond_to?(:key?) && pattern.key?(coerced_arg)
+      return coerced_arg if pattern.respond_to?(:include?) && pattern.include?(coerced_arg)
 
       raise InvalidArgument, "invalid argument: #{arg}"
     end
 
-    def coerce!(arg, options)
+    def validate_size(args, options)
+      if (min = options[:min])
+        raise InvalidArgument, "expected at least #{min} argument(s)" if args.size < min
+      end
+
+      if (max = options[:max])
+        raise InvalidArgument, "expected at most #{max} argument(s)" if args.size > max
+      end
+    end
+
+    def coerce!(arg, type)
       return arg unless arg
-      return arg unless options[:type]
+      return arg unless type
 
-      if options[:type] == Integer
+      if type == Integer
         Integer(arg)
-      elsif options[:type] == Float
+      elsif type == Float
         Float(arg)
-      elsif options[:type] == String
+      elsif type == String
         arg
       else
-        raise SchemaError, "type not supported: #{options[:type]}"
+        raise SchemaError, "type not supported: #{type}"
       end
     rescue ArgumentError
       raise InvalidArgument, "invalid argument: #{arg}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: argument_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Matheus Richard