lab42_rgxargs 0.1.0.pre → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f0a79cda8803391dd5e2f9e21cdc06c7032be12741542b1d715bd044623182
-  data.tar.gz: 47ad2d322cdd22197b63378d76097523544f7f141077d44d5e1127884b73e042
+  metadata.gz: 1284c83060453b9b65c017381fb3afb8388a2bff50bc256bfd1d4456f46a94d1
+  data.tar.gz: 8e51fe32f62a1d16b6ba4e6a7b99a6011e203041c5dcd7b19cce3ed751af818d
 SHA512:
-  metadata.gz: acf4d6f1e22bae17cfe89070e4a5a3e58650838d24e99545b75ab9c06c7b04fffeb3eecdcdbc131337a2324c0ac297ae16ac56c8d46adf85224ab92a42977fe5
-  data.tar.gz: bea5ef2c6b7d4d48645b6affd40716b5e14f57afc98ecc4d5fca045e530ae0ca52bfbf1148f763a0af97b069acd4c968f7dae83ac7f4e97bfe0e8b8637b4d251
+  metadata.gz: 428e2088c5f440857f952069a63e9dce4cb33e7ee331d4b7bfbde2bbaa7d9e623ed74b121a93650e8621c3c80e536b50761d1dfbcc04dbaba84bbee9210b238f
+  data.tar.gz: 2b455ae68e0a12c97a43f4395d3d49dcd0ca059532db4489fc71e2b17c74e664d8b422194e550fcec30992d16a0febe7294e641043bf1926bea7eb84fce136c4

data/lib/lab42/rgxargs/predefined_matchers.rb

@@ -1,14 +1,27 @@
 module Lab42::Rgxargs::PredefinedMatchers extend self
   PREDEFINED = {
-    list:  [%r{(\w+)(?:,(\w+))*},   ->(groups){ groups }],
+    int_list: [%r{\A(-?\d+(?:,-?\d+)*)\z}, ->(groups){ groups.first.split(",").map(&:to_i)}],
+    int_range: [%r{\A(-?\d+)(?:-|\.\.)(-?\d+)\z}, ->((f, l)){ Range.new(f.to_i, l.to_i) }],
+    list:  [%r{(\w+)(?:,(\w+))*},   ->(groups){ groups.compact }],
     range: [%r{\A(\d+)\.\.(\d+)\z}, ->(groups){ Range.new(*groups.map(&:to_i)) }]
   }
 
   def defined_names
      @__defined_names__ ||= PREDEFINED.keys.join("\n\t")
   end
+
   def fetch(key, default=nil, &blk)
     return PREDEFINED[key] if PREDEFINED.has_key?(key)
     blk ? blk.(key) : default
   end
+
+  def list_matcher values
+    [%r{\A((?:#{values.join("|")})(?:,(?:#{values.join("|")}))*)\z}, _list_extractor]
+  end
+
+
+  # Memoized
+  def _list_extractor
+    @__list_extractor__ ||= ->(groups){ groups.first.split(",") }
+  end
 end

data/lib/lab42/rgxargs.rb

@@ -1,11 +1,17 @@
+require 'forwardable'
 require 'ostruct'
 require 'lab42/enumerable'
+
 class Lab42::Rgxargs
   require_relative 'rgxargs/predefined_matchers'
   Predefined = PredefinedMatchers
 
+  extend Forwardable
+  def_delegators Predefined, :list_matcher
+
   attr_reader :args, :conversions, :defined_rules, :errors, :options, :syntaxes
 
+
   def add_conversion(param, conversion)
     case conversion
     when Symbol
@@ -27,7 +33,6 @@ class Lab42::Rgxargs
     end
   end
 
-
   def parse argv
     until argv.empty?
       argv = _parse_next argv

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lab42_rgxargs
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.0
 platform: ruby
 authors:
 - Robert Dober
@@ -62,9 +62,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: