l43_opt_parser 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56566e37e53f4f9a56960641c73054c2441aa13a74397f62b563eca89470b529
-  data.tar.gz: efa2e5d8a9cca077cc28073d52c123545ff173fb55cc2e59ecf5c843734ad445
+  metadata.gz: 9943a421709cab1ad71863251775608917a07585be3d85a5546f34fdcfdb1c2b
+  data.tar.gz: cb1d8969b0a6566525bb1839b698c3683ce1628fef3130e333199e616aa87d93
 SHA512:
-  metadata.gz: 86e1ccc819b3764a84365b93655e08dc7361c88acef54f5f5dcd0ab19a4b7ae50da1253d30e116cf68515503d74649cdb77284ecd6ad8abd602c3bec7ec1916e
-  data.tar.gz: ef7bd636ae7810d746f4f108f3140ad707132a4b80a3583e697174d2153a35a0ec3b8067601bf8c06cf5e568ee317b622d21b9813b17cf06485dd5e36e64d3a1
+  metadata.gz: 4789ff24391f88adf83d2cd332eb3c92f8c51a76c66993a52f0fdc18e495ab58b8ec2923a74ca829a170fdeeebfb3f4ab7b07d636bdb4d272213fd68ce4f307a
+  data.tar.gz: 230337c7ce46e0b1956aef82b3520428c253824c8da3c2aad9ce047d829cc944bf1cb78b75035eaa15036a601909585566c834fd1c54aead48a4f61a20c047a9

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/version.rb

@@ -2,7 +2,7 @@
 
 module L43
   class OptParser
-    VERSION = '0.3.1'
+    VERSION = '0.3.3'
   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
@@ -123,9 +132,10 @@ module L43
       self
     end
 
-    def usage(name, options: nil, args: nil, nls: 0)
-      description.add_usage(name, options:, args:)
+    def usage(*prefix, options: nil, args: nil, nls: 0)
+      description.add_usage(prefix, options:, args:)
       nls.times { add_br }
+      self
     end
 
     private
@@ -258,7 +268,7 @@ module L43
 
     def post_checks!(keywords)
       checks.each do |name, check|
-        next if check.(keywords)
+        next if check.(keywords, args)
 
         raise FailedCheck, "in postcheck #{name||check.source_location.join(":")}"
       end
@@ -266,7 +276,7 @@ module L43
 
     def run_hooks(keywords)
       hooks.inject keywords do |k, hook|
-        hook.(k)
+        hook.(k, args)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: l43_opt_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Robert Dober
 bindir: bin
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 2026-06-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.3.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: l43_core
   requirement: !ruby/object:Gem::Requirement