l43_opt_parser 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 960127bd5fe3d57920703c562c1eb31335d8e1c3abef182ff4e673ee1479e70d
-  data.tar.gz: ba5380ffe585fd5dd198cc11eddedfad056c2d17667e8f446fdaccd34a0fea4d
+  metadata.gz: e144f1cebe465e80a8e104c546ecb0024b9ec0b2dc74dec99e0acf1970b11254
+  data.tar.gz: 180b81f733118b0aa427acd802a16d0f32968eb8f64740fd75439a34ed991f62
 SHA512:
-  metadata.gz: 4da0f00b58bb29dbb69f511e8404a5cb03664ba38ef03933ce7e4ff3e4e4963178d0b9716e0efc79e22534fc081c00ca6d5fe7de127356c2c35f7d7cdd2ce28d
-  data.tar.gz: 20062237a066a5d7eb15da190a36aa5dd74e1a415dab6ffc96dd8a9287374afc11ab125727030f7628b74acd98ec53df6fac6dbbb6c35401b9ba4c565b5f20f0
+  metadata.gz: 2347bc5fa8dbe0ae1b51beaa02e53328ca8381888ea17193746c27132c7d17497844c1c5b43fb225ffcbbc9e276c9812675eaf28b181a6296336e88513e8a56a
+  data.tar.gz: 5f3815d126de479d238852bba576610fc1319ec8ef5a9f0618039d3753c156f630385679c0ba33196f78b8de805ba6f8a3c17a7597e0b46389d0767d67ac0b84

data/lib/l43/opt_parser/errors.rb

@@ -1,7 +1,14 @@
 # frozen_string_literal: true
 
-class OptParser
-  DuplicateFlagDefinition = Class.new(RuntimeError)
-  DuplicateKeywordDefinition = Class.new(RuntimeError)
+module L43
+  class OptParser
+    BadFormat = Class.new(RuntimeError)
+    DuplicateFlagDefinition = Class.new(RuntimeError)
+    DuplicateKeywordDefinition = Class.new(RuntimeError)
+    FailedCheck = Class.new(RuntimeError)
+    MissingValue = Class.new(RuntimeError)
+    UndefinedFlag = Class.new(RuntimeError)
+    UndefinedKwd = Class.new(RuntimeError)
+  end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/l43/opt_parser/flag.rb

@@ -5,20 +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
-
-      # def on_multiple(&blk)
-      #   @on_multiple = blk
-      #   self
-      # 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

@@ -30,36 +30,27 @@ module L43
         short: nil,
         value: nil
 
-      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
             "bad value for  keyword #{name}: #{value} (not in set: #{set.keys.inspect})"
           end
       end
-
-      def simple_or_multiple(value)
-        return value unless multiple
-
-        [*Array(self.value), value]
-      end
     end
   end
 end

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.0'
+    VERSION = '0.3.0'
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/l43/opt_parser.rb

@@ -21,19 +21,12 @@ module L43
     include Memos
     include Meta
 
-    BadFormat = Class.new(RuntimeError)
-    DuplicateFlagDefinition = Class.new(RuntimeError)
-    DuplicateKwdDefinition = Class.new(RuntimeError)
-    FailedCheck = Class.new(RuntimeError)
-    MissingValue = Class.new(RuntimeError)
-    UndefinedFlag = Class.new(RuntimeError)
-    UndefinedKwd = Class.new(RuntimeError)
 
     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
     # -----------
@@ -53,20 +46,24 @@ 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"
       }
       if short
         aliases.merge!(short => k)  {|*|
-          raise DuplicateKwdDefinition, "keyword :#{short} is already defined"
+          raise DuplicateKeywordDefinition, "keyword :#{short} is already defined"
         }
       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)
@@ -109,7 +106,7 @@ module L43
         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:, errors: errors.uniq).freeze
         Result.ok(result)
       else
         Result.ok(OpenStruct.new(args:, errors:, kwds: OpenStruct.new(**keywords_values)).freeze)
@@ -160,17 +157,21 @@ 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)
+      if keyword.multiple
+        keywords_values[keyword.real_name] << value
+      else
+        keywords_values[keyword.real_name] = value
+      end
     end
 
     def get_flag(flag_sym)
@@ -235,14 +236,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.0
+  version: 0.3.0
 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
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Extract Specs from Markdown
 test_files: []