l43_opt_parser 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e144f1cebe465e80a8e104c546ecb0024b9ec0b2dc74dec99e0acf1970b11254
-  data.tar.gz: 180b81f733118b0aa427acd802a16d0f32968eb8f64740fd75439a34ed991f62
+  metadata.gz: 470ed33a63e0d7d6065fb876a621a492ccc4778a807afcd08d0afe34486de442
+  data.tar.gz: 4dfd5ac9412c4938a23b5b411822f0b406b5d8d176599fbd042c4a8d409cd396
 SHA512:
-  metadata.gz: 2347bc5fa8dbe0ae1b51beaa02e53328ca8381888ea17193746c27132c7d17497844c1c5b43fb225ffcbbc9e276c9812675eaf28b181a6296336e88513e8a56a
-  data.tar.gz: 5f3815d126de479d238852bba576610fc1319ec8ef5a9f0618039d3753c156f630385679c0ba33196f78b8de805ba6f8a3c17a7597e0b46389d0767d67ac0b84
+  metadata.gz: cb1d25c590bda0e1e09dad0f895e7edbb03b5c9351ac6b701e8513c45636a9a3d920624c8943f50a24c928aa581a651bc1c2e92efd9fa2c6015667be809af74c
+  data.tar.gz: e90c4840a684fe032a9b7d3b429481a57008f21de0489ff761b0373ef794e2981f288b63c7c8622ea0c8dd8bf6da803864e7339785cef9284deb4f494e7021ca

data/lib/l43/opt_parser/description.rb

@@ -1,21 +1,32 @@
 # frozen_string_literal: true
 
+require 'l43/simple_color/file_colorizer'
 require 'l43/core/none'
+require 'l43/core/forwarder'
 module L43
   class OptParser
     class Description
+      extend Core::Forwarder
+      forward :xcolorize_file, to: L43::SimpleColor
 
       def add_desc(*chunks, indent: 5)
         self << [indent, *chunks]
       end
 
-      def add_flag(flag, indent: 3, color: :cyan)
+      def add_desc_from_file(file)
+        xcolorize_file(file).each do |colored, _|
+          _lines << colored
+        end
+        self
+      end
+
+      def add_flag(flag, indent: 4, color: :cyan)
         return unless flag.desc
         short = flag.short ? ":#{flag.short}|" : ""
           self <<  [indent, color, short, ":", flag.name.to_s, :reset, 1, flag.desc ] 
       end
 
-      def add_kwd(kwd, indent: 3, color: :cyan, vcolor: [:bold,:blue])
+      def add_kwd(kwd, indent: 4, color: :cyan, vcolor: [:bold,:blue])
         return unless kwd.desc
         short = kwd.short ? "#{kwd.short}:|" : ""
         default = kwd.default == Core::None ? [] : [1, :dim, "defaults to: ", :bold, kwd.default.inspect]
@@ -26,20 +37,20 @@ module L43
         self << chunks
       end
 
-      def add_section(text, indent: 1, color: [:bold, :green])
+      def add_section(text, indent: 2, color: [:bold, :green])
         self << [nil, indent, color, text]
       end
 
       def add_usage(name, options:, args:)
         options = "options" if options == true
         args = "args" if args == true
-        @__lines__ = [[:bold, name, " ", *_args(options, [:bold, :cyan]), ' ', *_args(args, [:bold, :blue], "...")], *_lines]
+        @__lines__ = [[:bold, "usage: ", :green, name, :reset, *_args(options, [:bold, :cyan]), *_args(args, [:bold, :blue], "...")], *_lines]
       end
 
       def lines = _lines.dup.freeze
 
       private
-      def _args(args, cols, pfx='')
+      def _args(args, cols, pfx=' ')
         case args
         when nil
           []
@@ -54,7 +65,7 @@ module L43
 
 
       def <<(*line)
-        _lines << [nil, *line.flatten, :reset]
+        _lines << [*line.flatten, :reset]
       end
     end
   end

data/lib/l43/opt_parser/keyword.rb

@@ -28,7 +28,11 @@ 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 check_value(value, keywords)
         if keywords.has_key?(real_name) && !multiple
@@ -51,6 +55,7 @@ module L43
             "bad value for  keyword #{name}: #{value} (not in set: #{set.keys.inspect})"
           end
       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/version.rb

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

data/lib/l43/opt_parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'l43/color/colorschemes'
-require 'l43/color/output'
+require 'l43/simple_color'
+require 'l43/simple_color/file_colorizer'
 require 'l43/core/none'
 require 'l43/open_struct'
 require 'l43/open_object'
@@ -16,7 +16,7 @@ require_relative 'opt_parser/meta'
 module L43
   class OptParser
 
-    include Color::Output
+    include SimpleColor
     include Core
     include Memos
     include Meta
@@ -77,12 +77,17 @@ module L43
       self
     end
 
-    def add_desc(*chunks) 
-      description.add_desc(*chunks)
+    def add_desc(*chunks, file: nil) 
+      raise ArgumentError, "cannot use chunks and file" unless chunks.empty? || file.nil?
+      if file
+        description.add_desc_from_file(file)
+      else
+        description.add_desc(*chunks)
+      end
       self
     end
 
-    def section(line, indent: 1, color: [:bold, :green])
+    def section(line, indent: 2, color: [:bold, :green])
       description.add_section(line, indent:, color:)
       self
     end
@@ -91,7 +96,11 @@ module L43
     # --------
 
     def descriptions = description.lines
-    def help(device: $stderr) = cs_put(descriptions, device:)
+    def help(device: $stderr) 
+      descriptions.each do
+        xputcol(it, device:)
+      end
+    end
 
 
     # Business Logic
@@ -100,13 +109,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: errors.uniq).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)
@@ -167,6 +176,7 @@ module L43
     end
 
     def assign_value(keyword, value)
+      given_kwds << keyword.real_name
       if keyword.multiple
         keywords_values[keyword.real_name] << value
       else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: l43_opt_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Robert Dober
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ostruct
@@ -24,19 +24,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.3
 - !ruby/object:Gem::Dependency
-  name: l43_color
+  name: l43_simple_color
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !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
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Extract Specs from Markdown
 test_files: []