eac_cli 0.36.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd9008aa3fd4b63d3bf1d901377a2efc3a257ccf1eba103cf74cf3f480ef9b95
-  data.tar.gz: ea3e787fe4c7ae277a06ab501ed74098ecad0f6beb27367400010f8696717db6
+  metadata.gz: c8e016c3cb10caefe2fcc4f81d73dbdf76cff97a0e11ecb49f4b8378be238b7a
+  data.tar.gz: 676cf803931311818d97ea9a5421e360e16a36495e93a2cf90a938afdb526562
 SHA512:
-  metadata.gz: da6e58e10afa32f283293d775814e0b4e0cd35374807f5fec4b581efc73995d8483460d79c2758aead99ac00d64069714c1c6b3c815b3f177da7991a779e1568
-  data.tar.gz: 27ac60328b39f15651cce3263dc3c195b69e2e9ad2a87340f0ec863fc33ee04d8aba9895c93e60360e1d011da2448e55029ba76b4d859377f4b7b4716a1dfe50
+  metadata.gz: 9902444b9eb020f42bf0b33c2c7afe5c8dae6651ad7ae2f6a0b57a563424715eed55058ca48f4b50d572a1284a62d0c4e0246ecbb0b15f907c10b12254a6f7b3
+  data.tar.gz: d62d638adea120b7dd203cafff53646a40ef011659bb952216e130d49988d06ceb151f85caf5832301092448c95ef46ffe82223ba550f6a9c6bb2b298bf21e3e

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
-eval_gemfile local_gemfile if ::File.exist?(local_gemfile)
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

data/lib/eac_cli/config.rb

@@ -6,10 +6,6 @@ module EacCli
   class Config < ::SimpleDelegator
     require_sub __FILE__
 
-    def initialize(sub_node)
-      super(sub_node)
-    end
-
     def entry(path, options = {})
       ::EacCli::Config::Entry.new(self, path, options)
     end

data/lib/eac_cli/core_ext.rb

@@ -3,4 +3,4 @@
 require 'eac_ruby_utils/core_ext'
 require 'eac_cli/patches'
 
-::EacCli::RunnerWithSet.default.add_from_gems_registry
+EacCli::RunnerWithSet.default.add_from_gems_registry

data/lib/eac_cli/definition/alternative.rb

@@ -7,9 +7,30 @@ require 'eac_cli/definition/positional_argument'
 module EacCli
   class Definition
     class Alternative
+      ANY_OPTION_DESCRIPTION = 'ANY_OPTION'
+      ANY_OPTION_LONG = '__'
+      ANY_OPTION_SHORT = '_'
       SUBCOMMAND_NAME_ARG = :subcommand
       SUBCOMMAND_ARGS_ARG = :subcommand_args
 
+      # @return [Boolean]
+      def any_opt
+        @any_opt = true
+      end
+
+      # @return [Boolean]
+      def any_option?
+        @any_opt ? true : false
+      end
+
+      # @return [EacCli::Definition::BooleanOption]
+      def any_options_option
+        @any_options_option ||= ::EacCli::Definition::BooleanOption.new(
+          ANY_OPTION_SHORT, ANY_OPTION_LONG, ANY_OPTION_DESCRIPTION,
+          optional: true, repeat: true, usage: false
+        )
+      end
+
       def arg_opt(*args)
         options_set << ::EacCli::Definition::ArgumentOption.from_args(args)
       end
@@ -48,7 +69,7 @@ module EacCli
         return 'there are subcommands' if subcommands?
         return 'last argument repeats' if last.repeat?
         return 'new argument is required and last is optional' if
-          last.optional? && new_pos_arg.if_present(&:required?)
+        last.optional? && new_pos_arg.if_present(&:required?)
 
         nil
       end
@@ -67,8 +88,8 @@ module EacCli
 
       def check_positional_blocked(new_pos_arg)
         positional_arguments_blocked_reason(new_pos_arg).if_present do |v|
-          raise ::EacCli::Definition::Error, "Positional arguments are blocked: #{v}" \
-            " (New argument: #{new_pos_arg})"
+          raise ::EacCli::Definition::Error, "Positional arguments are blocked: #{v} " \
+                                             "(New argument: #{new_pos_arg})"
         end
       end
 

data/lib/eac_cli/definition.rb

@@ -66,7 +66,7 @@ module EacCli
       alternatives.any?(&:subcommands?)
     end
 
-    def options_first(enable = true)
+    def options_first(enable = true) # rubocop:disable Style/OptionalBooleanParameter
       @options_first = enable
     end
 

data/lib/eac_cli/old_configs/store_passwords_entry_reader.rb

@@ -17,7 +17,7 @@ module EacCli
       def banner
         infom 'Do you wanna to store passwords?'
         infom 'Warning: the passwords will be store in clear text in ' \
-          "\"#{console_configs.configs.storage_path}\""
+              "\"#{console_configs.configs.storage_path}\""
         infom 'Enter "yes" or "no"'
       end
     end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Parser
+    class Alternative
+      module AnyOptions
+        delegate :any_option?, to: :alternative
+
+        # @return [EacCli::Definition::BooleanOption] if #any_option? is true.
+        # @raise [EacCli::Parser::Error] if #any_option? is false.
+        def any_option_collect_option
+          any_option? ? alternative.any_options_option : raise_argv_current_invalid_option
+        end
+      end
+    end
+  end
+end

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

@@ -24,7 +24,7 @@ module EacCli
             else
               option_argument_collect(option, value)
             end
-          end || raise_argv_current_invalid_option
+          end || any_option_collect_option
         end
 
         def parse_option_current_argv

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

@@ -33,9 +33,7 @@ module EacCli
         # @return [EacCli::Definition::BaseOption] The option collected.
         def short_option_collect_char(char)
           option = find_short_option(char)
-          raise_argv_current_invalid_option unless option
-
-          option_collect_option(option)
+          option ? option_collect_option(option) : any_option_collect_option
         end
 
         def short_without_prefix(short)

data/lib/eac_cli/parser/alternative.rb

@@ -62,15 +62,6 @@ module EacCli
         argv_enum.next
       end
 
-      def collect_option_argv_value
-        alternative.options.each do |option|
-        end
-
-        raise ::EacCli::Parser::Error.new(
-          alternative, argv, "Invalid option: #{argv_enum.current}"
-        )
-      end
-
       def raise_error(message)
         raise ::EacCli::Parser::Error.new(alternative, argv, message)
       end

data/lib/eac_cli/parser.rb

@@ -12,7 +12,7 @@ module EacCli
 
     def parsed_uncached
       raise 'Definition has no alternatives' if alternatives.empty?
-      raise first_error unless alternatives.select(&:success?).any?
+      raise first_error unless alternatives.any?(&:success?)
 
       alternatives_parsed(true).merge(alternatives_parsed(false))
     end

data/lib/eac_cli/patches/object.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-Dir["#{File.dirname(__FILE__)}/#{::File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
+Dir["#{File.dirname(__FILE__)}/#{File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
   require path
 end

data/lib/eac_cli/patches.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+EacRubyUtils.require_sub(__FILE__)

data/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)
+        ::Kernel.exit(PARSER_ERROR_EXIT_CODE) # rubocop:disable Rails/Exit
       end
     end
   end

data/lib/eac_cli/runner/context_responders/set.rb

@@ -18,9 +18,9 @@ module EacCli
           responders_instances.any?(&:callable?)
         end
 
-        def call(*args, &block)
+        def call(...)
           caller = responder_to_call
-          return caller.call(*args, &block) if caller
+          return caller.call(...) if caller
 
           raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
         end

data/lib/eac_cli/runner/exit.rb

@@ -5,7 +5,8 @@ module EacCli
     class Exit < ::StandardError
       attr_reader :status
 
-      def initialize(status = true)
+      def initialize(status = true) # rubocop:disable Style/OptionalBooleanParameter
+        super
         @status = status
       end
     end

data/lib/eac_cli/runner/instance_methods.rb

@@ -6,7 +6,7 @@ module EacCli
       def run_run
         parsed
         run_callbacks(:run) { run }
-      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
+      rescue ::EacCli::Runner::Exit
         # Do nothing
       end
 

data/lib/eac_cli/runner_with/help/builder/alternative.rb

@@ -35,7 +35,7 @@ module EacCli
           end
 
           def positionals
-            alternative.positional.map { |p| positional(p) }.reject(&:blank?)
+            alternative.positional.map { |p| positional(p) }.compact_blank
           end
 
           def positional(positional)

data/lib/eac_cli/runner_with/help/builder.rb

@@ -26,7 +26,7 @@ module EacCli
 
           def option_usage_full(option)
             if option.long.present?
-              [option.short, option_long(option)].reject(&:blank?).join(word_separator)
+              [option.short, option_long(option)].compact_blank.join(word_separator)
             else
               option_short(option)
             end
@@ -53,7 +53,7 @@ module EacCli
         def option_definition(option)
           [self.class.option_usage_full(option), option.description,
            option.default_value? ? "[Default: \"#{option.default_value}\"]" : nil]
-            .reject(&:blank?).join(OPTION_DESCRIPTION_SEPARATOR)
+            .compact_blank.join(OPTION_DESCRIPTION_SEPARATOR)
         end
 
         # @return [String]

data/lib/eac_cli/runner_with/help.rb

@@ -12,6 +12,7 @@ module EacCli
 
         runner_definition.alt do
           bool_opt '-h', '--help', 'Show help.', usage: true, required: true
+          any_opt
           pos_arg :any_arg_with_help, repeat: true, optional: true, visible: false
         end
 

data/lib/eac_cli/runner_with/output_item/base_formatter.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/acts_as_abstract'
+
+module EacCli
+  module RunnerWith
+    module OutputItem
+      class BaseFormatter
+        acts_as_abstract :to_output
+        common_constructor :item_hash
+      end
+    end
+  end
+end

data/lib/eac_cli/runner_with/output_item/csv_formatter.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'csv'
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/runner_with/output_item/base_formatter'
+
+module EacCli
+  module RunnerWith
+    module OutputItem
+      class CsvFormatter < ::EacCli::RunnerWith::OutputItem::BaseFormatter
+        COLUMNS = %w[key value].freeze
+
+        # @return [String]
+        def to_output
+          ::CSV.generate do |csv|
+            csv << COLUMNS
+            item_hash.each { |k, v| csv << [k, v] }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_cli/runner_with/output_item/yaml_formatter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/runner_with/output_item/base_formatter'
+require 'yaml'
+
+module EacCli
+  module RunnerWith
+    module OutputItem
+      class YamlFormatter < ::EacCli::RunnerWith::OutputItem::BaseFormatter
+        # @return [String]
+        def to_output
+          ::YAML.dump(item_hash.deep_stringify_keys)
+        end
+      end
+    end
+  end
+end

data/lib/eac_cli/runner_with/output_item.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/output'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/acts_as_abstract'
+
+module EacCli
+  module RunnerWith
+    module OutputItem
+      require_sub __FILE__
+
+      FORMATS = {
+        'csv' => ::EacCli::RunnerWith::OutputItem::CsvFormatter,
+        'yaml' => ::EacCli::RunnerWith::OutputItem::YamlFormatter
+      }.freeze
+
+      common_concern do
+        acts_as_abstract :item_hash
+        include ::EacCli::RunnerWith::Output
+
+        runner_definition do
+          arg_opt '-f', '--format', 'Format to output item.', default: 'yaml'
+        end
+      end
+
+      # @return [String]
+      def output_content
+        formatter.to_output
+      end
+
+      # @return [EacCli::RunnerWith::OutputList::BaseFormatter]
+      def formatter
+        formatter_class.new(item_hash)
+      end
+
+      # @return [Class]
+      def formatter_class
+        FORMATS.fetch(parsed.format)
+      end
+    end
+  end
+end

data/lib/eac_cli/runner_with/subcommands.rb

@@ -105,7 +105,7 @@ module EacCli
         raise(::EacCli::Parser::Error.new(
                 self.class.runner_definition, runner_context.argv,
                 "Subcommand \"#{subcommand_name}\" not found " \
-                  "(Available: #{available_subcommands_to_s})"
+                "(Available: #{available_subcommands_to_s})"
               ))
       end
 

data/lib/eac_cli/runner_with_set.rb

@@ -33,7 +33,7 @@ module EacCli
     private
 
     def namespace_set
-      @namespace_set ||= ::Array.new
+      @namespace_set ||= []
     end
 
     def key_to_module(key)

data/lib/eac_cli/speaker/list.rb

@@ -17,11 +17,11 @@ module EacCli
         private
 
         def hash_to_values(list)
-          list.map { |key, value| ::OpenStruct.new(key: key, label: key, value: value) }
+          list.map { |key, value| ::OpenStruct.new(key: key, label: key, value: value) } # rubocop:disable Style/OpenStructUse
         end
 
         def array_to_values(list)
-          list.map { |value| ::OpenStruct.new(key: value, label: value, value: value) }
+          list.map { |value| ::OpenStruct.new(key: value, label: value, value: value) }  # rubocop:disable Style/OpenStructUse
         end
       end
 
@@ -29,7 +29,7 @@ module EacCli
 
       def initialize(values)
         @values = values.map do |v|
-          ::OpenStruct.new(key: to_key(v.key), label: to_label(v.label), value: v.value)
+          ::OpenStruct.new(key: to_key(v.key), label: to_label(v.label), value: v.value)  # rubocop:disable Style/OpenStructUse
         end
       end
 
@@ -51,7 +51,7 @@ module EacCli
 
       def build_value(value)
         key = to_key(value)
-        values.each do |v| # rubocop:disable Style/HashEachMethods
+        values.each do |v|
           return v.value if v.key == key
         end
         raise "Value not found: \"#{value}\" (#{values})"

data/lib/eac_cli/speaker/options.rb

@@ -11,15 +11,15 @@ module EacCli
       end
 
       def err_out
-        option(OPTION_ERR_OUT, ::EacCli::Speaker::STDERR)
+        option(OPTION_ERR_OUT, $stderr)
       end
 
       def out_out
-        option(OPTION_OUT_OUT, ::EacCli::Speaker::STDOUT)
+        option(OPTION_OUT_OUT, $stdout)
       end
 
       def in_in
-        option(OPTION_IN_IN, ::EacCli::Speaker::STDIN)
+        option(OPTION_IN_IN, $stdin)
       end
 
       def err_line_prefix

data/lib/eac_cli/speaker.rb

@@ -83,7 +83,8 @@ module EacCli
     def list_value(list, input)
       values = list_values(list)
       return input, true unless values
-      return input, false unless values.include?(input)
+
+      [input, false] unless values.include?(input)
     end
 
     def list_values(list)

data/lib/eac_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-02 00:00:00.000000000 Z
+date: 2023-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -51,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.119'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.119.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,20 +61,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.119'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.119.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.8.1
 description: 
 email: 
 executables: []
@@ -103,6 +109,7 @@ files:
 - lib/eac_cli/old_configs/store_passwords_entry_reader.rb
 - lib/eac_cli/parser.rb
 - lib/eac_cli/parser/alternative.rb
+- lib/eac_cli/parser/alternative/any_options.rb
 - lib/eac_cli/parser/alternative/argv.rb
 - lib/eac_cli/parser/alternative/double_dash.rb
 - lib/eac_cli/parser/alternative/long_options.rb
@@ -138,6 +145,10 @@ files:
 - lib/eac_cli/runner_with/help/layout.rb
 - lib/eac_cli/runner_with/input.rb
 - lib/eac_cli/runner_with/output.rb
+- lib/eac_cli/runner_with/output_item.rb
+- lib/eac_cli/runner_with/output_item/base_formatter.rb
+- lib/eac_cli/runner_with/output_item/csv_formatter.rb
+- lib/eac_cli/runner_with/output_item/yaml_formatter.rb
 - lib/eac_cli/runner_with/output_list.rb
 - lib/eac_cli/runner_with/output_list/base_formatter.rb
 - lib/eac_cli/runner_with/output_list/csv_formatter.rb
@@ -163,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="