ehbrs-tools 0.21.0 → 0.24.0

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Config
+    class Entry
+      module Undefined
+        private
+
+        def undefined_value
+          loop do
+            entry_value = undefined_value_no_loop
+            next unless options[:validator].if_present(true) { |v| v.call(entry_value) }
+
+            return entry_value
+          end
+        end
+
+        def undefined_value_no_loop
+          input("Value for entry \"#{path}\"", options.request_input_options)
+        end
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/definition/help_formatter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_cli/runner_with/help/builder/alternative'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
@@ -27,7 +28,7 @@ module EacCli
 
       def positional_argument(positional)
         if positional.subcommand?
-          ::EacCli::DocoptRunner::SUBCOMMANDS_MACRO
+          ::EacCli::RunnerWith::Help::Builder::Alternative::SUBCOMMANDS_MACRO
         else
           r = "<#{positional.name}>"
           r += '...' if positional.repeat?
@@ -52,7 +53,7 @@ module EacCli
       end
 
       def self_usage_arguments
-        [::EacCli::DocoptRunner::PROGRAM_MACRO] +
+        [::EacCli::RunnerWith::Help::Builder::Alternative::PROGRAM_MACRO] +
           definition.options_argument.if_present([]) { |_v| ['[options]'] } +
           self_usage_arguments_options +
           self_usage_arguments_positional

data/vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb

@@ -6,9 +6,10 @@ module EacCli
   class Definition
     class PositionalArgument
       DEFAULT_REQUIRED = true
+      DEFAULT_VISIBLE = true
 
       enable_listable
-      lists.add_symbol :option, :optional, :repeat, :required, :subcommand
+      lists.add_symbol :option, :optional, :repeat, :required, :subcommand, :visible
       common_constructor :name, :options, default: [{}] do
         options.assert_valid_keys(self.class.lists.option.values)
       end
@@ -51,6 +52,10 @@ module EacCli
       def to_s
         "#{self.class.name.demodulize}[#{identifier}]"
       end
+
+      def visible?
+        options.key?(OPTION_VISIBLE) ? options.fetch(OPTION_VISIBLE) : DEFAULT_VISIBLE
+      end
     end
   end
 end

data/vendor/eac_cli/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/vendor/eac_cli/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/vendor/eac_cli/lib/eac_cli/old_configs_bridge.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_cli/config'
+require 'eac_config/envvars_node'
+require 'eac_config/yaml_file_node'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class OldConfigsBridge < ::EacCli::Config
+    ENTRY_KEY = 'core.store_passwords'
+
+    class << self
+      def new_configs_path(configs_key, options)
+        options[:storage_path] || ::File.join(ENV['HOME'], '.config', configs_key, 'settings.yml')
+      end
+    end
+
+    def initialize(configs_key, options = {})
+      options.assert_argument(::Hash, 'options')
+      envvar_node = ::EacConfig::EnvvarsNode.new
+      file_node = ::EacConfig::YamlFileNode.new(self.class.new_configs_path(configs_key, options))
+      envvar_node.load_path.push(file_node.url)
+      envvar_node.write_node = file_node
+      super(envvar_node)
+    end
+
+    def read_entry(entry_key, options = {})
+      entry(entry_key, options).value
+    end
+
+    def read_password(entry_key, options = {})
+      entry(entry_key, options.merge(noecho: true, store: store_passwords?)).value
+    end
+
+    def store_passwords?
+      read_entry(ENTRY_KEY, bool: true)
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/runner.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'eac_cli/definition'
-require 'eac_cli/docopt/runner_extension'
 require 'eac_cli/parser'
 require 'eac_ruby_utils/core_ext'
 
@@ -43,7 +42,6 @@ module EacCli
 
       extend AfterClassMethods
       include InstanceMethods
-      ::EacCli::Docopt::RunnerExtension.check(self)
       include ActiveSupport::Callbacks
       define_callbacks :run
     end

data/vendor/eac_cli/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/vendor/eac_cli/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/vendor/eac_cli/lib/eac_cli/runner_with/help.rb

@@ -6,12 +6,13 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   module RunnerWith
     module Help
+      require_sub __FILE__
       common_concern do
         include ::EacCli::Runner
 
         runner_definition.alt do
-          options_argument false
-          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
 
         set_callback :run, :before do
@@ -20,17 +21,21 @@ module EacCli
       end
 
       def help_run
-        return unless parsed.help?
+        return unless show_help?
 
         puts help_text
         raise ::EacCli::Runner::Exit
       end
 
       def help_text
-        r = ::EacCli::Docopt::DocBuilder.new(self.class.runner_definition).to_s
+        r = ::EacCli::RunnerWith::Help::Builder.new(self.class.runner_definition).to_s
         r += help_extra_text if respond_to?(:help_extra_text)
         r
       end
+
+      def show_help?
+        parsed.help? && !if_respond(:run_subcommand?, false)
+      end
     end
   end
 end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module RunnerWith
+    module Help
+      class Builder
+        require_sub __FILE__
+        common_constructor :definition
+
+        SEP = ' '
+        IDENT = SEP * 2
+        OPTION_DESC_SEP = IDENT * 2
+
+        class << self
+          def option_long(option)
+            b = option.long
+            b += '=<value>' if option.argument?
+            b
+          end
+
+          def option_short(option)
+            b = option.short
+            b += '=<value>' if option.argument?
+            b
+          end
+
+          def option_usage_full(option)
+            if option.long.present?
+              [option.short, option_long(option)].reject(&:blank?).join(SEP)
+            else
+              option_short(option)
+            end
+          end
+        end
+
+        def option_definition(option)
+          self.class.option_usage_full(option) + option.description.if_present('') do |v|
+            OPTION_DESC_SEP + v
+          end
+        end
+
+        def section(header, include_header = true)
+          b = include_header ? "#{header.humanize}:\n" : ''
+          b += send("self_#{header}") + "\n"
+          definition.alternatives.each do |alternative|
+            b += IDENT + ::EacCli::RunnerWith::Help::Builder::Alternative.new(alternative).to_s +
+                 "\n"
+          end
+          b
+        end
+
+        def options_section
+          "Options:\n" +
+            definition.alternatives.flat_map(&:options)
+                      .map { |option| IDENT + option_definition(option) + "\n" }.join
+        end
+
+        def usage_section
+          "Usage:\n" +
+            definition.alternatives.map do |alternative|
+              IDENT + ::EacCli::RunnerWith::Help::Builder::Alternative.new(alternative).to_s + "\n"
+            end.join
+        end
+
+        def to_s
+          "#{definition.description}\n\n#{usage_section}\n#{options_section}\n"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module RunnerWith
+    module Help
+      class Builder
+        class Alternative
+          PROGRAM_MACRO = '__PROGRAM__'
+          SUBCOMMANDS_MACRO = '__SUBCOMMANDS__'
+
+          common_constructor :alternative
+
+          def to_s
+            (
+              [PROGRAM_MACRO] +
+                alternative.options_argument?.if_present([]) { |_v| ['[options]'] } +
+                options +
+                positionals
+            ).join(::EacCli::RunnerWith::Help::Builder::SEP)
+          end
+
+          def options
+            alternative.options.select(&:show_on_usage?).map do |option|
+              ::EacCli::RunnerWith::Help::Builder.option_long(option)
+            end
+          end
+
+          def option_argument(option)
+            b = option.long
+            b += '=<value>' if option.argument?
+            b
+          end
+
+          def positionals
+            alternative.positional.map { |p| positional(p) }.reject(&:blank?)
+          end
+
+          def positional(positional)
+            return unless positional.visible?
+
+            if positional.subcommand?
+              SUBCOMMANDS_MACRO
+            else
+              r = "<#{positional.name}>"
+              r += '...' if positional.repeat?
+              r = "[#{r}]" if positional.optional?
+              r
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb

@@ -10,9 +10,7 @@ module EacCli
 
       class << self
         def runner?(object)
-          ::EacCli::Runner.runner?(object) || (
-            object.is_a?(::Class) && object < ::EacCli::DocoptRunner
-          )
+          ::EacCli::Runner.runner?(object)
         end
       end
 
@@ -60,7 +58,7 @@ module EacCli
       end
 
       def run_with_subcommand
-        if subcommand_name
+        if run_subcommand?
           if subcommand_runner.respond_to?(:run_run)
             subcommand_runner.run_run
           else
@@ -79,6 +77,10 @@ module EacCli
         "Method #{__method__} should be overrided in #{self.class.name}"
       end
 
+      def run_subcommand?
+        subcommand_name.present?
+      end
+
       def subcommands?
         self.class.runner_definition.subcommands?
       end

data/vendor/eac_cli/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