l43_opt_parser 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7480fcd5f83ef14a37ccbe58bf3beea44d2ce219a87c686be600051b10879870
-  data.tar.gz: faab1f7444bcd6d8a1e479206a6d1a18a40d9b9da901e32cb084663b7ef0ea7a
+  metadata.gz: 56566e37e53f4f9a56960641c73054c2441aa13a74397f62b563eca89470b529
+  data.tar.gz: efa2e5d8a9cca077cc28073d52c123545ff173fb55cc2e59ecf5c843734ad445
 SHA512:
-  metadata.gz: a2f99db96ded13ab47be70b22dc1a89c8fd0e553cfb4d44ec58b79e5c8d596347ea8199e0c639d336a8691156cd9e0e4444e860662d4354f50c8916c596622e8
-  data.tar.gz: abfd0ec70ee9b4ebfff30abe8bea87e6c0d2a4f650b63997e12271e18f5d06d174d27d1d50fd7f92f34f55ba555c49db904c652a2994e59c2ef56645f46d9f48
+  metadata.gz: 86e1ccc819b3764a84365b93655e08dc7361c88acef54f5f5dcd0ab19a4b7ae50da1253d30e116cf68515503d74649cdb77284ecd6ad8abd602c3bec7ec1916e
+  data.tar.gz: ef7bd636ae7810d746f4f108f3140ad707132a4b80a3583e697174d2153a35a0ec3b8067601bf8c06cf5e568ee317b622d21b9813b17cf06485dd5e36e64d3a1

data/lib/l43/opt_parser/errors.rb

@@ -4,7 +4,6 @@ module L43
   class OptParser
     BadFormat = Class.new(RuntimeError)
     DuplicateFlagDefinition = Class.new(RuntimeError)
-    DuplicateFlagDefinition = Class.new(RuntimeError)
     DuplicateKeywordDefinition = Class.new(RuntimeError)
     FailedCheck = Class.new(RuntimeError)
     MissingValue = Class.new(RuntimeError)

data/lib/l43/opt_parser/flag.rb

@@ -5,15 +5,7 @@ module L43
   class OptParser
     class Flag
       extend L43::OpenObject
-      attributes :name, arg_count: 0, as: nil, desc: nil, value: false, short: nil, stop: false
-
-      def count_ok
-        if arg_count.zero?
-          :ok
-        else
-          [:error, "flag #{name} cannot be set multiple times"]
-        end
-      end
+      attributes :name, as: nil, desc: nil, value: false, short: nil, stop: false
 
       def real_name = as || name
     end

data/lib/l43/opt_parser/keyword.rb

@@ -28,26 +28,27 @@ module L43
         multiple: false,
         set: nil,
         short: nil,
-        value: nil
+        value: nil do |values|
+          if Array === values.set
+            {set: Set.new(values.set)}
+          end
+        end
 
-      def assign_value(value)
-        if arg_count > 0 && !multiple
-          return Resut.error("must not assign multiple values to keyword #{name}")
+      def check_value(value, keywords)
+        if keywords.has_key?(real_name) && !multiple
+          return Result.error("must not assign multiple values to keyword :#{name}")
         end
 
-        assign_from_set(value).if_error { return it }
+        check_set(value).if_error { return it }
 
         value = init.(value) if init
-        Result.ok(
-          update_attribute(:arg_count, &:succ)
-          .update_attribute(:value, simple_or_multiple(value))
-        )
+        Result.ok(value)
       end
 
       def real_name = as || name
 
       private
-      def assign_from_set(value)
+      def check_set(value)
         return Result.ok(value) unless set
         set
           .fetch_any(value.to_sym, value.to_s) do
@@ -55,11 +56,6 @@ module L43
           end
       end
 
-      def simple_or_multiple(value)
-        return value unless multiple
-
-        [*Array(self.value), value]
-      end
     end
   end
 end

data/lib/l43/opt_parser/memos.rb

@@ -10,6 +10,7 @@ module L43
       def defaults =  @__defaults__ ||= {}
       def errors =  @__errors__ ||= []
       def flags =  @__flags__ ||= {}
+      def given_kwds =  @__given_kwds__ ||= Set.new 
       def hooks =  @__hooks__ ||= []
       def keywords =  @__keywords__ ||= {}
 

data/lib/l43/opt_parser/meta.rb

@@ -11,7 +11,7 @@ module L43
 
       private
       def undefaulted_kwd_names
-        keywords.values.filter_map { it.default == Core::None && it.name } 
+        keywords.values.filter_map { it.default == Core::None && it.real_name } 
       end
 
       def defaulted_kwds_and_flags

data/lib/l43/opt_parser/version.rb

@@ -2,7 +2,7 @@
 
 module L43
   class OptParser
-    VERSION = '0.2.1'
+    VERSION = '0.3.1'
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/l43/opt_parser.rb

@@ -23,10 +23,10 @@ module L43
 
 
     FlagRgx = /\A:(.*)/
-    KeywordRgx = /(.*):\z/
-    ShortFlagRgx = /\A\-(.*)/
+      KeywordRgx = /(.*):\z/
+      ShortFlagRgx = /\A\-(.*)/
 
-    attr_reader :arguments, :constrained, :description, :kwds_name
+      attr_reader :arguments, :constrained, :description, :kwds_name
 
     # Constraints
     # -----------
@@ -46,8 +46,11 @@ module L43
     end
 
 
-    def keyword(name, short=nil, as: nil, default: Core::None, **ks, &init)
-      k = Keyword.new(name:, short:, init:, default:, as:, **ks)
+    def keyword(name, short=nil, as: nil, default: Core::None, multiple: false, **ks, &init)
+      raise ArgumentError, "must not define a default for multiple keyword :#{name}" if
+        multiple && default != Core::None
+
+      k = Keyword.new(name:, short:, init:, default:, as:, multiple:, **ks)
       keywords.merge!(name => k) { |*|
         raise DuplicateKeywordDefinition, "keyword :#{name} is already defined"
       }
@@ -57,9 +60,10 @@ module L43
         }
       end
       if default != Core::None
-        defaults.merge!((as||name) => default)
-      elsif k.multiple
-        defaults.merge!((as||name) => [])
+        defaults.merge!(k.real_name => default)
+      end
+      if multiple
+        keywords_values[k.real_name] = []
       end
       @constrained = true
       description.add_kwd(k)
@@ -96,13 +100,13 @@ module L43
       @arguments = arguments
       parse_arguments
 
-      return Result.error(errors) unless errors.empty?
+      return Result.error(errors.uniq) unless errors.empty?
       if constrained
         mo = make_open_object
         kwds = mo.new(**defaults.merge(keywords_values))
         post_checks!(kwds)
         kwds = run_hooks(kwds)
-        result = OpenStruct.new(kwds_name => kwds, args:, errors:).freeze
+        result = OpenStruct.new(kwds_name => kwds, args:, given_kwds:).freeze
         Result.ok(result)
       else
         Result.ok(OpenStruct.new(args:, errors:, kwds: OpenStruct.new(**keywords_values)).freeze)
@@ -153,17 +157,22 @@ module L43
       in :error
         nil
       in keyword
-        case keyword.assign_value(value)
+        case keyword.check_value(value, keywords_values)
+        in :ok, new_value
+          assign_value(keyword, new_value)
         in :error, error
-          nil
-        in :ok, keyword
-          keywords_values.merge!(keyword.real_name => keyword.value)
+          add_errors(error)
         end
       end
     end
 
-    def cast_value(_kwd, value)
-      return value unless constrained?
+    def assign_value(keyword, value)
+      given_kwds << keyword.real_name
+      if keyword.multiple
+        keywords_values[keyword.real_name] << value
+      else
+        keywords_values[keyword.real_name] = value
+      end
     end
 
     def get_flag(flag_sym)
@@ -228,14 +237,10 @@ module L43
       in :error
         nil
       in flag
-        case flag.count_ok
-        in :ok
-          flag = flag
-            .update_attribute(:arg_count, &:succ)
-            .update(value: true)
-          keywords_values.merge!(flag.real_name => true)
-        in :error, error
-          add_errors(error)
+        if keywords_values.fetch(flag.real_name, false)
+          add_errors("flag :#{flag.real_name} already set")
+        else
+          keywords_values.update(flag.real_name => true)
         end
       end
       1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: l43_opt_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Robert Dober
 bindir: bin
 cert_chain: []
-date: 2026-04-26 00:00:00.000000000 Z
+date: 2026-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ostruct
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: l43_core
   requirement: !ruby/object:Gem::Requirement
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.0
 description: |
   A highly customizable option parser, allowing for different
   option syntax and returning custom classes' instances depending on