ex_aequo_cli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 177a771838a71e6e19364a2cc249d3cbc8d4fdcd57b9fc4a40297d940218c5e3
-  data.tar.gz: dd88326d996afc7b50decef6fddd580b6da2f601778476fb91b75a2f7bc606f3
+  metadata.gz: 0fca7956e66b06df6a1ecd8490556ac3d286ac068014bac48ef70a32fa12152d
+  data.tar.gz: 2d8150a6c6d1fe451e3ba9e9b44bcc19c7b2e6f0d4dd275012b11d48f059cfd7
 SHA512:
-  metadata.gz: '087b09cf266ec3582c43444a93980bcc323934e8b48df89ebe857becacb40ab81808500ccf17583c584a67276817a1b23659c928caaeaf57f9c63d97faa3b4cc'
-  data.tar.gz: 06db8391dc3ba28688f572723c866da96a4a58339a62897dc95356b849725c524fee01df04b598914c0f4c109943d3585fdfd6df8328e29bc0789e1c289105ee
+  metadata.gz: f71630f881eb23a67dbcb99aa3373eee513178e8e5b3198a2b09f88f34abf618f0694e4586189bd7cae47f97a6af8e8bceb9fabd93911729a4f244960328391c
+  data.tar.gz: 4fb1f146ec054018eb537ef0f088b4acc694ee8a01ef2324d1b0d6d0a95655b1fcc5b9538b1e571af1c23405798fbfdfd9d7447d92574c68c258130e938cd771

data/lib/ex_aequo/cli/args/checker.rb

@@ -3,32 +3,62 @@
 module ExAequo
   module Cli
     class Args
-      class Checker
-
+      class ArgChecker
         def check!(result)
-          raise ConstraintError, "#{@name} in \n#{result.inspect}" unless @blk.(result)
+          case @slice
+          when Range
+            check_range!(result)
+          else
+            check_values!(result)
+          end
+        rescue Exception => re
+          raise ConstraintError, "#{@name} in \n#{re.message}"
         end
 
         private
-        def initialize(name:, &blk)
+        def initialize(name:, slice:, &blk)
           @blk = blk
           @name = name
+          @slice = make_slice(slice)
+        end
+
+        def check_range!(result)
+          result.args[@slice].each { check_value!(it) }
+        end
+
+        def check_value!(value)
+          raise ConstraintError, "#{@name} in \n#{value.inspect}" unless @blk.(value)
+        end
+
+        def check_values!(result)
+          result.args.values_at(*@slice).each { check_value!(it) }
         end
-          
 
-        def maybe_replace(result, definition)
-          case definition
-          when Symbol
-            replace_if_defined result, definition
+        def make_slice(slice)
+          case slice
+          when Range
+            slice
+          when Integer
+            [slice]
+          when Array
+            slice
           else
-            definition
+            raise ArgumentError, "slice #{slice.inspect} must be a Range, Array or Integer"
           end
         end
+      end
 
-        def replace_if_defined(result, definition)
-          result
-            .values
-            .fetch(definition, definition)
+      class Checker
+        def check!(result)
+          raise ConstraintError, "#{@name} in \n#{result.inspect}" unless @blk.(result)
+        rescue Exception => re
+          raise ConstraintError, "#{@name} in \n#{re.message}"
+        end
+
+        private
+        def initialize(name:, &blk)
+          @blk = blk
+          @name = name
         end
       end
     end

data/lib/ex_aequo/cli/args.rb

@@ -16,7 +16,6 @@ module ExAequo
         new.parse(args, strict: false, &blk)
       end
 
-
       def check(name, &blk)
         raise ArgumentError, 'check method needs a block' unless blk
 
@@ -24,6 +23,15 @@ module ExAequo
         self
       end
 
+      def check_args(name, slice, &blk)
+        raise ArgumentError, 'check_arg method needs a block' unless blk
+
+        slice = [slice] unless Enumerable === slice
+        checkers << ArgChecker.new(name:, slice:, &blk)
+
+        self
+      end
+
       def parse(args, strict: true)
         @args = args
 

data/lib/ex_aequo/cli/version.rb

@@ -2,7 +2,7 @@
 
 module ExAequo
   module Cli
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ex_aequo_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Robert Dober
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement