eac_tools 0.81.0 → 0.82.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d2e685c6164fa7bbf8b6c8aff6f6b893482bb469306379210cc7d54d8ea3f05
-  data.tar.gz: acedb29f75ec68d89fe776ea05976050519ec549f9f328f4de56835109c32710
+  metadata.gz: 708d42ba52d2d044676786c93ad0213f7ace3709a8c7463232283ed38fb65fd7
+  data.tar.gz: 8258727a71e6eecb3f2bb4d9513381bec6303e405bfd35e49ddcd193d26d0a4b
 SHA512:
-  metadata.gz: eb5a6a90e7655ac953173526517d7de438f76f25d8f11f9ecc0a64d013d260311cb8779595a773416e22dd3fc6fbf01f0002eefbcaf7eaf0df874c38e140b186
-  data.tar.gz: 45a9f8b13ac0a309fe00568f4ee4911a84eb9d8a9caaac14c3412c02f489d8802ce82362e2c4fd9e742e260d2bf5cfc56e61e05010f833e8bb327a1d7b87aee3
+  metadata.gz: 01442d1e31829b644915a656db3c53c33643fff0706a2cc2848ef72abf95370049b6d98d5128739679b30fd8692cff897bf42c9fe164e2a088f5912343d9b48d
+  data.tar.gz: 6a2bd15e0ce916d2f99d0cb71048efadda6961d373614df80b04fce683ff89b522e402683a8533c966fa7e2b0b6278eaed2b02af621c4c2877be8bdefc3ee02d

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.81.0)
-      avm (~> 0.82)
+    eac_tools (0.82.0)
+      avm (~> 0.83)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       avm-eac_github_base0 (~> 0.3)
@@ -18,7 +18,7 @@ PATH
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.14)
-      avm-tools (~> 0.158)
+      avm-tools (~> 0.159)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
@@ -180,9 +180,9 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.158.0)
+    avm-tools (0.159.0)
       aranha-parsers (~> 0.21)
-      avm (~> 0.82)
+      avm (~> 0.83)
       avm-eac_ruby_base1 (~> 0.33)
       avm-eac_ubuntu_base0 (~> 0.5)
       avm-files (~> 0.6, >= 0.6.2)
@@ -198,9 +198,9 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.82.0)
+    avm (0.83.0)
       aranha-parsers (~> 0.21)
-      eac_cli (~> 0.38)
+      eac_cli (~> 0.38, >= 0.38.1)
       eac_config (~> 0.14, >= 0.14.1)
       eac_docker (~> 0.7)
       eac_fs (~> 0.16)
@@ -214,9 +214,9 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.38.0)
+    eac_cli (0.38.1)
       colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.14)
+      eac_config (~> 0.14, >= 0.14.1)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
@@ -253,7 +253,7 @@ GEM
       ofx-parser (~> 1.1)
     asciidoctor (2.0.20)
     ast (2.4.2)
-    base64 (0.1.1)
+    base64 (0.2.0)
     clipboard (1.3.6)
     colorize (0.8.1)
     concurrent-ruby (1.2.2)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.81.0'
+  VERSION = '0.82.0'
 end

data/sub/avm/avm.gemspec

@@ -10,10 +10,10 @@ Gem::Specification.new do |s|
   s.authors     = ['Eduardo H. Bogoni']
   s.summary     = 'Ruby base library for Agora Vai! Methodology (https://avm.esquiloazul.tech).'
 
-  s.files = Dir['{lib}/**/*']
+  s.files = Dir['{lib, locale}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.21'
-  s.add_dependency 'eac_cli', '~> 0.38'
+  s.add_dependency 'eac_cli', '~> 0.38', '>= 0.38.1'
   s.add_dependency 'eac_config', '~> 0.14', '>= 0.14.1'
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.16'

data/sub/avm/lib/avm/sources/base/sub/remove.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      class Sub
+        class Remove
+          acts_as_instance_method
+
+          # !method initialize(sub)
+          # @param sub [Avm::Sources::Base::Sub]
+          common_constructor :sub
+          delegate :source, to: :sub
+
+          # @return [void]
+          def result
+            source.scm.commit_if_change(commit_message) { do_changes }
+          end
+
+          private
+
+          # @return [String]
+          def commit_message
+            sub.i18n_translate(:remove_commit_message, sub_path: sub.sub_path)
+          end
+
+          # @return [void]
+          def do_changes
+            ::FileUtils.rm_rf(sub.absolute_path)
+            source.on_sub_updated
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base/sub.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base/subs_paths'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      class Sub
+        # !method initialize(source, sub_path)
+        # @param source [Avm::Sources::Base]
+        # @param sub_path [Pathname]
+        common_constructor :source, :sub_path do
+          self.sub_path = sub_path.to_pathname
+        end
+
+        # @return [Pathname]
+        def absolute_path
+          sub_path.expand_path(source.path)
+        end
+
+        require_sub __FILE__, require_mode: :kernel
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base/subs.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/sources/base/sub'
 require 'avm/sources/base/subs_paths'
 require 'eac_ruby_utils/core_ext'
 
@@ -17,6 +18,12 @@ module Avm
           subs.lazy.map { |sub| path.expand_path.child_of?(sub.path) ? sub : nil }.find(&:present?)
         end
 
+        # @param sub_path [Pathname]
+        # @return [Avm::Sources::Base::Sub]
+        def sub(sub_path)
+          ::Avm::Sources::Base::Sub.new(self, sub_path)
+        end
+
         # @return [Enumerable<Avm::Sources::Base>]
         def subs
           subs_paths_to_search

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.82.0'
+  VERSION = '0.83.0'
 end

data/sub/avm/locale/en.yml

@@ -0,0 +1,6 @@
+en:
+  avm:
+    sources:
+      base:
+        sub:
+          remove_commit_message: 'Sub[%{sub_path}]: remove.'

data/sub/avm/locale/pt-BR.yml

@@ -0,0 +1,6 @@
+pt-BR:
+  avm:
+    sources:
+      base:
+        sub:
+          remove_commit_message: 'Sub[%{sub_path}]: remove.'

data/sub/avm-tools/avm-tools.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.7.0'
 
   s.add_dependency 'aranha-parsers', '~> 0.21'
-  s.add_dependency 'avm', '~> 0.82'
+  s.add_dependency 'avm', '~> 0.83'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.33'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'

data/sub/avm-tools/lib/avm/tools/runner/source/sub/remove.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Source < ::Avm::Sources::Runner
+        class Sub
+          class Remove
+            runner_with :help
+
+            def run
+              source_sub.remove
+              success "Sub[#{source_sub.sub_path}] removed"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-tools/lib/avm/tools/runner/source/sub.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Source < ::Avm::Sources::Runner
+        class Sub
+          runner_with :help, :subcommands do
+            pos_arg :sub_path
+            subcommands
+          end
+          for_context :source_sub
+
+          private
+
+          # !method source_sub
+          # @return [Avm::Sources::Base::Sub]
+          def source_sub_uncached
+            source.sub(parsed.sub_path)
+          end
+
+          require_sub __FILE__
+        end
+      end
+    end
+  end
+end

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.158.0'
+    VERSION = '0.159.0'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.7.0'
 
   s.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
-  s.add_dependency 'eac_config', '~> 0.14'
+  s.add_dependency 'eac_config', '~> 0.14', '>= 0.14.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.2'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.8.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.9'
 end

data/sub/eac_cli/lib/eac_cli/definition/alternative.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/definition/argument_option'
 require 'eac_cli/definition/boolean_option'
-require 'eac_cli/definition/positional_argument'
+require 'eac_cli/definition/positional'
 
 module EacCli
   class Definition
@@ -54,7 +54,7 @@ module EacCli
       end
 
       def pos_arg(name, arg_options = {})
-        new_pos_arg = ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+        new_pos_arg = ::EacCli::Definition::Positional.new(name, arg_options)
         check_positional_blocked(new_pos_arg)
         pos_set << new_pos_arg
       end
@@ -76,8 +76,8 @@ module EacCli
 
       def subcommands
         pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
-        pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
-                                                                optional: true, repeat: true)
+        pos_set << ::EacCli::Definition::Positional.new(SUBCOMMAND_ARGS_ARG,
+                                                        optional: true, repeat: true)
       end
 
       def subcommands?

data/sub/eac_cli/lib/eac_cli/definition/argument_option.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'eac_cli/definition/base_option'
+require 'eac_cli/definition/option'
 
 module EacCli
   class Definition
-    class ArgumentOption < ::EacCli::Definition::BaseOption
+    class ArgumentOption < ::EacCli::Definition::Option
       def argument?
         true
       end

data/sub/eac_cli/lib/eac_cli/definition/boolean_option.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'eac_cli/definition/base_option'
+require 'eac_cli/definition/option'
 
 module EacCli
   class Definition
-    class BooleanOption < ::EacCli::Definition::BaseOption
+    class BooleanOption < ::EacCli::Definition::Option
       def argument?
         false
       end
@@ -16,8 +16,7 @@ module EacCli
       def default_value
         return super unless default_value?
 
-        raise(::EacCli::Definition::Error,
-              "Unallowed default value for boolean options (Option: #{self})")
+        raise("Unallowed default value for boolean options (Option: #{self})")
       end
 
       def default_default_value

data/sub/eac_cli/lib/eac_cli/definition/{base_option → option}/initialize_args_parser.rb

@@ -2,7 +2,7 @@
 
 module EacCli
   class Definition
-    class BaseOption
+    class Option
       class InitializeArgsParser
         PROPERTIES = %i[short long description options].freeze
         attr_reader(*PROPERTIES)

data/sub/eac_cli/lib/eac_cli/definition/option.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'eac_cli/definition/option_or_positional'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Definition
+    # @abstract
+    class Option < ::EacCli::Definition::OptionOrPositional
+      require_sub __FILE__
+
+      class << self
+        # @param args [Enumerable<String>]
+        # @return [EacCli::Definition::Option]
+        def from_args(args)
+          p = ::EacCli::Definition::Option::InitializeArgsParser.new(args)
+          new(p.short, p.long, p.description, p.options)
+        end
+      end
+
+      DEFAULT_REQUIRED = false
+
+      enable_abstract_methods
+      lists.add_symbol :option, *OPTION_LIST, :default, :usage
+
+      # @!method initialize(short, long, description, options = {})
+      # @param short [String]
+      # @param long [String]
+      # @param description [String]
+      # @param options [Hash<Symbol, Object>]
+      # @raise [EacCli::Definition::Error]
+      common_constructor :short, :long, :description, :options, default: [{}] do
+        validate
+        self.options = ::EacCli::Definition::Option.lists.option.hash_keys_validate!(
+          options.symbolize_keys
+        )
+      end
+
+      # @return [Object]
+      def default_value
+        default_value? ? options[OPTION_DEFAULT] : default_default_value
+      end
+
+      # @return [Boolean]
+      def default_value?
+        options.key?(OPTION_DEFAULT)
+      end
+
+      # @return [Symbol]
+      # @raise [EacCli::Definition::Error] If no short or long option is provided.
+      def identifier
+        [long, short].each do |v|
+          v.to_s.if_present { |vv| return vv.variableize.to_sym }
+        end
+
+        raise('No short or long option to build identifier')
+      end
+
+      # @return [Boolean]
+      def show_on_usage?
+        options[:usage]
+      end
+
+      private
+
+      # @return [void]
+      # @raise [EacCli::Definition::Error]
+      def validate
+        raise 'Nor short neither long selector was set' if short.blank? && long.blank?
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/definition/option_or_positional.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Definition
+    # @abstract
+    class OptionOrPositional
+      acts_as_abstract :build_value, :default_value, :identifier, :options
+      enable_listable
+
+      OPTION_LIST = %i[optional repeat required].freeze
+
+      # @return [Boolean]
+      def optional?
+        !required?
+      end
+
+      # @raise [EacCli::Definition::Error]
+      def raise(*args)
+        ::Kernel.raise ::EacCli::Definition::Error, *args
+      end
+
+      # @return [Boolean]
+      def repeat?
+        options[:repeat] ? true : false
+      end
+
+      # @return [Boolean]
+      def required?
+        return true if options.key?(:required) && options.fetch(:required)
+        return false if options.key?(:optional) && options.fetch(:optional)
+
+        self.class.const_get('DEFAULT_REQUIRED')
+      end
+
+      # @return [String]
+      def to_s
+        "#{self.class.name.demodulize}[#{identifier}]"
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/definition/{positional_argument.rb → positional.rb}

@@ -1,19 +1,26 @@
 # frozen_string_literal: true
 
+require 'eac_cli/definition/option_or_positional'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   class Definition
-    class PositionalArgument
+    class Positional < ::EacCli::Definition::OptionOrPositional
       DEFAULT_REQUIRED = true
       DEFAULT_VISIBLE = true
 
-      enable_listable
-      lists.add_symbol :option, :optional, :repeat, :required, :subcommand, :visible
+      lists.add_symbol :option, *OPTION_LIST, :subcommand, :visible
+
+      # @!method initialize(name, options = {})
+      # @param name [String]
+      # @param options [Hash<Symbol, Object>]
       common_constructor :name, :options, default: [{}] do
         options.assert_valid_keys(self.class.lists.option.values)
       end
 
+      # @param new_value [Array, Object]
+      # @param previous_value [Array, Object]
+      # @return [Array]
       def build_value(new_value, previous_value)
         if previous_value.is_a?(::Array)
           previous_value + [new_value]
@@ -22,37 +29,22 @@ module EacCli
         end
       end
 
+      # @return [Object]
       def default_value
         repeat? ? [] : nil
       end
 
+      # @return [Symbol]
       def identifier
         name.to_s.variableize.to_sym
       end
 
-      def optional?
-        !required?
-      end
-
-      def repeat?
-        options[OPTION_REPEAT]
-      end
-
-      def required?
-        return true if options.key?(OPTION_REQUIRED) && options.fetch(OPTION_REQUIRED)
-        return false if options.key?(OPTION_OPTIONAL) && options.fetch(OPTION_OPTIONAL)
-
-        DEFAULT_REQUIRED
-      end
-
+      # @return [Boolean]
       def subcommand?
         options[OPTION_SUBCOMMAND]
       end
 
-      def to_s
-        "#{self.class.name.demodulize}[#{identifier}]"
-      end
-
+      # @return [Boolean]
       def visible?
         options.key?(OPTION_VISIBLE) ? options.fetch(OPTION_VISIBLE) : DEFAULT_VISIBLE
       end

data/sub/eac_cli/lib/eac_cli/definition.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/definition/argument_option'
 require 'eac_cli/definition/boolean_option'
-require 'eac_cli/definition/positional_argument'
+require 'eac_cli/definition/positional'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
@@ -13,6 +13,7 @@ module EacCli
     SUBCOMMAND_NAME_ARG = 'subcommand'
     SUBCOMMAND_ARGS_ARG = 'subcommand_args'
 
+    # @return [String, nil]
     attr_accessor :description
 
     def initialize
@@ -20,25 +21,35 @@ module EacCli
       alternatives_set[MAIN_ALTERNATIVE_KEY] = main_alternative
     end
 
-    def alt(&block)
+    # @return [EacCli::Definition::Alternative]
+    def alt(key = nil, &block)
+      key ||= new_alternative_key
+      raise(::EacCli::Definition::Error, "A alternative with key=\"#{key}\" already exists") if
+        key.present? && alternatives_set.key?(key)
+
       r = ::EacCli::Definition::Alternative.new
       r.instance_eval(&block)
-      alternatives_set[new_alternative_key] = r
+      alternatives_set[key] = r
       r
     end
 
+    # @return [Enumerable<EacCli::Definition::Alternative>]
     def alternatives
       alternatives_set.values
     end
 
+    # @return [EacCli::Definition::Alternative]
+    # @raise [KeyError] If there is not a alternative with provided key.
     def alternative(key)
       alternatives_set.fetch(key)
     end
 
+    # Same as {#description=}.
     def desc(description)
       self.description = description
     end
 
+    # @return [EacCli::Definition::Alternative]
     def main_alternative
       @main_alternative ||= begin
         r = ::EacCli::Definition::Alternative.new
@@ -47,10 +58,13 @@ module EacCli
       end
     end
 
+    # Same as {#options_argument=}.
+    # @param options_argument [Boolean]
     def options_arg(options_argument)
       self.options_argument = options_argument
     end
 
+    # @return [Boolean]
     def options_argument
       main_alternative.options_argument?
     end

data/sub/eac_cli/lib/eac_cli/parser/alternative/argv.rb

@@ -4,10 +4,12 @@ module EacCli
   class Parser
     class Alternative
       module Argv
+        # @return [Enumerator<String>]
         def argv_enum
           @argv_enum ||= argv.each
         end
 
+        # @return [Boolean]
         def argv_pending?
           argv_enum.ongoing?
         end

data/sub/eac_cli/lib/eac_cli/parser/alternative/short_options.rb

@@ -5,23 +5,29 @@ module EacCli
     class Alternative
       module ShortOptions
         SHORT_OPTION_PREFIX = '-'
+        SHORT_OPTION_CHAR_PATTERN = /\A[0-9a-zA-Z]\z/.freeze
 
         private
 
+        # @return [Boolean]
         def argv_current_short_option?
           phase == PHASE_ANY && argv_enum.peek.start_with?(SHORT_OPTION_PREFIX) &&
             !argv_current_long_option?
         end
 
+        # @para char [String]
+        # @return [EacCli::Definition::Option, nil]
         def find_short_option(char)
           alternative.options.find do |option|
             short_without_prefix(option.short).if_present(false) { |v| v == char }
           end
         end
 
+        # @return [void]
         def short_option_collect_argv_value
           last_option = nil
           short_without_prefix(argv_enum.peek).each_char do |char|
+            raise_error "Invalid option: \"#{char}\"" unless SHORT_OPTION_CHAR_PATTERN.match?(char)
             raise_error "Option \"#{last_option}\" requires a argument not provided" if
             last_option.present?
 
@@ -30,12 +36,15 @@ module EacCli
           end
         end
 
-        # @return [EacCli::Definition::BaseOption] The option collected.
+        # @param char [String]
+        # @return [EacCli::Definition::Option] The option collected.
         def short_option_collect_char(char)
           option = find_short_option(char)
           option ? option_collect_option(option) : any_option_collect_option
         end
 
+        # @param short [String]
+        # @return [String]
         def short_without_prefix(short)
           short.to_s.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
         end

data/sub/eac_cli/lib/eac_cli/parser/alternative.rb

@@ -10,30 +10,40 @@ module EacCli
       require_sub __FILE__, include_modules: true
       enable_listable
       lists.add_symbol :phase, :any, :option_argument, :positional
+
+      # @return [EacCli::Parser::Error, nil]
       attr_reader :error
 
+      # @!method initialize(alternative, argv)
+      # @param alternative [EacCli::Definition::Alternative]
+      # @param argv [Array<String>]
       common_constructor :alternative, :argv do
         alternative.assert_argument(::EacCli::Definition::Alternative, :alternative)
         self.phase = PHASE_ANY
         collect
       end
 
+      # @return [Boolean]
       def error?
         error.present?
       end
 
+      # @return [Boolean]
       def success?
         !error?
       end
 
+      # @return [EacRubyUtils::Struct]
       def parsed
         @parsed ||= collector.to_data.freeze
       end
 
       private
 
+      # @return [Symbol]
       attr_accessor :phase
 
+      # @return [void]
       def any_collect_argv_value
         %w[double_dash long_option short_option].each do |arg_type|
           return send("#{arg_type}_collect_argv_value") if send("argv_current_#{arg_type}?")
@@ -42,10 +52,12 @@ module EacCli
         positional_collect_argv_value
       end
 
+      # @return [EacCli::Parser::Collector]
       def collector
         @collector ||= ::EacCli::Parser::Collector.new(alternative)
       end
 
+      # @return [void]
       def collect
         loop do
           break unless argv_pending?
@@ -57,21 +69,29 @@ module EacCli
         @error = e
       end
 
+      # @return [void]
       def collect_argv_value
         send("#{phase}_collect_argv_value")
         argv_enum.next
       end
 
+      # @param message [String]
+      # @raise [EacCli::Parser::Error] Always.
       def raise_error(message)
         raise ::EacCli::Parser::Error.new(alternative, argv, message)
       end
 
+      # @return [void]
+      # @raise [EacCli::Parser::Error] If options where not properly supplied.
       def validate
         (alternative.options + alternative.positional).each do |option|
           validate_option(option)
         end
       end
 
+      # @param option [EacCli::Definition::Option, EacCli::Definition::Positional]
+      # @return [void]
+      # @raise [EacCli::Parser::Error] If option was not properly supplied.
       def validate_option(option)
         return unless option.required?
         return if collector.supplied?(option)

data/sub/eac_cli/lib/eac_cli/parser/collector.rb

@@ -14,29 +14,38 @@ module EacCli
         end
       end
 
+      # @!method initialize(definition)
+      # @param definition [EacCli::Definition]
       common_constructor :definition do
         default_values
       end
 
-      # @return [OpenStruct]
+      # @return [EacRubyUtils::Struct]
       def to_data
         ::EacRubyUtils::Struct.new(data.transform_keys(&:identifier))
       end
 
+      # @param option [EacCli::Definition::Option]
+      # @param value [String]
+      # @return [void]
       def collect(option, value)
         data[option] = option.build_value(value, data[option])
       end
 
+      # @param option [EacCli::Definition::Option]
+      # @return [Boolean]
       def supplied?(option)
         data[option].present?
       end
 
       private
 
+      # @return [Hash]
       def data
         @data ||= {}
       end
 
+      # @return [void]
       def default_values
         definition.options.each { |option| data[option] = option.default_value }
         definition.positional.each { |positional| data[positional] = positional.default_value }

data/sub/eac_cli/lib/eac_cli/rspec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_exts'
+require 'eac_ruby_utils/core_ext'
 
 module EacCli
   module Rspec

data/sub/eac_cli/lib/eac_cli/runner/class_runner.rb

@@ -29,7 +29,7 @@ module EacCli
 
       def run_parser_error(runner_instance, error)
         $stderr.write("#{runner_instance.program_name}: #{error}\n")
-        ::Kernel.exit(PARSER_ERROR_EXIT_CODE) # rubocop:disable Rails/Exit
+        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
       end
     end
   end

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.38.0'
+  VERSION = '0.38.1'
 end

data/sub/eac_cli/spec/lib/eac_cli/parser/alternative/subcommands_spec.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'eac_cli/definition/alternative'
+require 'eac_cli/parser/alternative'
+
+RSpec.describe EacCli::Parser::Alternative, '#subcommands' do
+  let(:instance) { described_class.new(alternative, argv) }
+  let(:actual_parsed) { instance.parsed.to_h.symbolize_keys }
+  let(:alternative) do
+    r = EacCli::Definition::Alternative.new
+    r.bool_opt '-b', '--opt1', 'A boolean option'
+    r.arg_opt '-a', '--opt2', 'A argument option'
+    r.subcommands
+    r
+  end
+
+  context 'with all values' do
+    let(:argv) { %w[--opt1 --opt2 OPT2 CMD CMD_ARG_1 --CMD_ARG_2] }
+    let(:parsed_expected) do
+      {
+        opt1: true, opt2: 'OPT2',
+        EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => 'CMD',
+        EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => %w[CMD_ARG_1 --CMD_ARG_2]
+      }
+    end
+
+    it { expect(instance.error).to be_blank }
+    it { expect(actual_parsed).to eq(parsed_expected) }
+  end
+
+  context 'with only required values' do
+    let(:argv) { %w[CMD] }
+    let(:parsed_expected) do
+      {
+        opt1: false, opt2: nil,
+        EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => 'CMD',
+        EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => []
+      }
+    end
+
+    it { expect(instance.error).to be_blank }
+    it { expect(actual_parsed).to eq(parsed_expected) }
+  end
+
+  context 'without required values' do
+    let(:argv) { %w[--opt1] }
+    let(:parsed_expected) do
+      {
+        opt1: true, opt2: nil,
+        EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => nil,
+        EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => []
+      }
+    end
+
+    it { expect(instance.error).to be_present }
+    it { expect(actual_parsed).to eq(parsed_expected) }
+  end
+end

data/sub/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_cli/definition/alternative'
 require 'eac_cli/parser/alternative'
 
 RSpec.describe EacCli::Parser::Alternative do
@@ -85,56 +86,4 @@ RSpec.describe EacCli::Parser::Alternative do
       it { expect(actual_parsed).to eq(parsed_expected) }
     end
   end
-
-  context 'with subcommands' do
-    let(:alternative) do
-      r = EacCli::Definition::Alternative.new
-      r.bool_opt '-b', '--opt1', 'A boolean option'
-      r.arg_opt '-a', '--opt2', 'A argument option'
-      r.subcommands
-      r
-    end
-
-    context 'with all values' do
-      let(:argv) { %w[--opt1 --opt2 OPT2 CMD CMD_ARG_1 --CMD_ARG_2] }
-      let(:parsed_expected) do
-        {
-          opt1: true, opt2: 'OPT2',
-          EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => 'CMD',
-          EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => %w[CMD_ARG_1 --CMD_ARG_2]
-        }
-      end
-
-      it { expect(instance.error).to be_blank }
-      it { expect(actual_parsed).to eq(parsed_expected) }
-    end
-
-    context 'with only required values' do
-      let(:argv) { %w[CMD] }
-      let(:parsed_expected) do
-        {
-          opt1: false, opt2: nil,
-          EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => 'CMD',
-          EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => []
-        }
-      end
-
-      it { expect(instance.error).to be_blank }
-      it { expect(actual_parsed).to eq(parsed_expected) }
-    end
-
-    context 'without required values' do
-      let(:argv) { %w[--opt1] }
-      let(:parsed_expected) do
-        {
-          opt1: true, opt2: nil,
-          EacCli::Definition::Alternative::SUBCOMMAND_NAME_ARG => nil,
-          EacCli::Definition::Alternative::SUBCOMMAND_ARGS_ARG => []
-        }
-      end
-
-      it { expect(instance.error).to be_present }
-      it { expect(actual_parsed).to eq(parsed_expected) }
-    end
-  end
 end

data/sub/eac_cli/spec/lib/eac_cli/runner/for_context_spec.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/runner'
 
-RSpec.describe EacCli::Runner, '#for_context' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+RSpec.describe EacCli::Runner, '#for_context' do
   let(:parent_runner_class) do
     example = self
     Class.new do
@@ -61,7 +61,7 @@ RSpec.describe EacCli::Runner, '#for_context' do # rubocop:disable RSpec/Multipl
   it { expect(parent_runner.for_context?(:method_for_context)).to be(true) }
   it { expect(parent_runner.for_context?(:method_not_for_context)).to be(false) }
 
-  context 'when method is for context' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+  context 'when method is for context' do
     let(:child_runner_class) { child_runner_class1 }
 
     it do
@@ -69,7 +69,7 @@ RSpec.describe EacCli::Runner, '#for_context' do # rubocop:disable RSpec/Multipl
     end
   end
 
-  context 'when method is not for context' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+  context 'when method is not for context' do
     let(:child_runner_class) { child_runner_class2 }
 
     it do

data/sub/eac_cli/spec/lib/eac_cli/runner_with/output_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe EacCli::RunnerWith::Output do
     end
   end
 
-  context 'without --output option as to default file' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+  context 'without --output option as to default file' do
     let(:output_file) { temp_dir.join('default_file') }
     let(:runner_argv) do
       ['--output', EacCli::RunnerWith::Output::DEFAULT_FILE_OPTION,
@@ -69,7 +69,7 @@ RSpec.describe EacCli::RunnerWith::Output do
     it { expect(output_file.read).to eq(stub_text) }
   end
 
-  context 'with --output option' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+  context 'with --output option' do
     let(:output_file) { temp_dir.join('a output file') }
     let(:runner_argv) { ['--output', output_file.to_path, stub_text] }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.81.0
+  version: 0.82.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.82'
+        version: '0.83'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.82'
+        version: '0.83'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.158'
+        version: '0.159'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.158'
+        version: '0.159'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -1094,6 +1094,8 @@ files:
 - sub/avm-tools/lib/avm/tools/runner/source/issue.rb
 - sub/avm-tools/lib/avm/tools/runner/source/issue/complete.rb
 - sub/avm-tools/lib/avm/tools/runner/source/issue/deliver.rb
+- sub/avm-tools/lib/avm/tools/runner/source/sub.rb
+- sub/avm-tools/lib/avm/tools/runner/source/sub/remove.rb
 - sub/avm-tools/lib/avm/tools/runner/source/subs.rb
 - sub/avm-tools/lib/avm/tools/runner/source/test.rb
 - sub/avm-tools/lib/avm/tools/runner/source/update.rb
@@ -1318,6 +1320,8 @@ files:
 - sub/avm/lib/avm/sources/base/organizational.rb
 - sub/avm/lib/avm/sources/base/parent.rb
 - sub/avm/lib/avm/sources/base/stereotype.rb
+- sub/avm/lib/avm/sources/base/sub.rb
+- sub/avm/lib/avm/sources/base/sub/remove.rb
 - sub/avm/lib/avm/sources/base/subs.rb
 - sub/avm/lib/avm/sources/base/subs_paths.rb
 - sub/avm/lib/avm/sources/base/testing.rb
@@ -1339,6 +1343,8 @@ files:
 - sub/avm/lib/avm/version_number.rb
 - sub/avm/lib/avm/with/application_stereotype.rb
 - sub/avm/lib/avm/with/extra_subcommands.rb
+- sub/avm/locale/en.yml
+- sub/avm/locale/pt-BR.yml
 - sub/avm/spec/lib/avm/applications/base/entries_spec.rb
 - sub/avm/spec/lib/avm/applications/base/entries_spec_files/config.yml
 - sub/avm/spec/lib/avm/applications/base_spec.rb
@@ -1373,12 +1379,12 @@ files:
 - sub/eac_cli/lib/eac_cli/definition.rb
 - sub/eac_cli/lib/eac_cli/definition/alternative.rb
 - sub/eac_cli/lib/eac_cli/definition/argument_option.rb
-- sub/eac_cli/lib/eac_cli/definition/base_option.rb
-- sub/eac_cli/lib/eac_cli/definition/base_option/initialize_args_parser.rb
 - sub/eac_cli/lib/eac_cli/definition/boolean_option.rb
-- sub/eac_cli/lib/eac_cli/definition/default_value.rb
 - sub/eac_cli/lib/eac_cli/definition/error.rb
-- sub/eac_cli/lib/eac_cli/definition/positional_argument.rb
+- sub/eac_cli/lib/eac_cli/definition/option.rb
+- sub/eac_cli/lib/eac_cli/definition/option/initialize_args_parser.rb
+- sub/eac_cli/lib/eac_cli/definition/option_or_positional.rb
+- sub/eac_cli/lib/eac_cli/definition/positional.rb
 - sub/eac_cli/lib/eac_cli/enum.rb
 - sub/eac_cli/lib/eac_cli/old_configs.rb
 - sub/eac_cli/lib/eac_cli/old_configs/entry_reader.rb
@@ -1443,6 +1449,7 @@ files:
 - sub/eac_cli/lib/eac_cli/version.rb
 - sub/eac_cli/spec/lib/eac_cli/definition/alternative_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/old_configs_spec.rb
+- sub/eac_cli/spec/lib/eac_cli/parser/alternative/subcommands_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner/for_context_spec.rb
 - sub/eac_cli/spec/lib/eac_cli/runner_spec.rb

data/sub/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/definition/default_value'
-require 'eac_ruby_utils/core_ext'
-
-module EacCli
-  class Definition
-    class BaseOption
-      require_sub __FILE__
-      include ::EacCli::Definition::DefaultValue
-
-      class << self
-        def from_args(args)
-          p = ::EacCli::Definition::BaseOption::InitializeArgsParser.new(args)
-          new(p.short, p.long, p.description, p.options)
-        end
-      end
-
-      DEFAULT_REQUIRED = false
-
-      enable_listable
-      enable_abstract_methods :build_value
-      lists.add_symbol :option, :default, :optional, :usage, :repeat, :required
-      common_constructor :short, :long, :description, :options, default: [{}] do
-        raise 'Nor short neither long selector was set' if short.blank? && long.blank?
-
-        self.options = ::EacCli::Definition::BaseOption.lists.option.hash_keys_validate!(
-          options.symbolize_keys
-        )
-      end
-
-      def default_value
-        default_value? ? options[OPTION_DEFAULT] : default_default_value
-      end
-
-      def default_value?
-        options.key?(OPTION_DEFAULT)
-      end
-
-      def identifier
-        [long, short].each do |v|
-          v.to_s.if_present { |vv| return vv.variableize.to_sym }
-        end
-
-        raise(::EacCli::Definition::Error, 'No short or long option to build identifier')
-      end
-
-      def repeat?
-        options[OPTION_REPEAT]
-      end
-
-      def required?
-        return true if options.key?(:required) && options.fetch(:required)
-        return false if options.key?(:optional) && options.fetch(:optional)
-
-        DEFAULT_REQUIRED
-      end
-
-      def to_s
-        "#{self.class.name.demodulize}[#{identifier}]"
-      end
-
-      def show_on_usage?
-        options[:usage]
-      end
-    end
-  end
-end

data/sub/eac_cli/lib/eac_cli/definition/default_value.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module EacCli
-  class Definition
-    module DefaultValue
-      def default_value
-        default_value? ? options[OPTION_DEFAULT] : default_default_value
-      end
-
-      def default_value?
-        options.key?(OPTION_DEFAULT)
-      end
-    end
-  end
-end