ex_aequo_cli 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 981581db3c47348ed0b804ceb7af1068922afa7068f725cb92d825f5ae64bb50
-  data.tar.gz: cb02f3c80a000e065e47166cca441f8c90878a3ab546230dbe627c4d4fdb9036
+  metadata.gz: b61fac1a46509a4bdfd77e35bbfd9b962e95ec047c5cc0bf4250ced2e20da99f
+  data.tar.gz: 32fa56a0e3be8becb705172cac48fb6d0c430a209129bc0b203fe4c223ab9396
 SHA512:
-  metadata.gz: d53c316f21dd58b7fe9620be47e611269218356d0e5c774e7bccda40424c37c04eee908c55dd50e69366b1780ef05ac2b6c08a890cd3baa87e69fcb4d358cbc0
-  data.tar.gz: 59f986a8d3c90da0b1c015fb89935945d270f299149dbfeed961c8e3fdd5ef9a55f5da9c7baadb15385bf3d281bccbe838f6877d2b35324403dd95a684d9842d
+  metadata.gz: 001c6d3e0fabed6a3cb2a8893756f6754ef991e5648806575b24805d30e266bcb6ae2ab5d856f046a8a2b5fb24031b605654f1307435eb31ef5e0342d6920910
+  data.tar.gz: 396e0c524a930cce9936d76445a77fb76dccdf177851604d95bbd825185e0ff24d2daf89aa94ea38020f8ace26906bffb6fe1942c7aee780d85b489f2363a9b1

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

@@ -10,7 +10,7 @@ module ExAequo
         BooleanFlagRgx = %r{\A : (.*) \z}x
         OtherFlagRgx = %r{\A (.*?) : (.*) \z}x
 
-        attr_reader :default, :description, :name, :short, :type
+        attr_reader :alias, :default, :description, :name, :short, :type
 
         def cast_value(value)
           value = default if value.nil?
@@ -36,6 +36,7 @@ module ExAequo
           check_and_set_type(flag.fetch(:type, :str))
           @default = flag.fetch(:default, nil)
           @description = flag.fetch(:description, :nil)
+          @alias = flag.fetch(:alias, :nil)
         end
 
         # def check_args!(flag, long:, type:, default:)

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

@@ -1,19 +1,39 @@
 # frozen_string_literal: true
 
 require 'ostruct'
+require_relative 'view'
 module ExAequo
   module Cli
     class Args
       class Result
 
-        def args = @__args__ ||= []
+        attr_reader :args, :values
 
-        def values = @__values__ ||= OpenStruct.new 
+        def post_process(post_processors)
+          post_processors.each { apply_post_processor it }
+          self
+        end
 
         private
         def initialize(*args, **keys)
-          add_args(args)
-          values.update(keys)
+          @args = args
+          @values = OpenStruct.new(keys)
+        end
+
+        def apply_post_processor(postpr)
+          view = View.new(args, values.to_h)
+          result = view.instance_exec(&postpr)
+          case result
+          in [nil, values0]
+            @values = OpenStruct.new(values0)
+          in [args0, nil]
+            @args = args0
+          in [args1, values1]
+            @args = args1
+            @values = OpenStruct.new(values1)
+          else
+            raise "Format of #{result.inspect} not (yet) supported"
+          end
         end
 
         def add_args(argums) = argums.flatten.each { args << it }

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'casters'
+module ExAequo
+  module Cli
+    class Args
+      class View
+        include Casters
+        attr_reader :args, :values
+
+        private
+        def initialize(args, values)
+          @args = args.dup
+          @values = values.dup
+        end
+      end
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/ex_aequo/cli/args.rb

@@ -34,12 +34,33 @@ module ExAequo
         @result = strict ? compute_result(strict:) : Result.new(*@args, **@values)
 
         check!
-
         @result
       end
 
+      def post_process(&blk)
+        raise ArgumentError, 'post_process method needs a block' unless blk
+
+        post_processors << blk
+        self
+      end
+
+      def post_process_args(&blk)
+        raise ArgumentError, 'post_process_args method needs a block' unless blk
+
+        post_processors << -> { [instance_exec(&blk), nil] } 
+        self
+      end
+
+      def post_process_values(&blk)
+        raise ArgumentError, 'post_process_values method needs a block' unless blk
+
+        post_processors << -> { [nil, instance_exec(&blk)] } 
+        self
+      end
+
       private
       def initialize(*args, &blk)
+        @aliases = {}
 
         @flags = {}
         args.each { define_flag it }
@@ -54,6 +75,7 @@ module ExAequo
         checkers << Checker.new(name: 'default constraint', &blk) if blk
       end
 
+
       def check! = checkers.each { it.check!(@result) }
 
       def check_for_spurious!(strict:)
@@ -70,12 +92,22 @@ module ExAequo
         flags = @flags.inject @values do |res, (name, flag_desc)|
           res.merge(name => flag_desc.cast_value(res[name]))
         end
-        Result.new(*@args, **flags) 
+        @result = Result.new(*@args, **flags) 
+        run_post_processors
       end
 
       def define_flag(flag)
         desc = FlagDescription.new(flag)
         @flags[desc.name] = desc
+
+        return unless ali = desc.alias
+        @aliases[ali] = desc.name
+      end
+
+      def get_real_name(match)
+        match => [name]
+        name = name.gsub('-','_').to_sym
+        @aliases.fetch(name, name)
       end
 
       def parse_arg
@@ -106,15 +138,17 @@ module ExAequo
       end
 
       def parse_flag(match)
-        match => [name]
-        name = name.gsub('-','_').to_sym
+        name = get_real_name(match)
         @values[name] = true
         @args.shift
       end
 
+      def post_processors = @__post_processors__ ||= []
+
+      def run_post_processors = @result.post_process(post_processors)
+
       def set_value(match)
-        match => [name]
-        name = name.gsub('-','_').to_sym
+        name = get_real_name(match)
         @current_value_name = name
         @args.shift
       end

data/lib/ex_aequo/cli/version.rb

@@ -2,7 +2,7 @@
 
 module ExAequo
   module Cli
-    VERSION = '0.1.0'
+    VERSION = '0.1.2'
   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.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Robert Dober
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,7 @@ files:
 - lib/ex_aequo/cli/args/errors.rb
 - lib/ex_aequo/cli/args/flag_description.rb
 - lib/ex_aequo/cli/args/result.rb
+- lib/ex_aequo/cli/args/view.rb
 - lib/ex_aequo/cli/version.rb
 homepage: https://codeberg.org/lab419/rb_ex_aequo_cli
 licenses: