eac_cli 0.19.0 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfee9c78c899be3c4e2d36915e4d0cac08cf5f2a63269813b5c05527a06d0e75
-  data.tar.gz: c0374336ed9fea6c351ce00b0a9e5e210b53ca7a34c201dc1a0699fcda12b943
+  metadata.gz: ac084c510379ffad8feceff82e7bb5f8526663a8eec785432283a2c8a567797a
+  data.tar.gz: 5efaada363d342f60d2aa55cc3823f39f84e64d9c422c4dabc4feb6be379decf
 SHA512:
-  metadata.gz: d2e1c8009e10490cde982e4d8cc0fce02d67d0114ddb3a852180298c6f83edd7d5e4e2ee0bf04188199d615739297b3fdbf41a61d532e6614b86dece3c63b864
-  data.tar.gz: fba7139e87ea3959a2498f20d83a08d19c299acd71e576ed0d446ca47a77bb97ab9e670c4280984001feb6467d6cdd01d3a989dc6b44b5e4d5345d9f87c66a0c
+  metadata.gz: 8e23f76ed8257b2285858741963451934c3de72f7d4de00d302e2c4cb6b8780d162455aad9a40831eb98402eec28673de8b55e69594a026214543a9b093b8ec5
+  data.tar.gz: f7c3e55370d73d0d9910ecdbb2c231245895862e33b84831496afe626e87e66d2f70c8863b153ad5f03e3bc1dae14663571947d91dfd3f3dba48035fc5ef1625

data/lib/eac_cli/config/entry.rb

@@ -10,7 +10,7 @@ module EacCli
       require_sub __FILE__, include_modules: true
       enable_listable
       enable_simple_cache
-      include ::EacCli::Speaker
+      enable_speaker
 
       common_constructor :config, :path, :options do
         self.path = ::EacConfig::EntryPath.assert(path)

data/lib/eac_cli/config/entry/undefined.rb

@@ -18,7 +18,7 @@ module EacCli
         end
 
         def undefined_value_no_loop
-          request_input("Value for entry \"#{path}\"", options.request_input_options)
+          input("Value for entry \"#{path}\"", options.request_input_options)
         end
       end
     end

data/lib/eac_cli/docopt/runner_context_replacement.rb

@@ -10,6 +10,10 @@ module EacCli
       def argv
         runner.settings[:argv] || ARGV
       end
+
+      def program_name
+        runner.settings[:program_name] || $PROGRAM_NAME
+      end
     end
   end
 end

data/lib/eac_cli/docopt_runner.rb

@@ -6,6 +6,7 @@ require 'docopt'
 module EacCli
   class DocoptRunner
     require_sub __FILE__
+    extend ::EacCli::DocoptRunner::ClassMethods
     include ::EacCli::DocoptRunner::Context
 
     class << self

data/lib/eac_cli/docopt_runner/{_class_methods.rb → class_methods.rb}

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require 'docopt'
+
 module EacCli
   class DocoptRunner
-    DOCOPT_ERROR_EXIT_CODE = 0xC0
+    module ClassMethods
+      DOCOPT_ERROR_EXIT_CODE = 0xC0
 
-    class << self
       def run(options = {})
         create(options).send(:run)
-      rescue Docopt::Exit => e
+      rescue ::Docopt::Exit => e
         STDERR.write(e.message + "\n")
         ::Kernel.exit(DOCOPT_ERROR_EXIT_CODE)
       end

data/lib/eac_cli/old_configs.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_cli/patches/module/speaker'
 
 module EacCli
   class OldConfigs

data/lib/eac_cli/old_configs/entry_reader.rb

@@ -70,8 +70,8 @@ module EacCli
       end
 
       def entry_value_from_input(entry_key, options)
-        entry_value = request_input("Value for entry \"#{entry_key}\"",
-                                    options.request_input_options)
+        entry_value = input("Value for entry \"#{entry_key}\"",
+                            options.request_input_options)
         warn('Entered value is blank') if entry_value.blank?
         entry_value
       end

data/lib/eac_cli/runner/after_class_methods.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/speaker'
+
 module EacCli
   module Runner
     module AfterClassMethods
@@ -10,9 +13,11 @@ module EacCli
       end
 
       def run(*runner_context_args)
-        r = create(*runner_context_args)
-        r.run_run
-        r
+        on_asserted_speaker do
+          r = create(*runner_context_args)
+          r.run_run
+          r
+        end
       end
 
       def runner_definition(&block)
@@ -24,6 +29,18 @@ module EacCli
       def super_runner_definition
         superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
       end
+
+      private
+
+      def on_asserted_speaker
+        if ::EacRubyUtils::Speaker.context.optional_current
+          yield
+        else
+          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
+            yield
+          end
+        end
+      end
     end
   end
 end

data/lib/eac_cli/runner/instance_methods.rb

@@ -15,7 +15,7 @@ module EacCli
       end
 
       def run_parser_error(error)
-        $stderr.write("#{error}\n")
+        $stderr.write("#{program_name}: #{error}\n")
         ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
       end
 
@@ -33,6 +33,10 @@ module EacCli
       def parsed
         @parsed ||= ::EacCli::Parser.new(self.class.runner_definition, runner_context.argv).parsed
       end
+
+      def program_name
+        runner_context.if_present(&:program_name) || $PROGRAM_NAME
+      end
     end
   end
 end

data/lib/eac_cli/runner_with/help.rb

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

data/lib/eac_cli/speaker.rb

@@ -1,26 +1,26 @@
 # frozen_string_literal: true
 
 require 'colorize'
-require 'io/console'
-require 'eac_ruby_utils/patches/hash/options_consumer'
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub __FILE__
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/speaker/receiver'
 
 module EacCli
-  # https://github.com/fazibear/colorize
-  module Speaker
-    def on_speaker_node(&block)
-      ::EacCli::Speaker.on_node(&block)
+  class Speaker
+    require_sub __FILE__, include_modules: true
+    include ::EacRubyUtils::Speaker::Receiver
+
+    common_constructor :options, default: [{}] do
+      self.options = self.class.lists.option.hash_keys_validate!(options)
     end
 
     def puts(string = '')
       string.to_s.each_line do |line|
-        current_node.stderr.puts(current_node.stderr_line_prefix.to_s + line)
+        err_out.puts(err_line_prefix.to_s + line)
       end
     end
 
     def out(string = '')
-      current_node.stdout.write(string.to_s)
+      out_out.write(string.to_s)
     end
 
     def fatal_error(string)
@@ -52,7 +52,7 @@ module EacCli
     #   +bool+ ([Boolean], default: +false+): requires a answer "yes" or "no".
     #   +list+ ([Hash] or [Array], default: +nil+): requires a answer from a list.
     #   +noecho+ ([Boolean], default: +false+): does not output answer.
-    def request_input(question, options = {})
+    def input(question, options = {})
       bool, list, noecho = options.to_options_consumer.consume_all(:bool, :list, :noecho)
       if list
         request_from_list(question, list, noecho)
@@ -110,22 +110,18 @@ module EacCli
     end
 
     def request_string(question, noecho)
-      current_node.stderr.write "#{question}: ".to_s.yellow
+      err_out.write "#{question}: ".to_s.yellow
       noecho ? request_string_noecho : request_string_echo
     end
 
     def request_string_noecho
-      r = current_node.stdin.noecho(&:gets).chomp.strip
-      current_node.stderr.write("\n")
+      r = in_in.noecho(&:gets).chomp.strip
+      err_out.write("\n")
       r
     end
 
     def request_string_echo
-      current_node.stdin.gets.chomp.strip
-    end
-
-    def current_node
-      ::EacCli::Speaker.current_node
+      in_in.gets.chomp.strip
     end
   end
 end

data/lib/eac_cli/speaker/_constants.rb

@@ -4,7 +4,7 @@ require 'eac_ruby_utils/by_reference'
 
 module EacCli
   # https://github.com/fazibear/colorize
-  module Speaker
+  class Speaker
     STDERR = ::EacRubyUtils::ByReference.new { $stderr }
     STDIN = ::EacRubyUtils::ByReference.new { $stdin }
     STDOUT = ::EacRubyUtils::ByReference.new { $stdout }

data/lib/eac_cli/speaker/list.rb

@@ -4,7 +4,7 @@ require 'active_support/hash_with_indifferent_access'
 require 'ostruct'
 
 module EacCli
-  module Speaker
+  class Speaker
     class List
       class << self
         def build(list)

data/lib/eac_cli/speaker/options.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Speaker
+    module Options
+      common_concern do
+        enable_listable
+        lists.add_symbol :option, :out_out, :err_out, :in_in, :parent, :err_line_prefix
+      end
+
+      def err_out
+        option(OPTION_ERR_OUT, ::EacCli::Speaker::STDERR)
+      end
+
+      def out_out
+        option(OPTION_OUT_OUT, ::EacCli::Speaker::STDOUT)
+      end
+
+      def in_in
+        option(OPTION_IN_IN, ::EacCli::Speaker::STDIN)
+      end
+
+      def err_line_prefix
+        option(OPTION_ERR_LINE_PREFIX, '')
+      end
+
+      def parent
+        options[OPTION_PARENT]
+      end
+
+      def option(key, default)
+        options[key] || parent.if_present(default) { |v| v.send(__METHOD__) }
+      end
+    end
+  end
+end

data/lib/eac_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_cli
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.4
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.67'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.67'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -107,10 +107,10 @@ files:
 - lib/eac_cli/docopt/runner_context_replacement.rb
 - lib/eac_cli/docopt/runner_extension.rb
 - lib/eac_cli/docopt_runner.rb
-- lib/eac_cli/docopt_runner/_class_methods.rb
 - lib/eac_cli/docopt_runner/_doc.rb
 - lib/eac_cli/docopt_runner/_settings.rb
 - lib/eac_cli/docopt_runner/_subcommands.rb
+- lib/eac_cli/docopt_runner/class_methods.rb
 - lib/eac_cli/docopt_runner/context.rb
 - lib/eac_cli/old_configs.rb
 - lib/eac_cli/old_configs/entry_reader.rb
@@ -130,8 +130,6 @@ files:
 - lib/eac_cli/parser/collector.rb
 - lib/eac_cli/parser/error.rb
 - lib/eac_cli/patches.rb
-- lib/eac_cli/patches/module.rb
-- lib/eac_cli/patches/module/speaker.rb
 - lib/eac_cli/patches/object.rb
 - lib/eac_cli/patches/object/runner_with.rb
 - lib/eac_cli/runner.rb
@@ -145,10 +143,9 @@ files:
 - lib/eac_cli/runner_with/subcommands/definition_concern.rb
 - lib/eac_cli/runner_with_set.rb
 - lib/eac_cli/speaker.rb
-- lib/eac_cli/speaker/_class_methods.rb
 - lib/eac_cli/speaker/_constants.rb
 - lib/eac_cli/speaker/list.rb
-- lib/eac_cli/speaker/node.rb
+- lib/eac_cli/speaker/options.rb
 - lib/eac_cli/version.rb
 homepage: 
 licenses: []

data/lib/eac_cli/patches/module.rb

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

data/lib/eac_cli/patches/module/speaker.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/patch'
-
-class Module
-  def enable_speaker
-    ::EacRubyUtils.patch(self, ::EacCli::Speaker)
-  end
-end

data/lib/eac_cli/speaker/_class_methods.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/speaker/node'
-
-module EacCli
-  module Speaker
-    class << self
-      def current_node
-        nodes_stack.last
-      end
-
-      def on_node(&block)
-        push
-        yield(*(block.arity.zero? ? [] : [current_node]))
-      ensure
-        pop
-      end
-
-      def push
-        nodes_stack << ::EacCli::Speaker::Node.new
-        current_node
-      end
-
-      def pop
-        return nodes_stack.pop if nodes_stack.count > 1
-
-        raise "Cannot remove first node (nodes_stack.count: #{nodes_stack.count})"
-      end
-
-      private
-
-      def nodes_stack
-        @nodes_stack ||= [::EacCli::Speaker::Node.new]
-      end
-    end
-  end
-end

data/lib/eac_cli/speaker/node.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/patches/object/if_present'
-require 'eac_cli/speaker/_constants'
-
-module EacCli
-  module Speaker
-    class Node
-      attr_accessor :stdin, :stdout, :stderr, :stderr_line_prefix
-
-      def initialize(parent = nil)
-        self.stdin = parent.if_present(::EacCli::Speaker::STDIN, &:stdin)
-        self.stdout = parent.if_present(::EacCli::Speaker::STDOUT, &:stdout)
-        self.stderr = parent.if_present(::EacCli::Speaker::STDERR, &:stderr)
-        self.stderr_line_prefix = parent.if_present('', &:stderr_line_prefix)
-      end
-
-      def configure
-        yield(self)
-        self
-      end
-    end
-  end
-end