ehbrs-tools 0.13.0 → 0.13.1

data/vendor/eac_cli/lib/eac_cli/parser/parse_result.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Parser
+    class ParseResult
+      common_constructor :definition, :argv
+
+      def result
+        ::EacCli::Parser::Collector.to_data(definition) do |collector|
+          ::EacCli::Parser::PositionalCollection.new(
+            definition,
+            ::EacCli::Parser::OptionsCollection.new(definition, argv, collector).arguments,
+            collector
+          )
+        end
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/parser/positional_collection.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/parser/error'
+
+module EacCli
+  class Parser
+    class PositionalCollection
+      common_constructor(:definition, :argv, :collector) { collect }
+
+      private
+
+      def collected
+        @collected ||= ::Set.new
+      end
+
+      def collect
+        argv.each { |argv_value| colect_argv_value(argv_value) }
+        return unless pending_required_positional?
+
+        raise ::EacCli::Parser::Error.new(
+          definition, argv, 'No value for required positional ' \
+            "\"#{current_positional.identifier}\""
+        )
+      end
+
+      def colect_argv_value(argv_value)
+        collector.collect(current_positional, argv_value)
+        collected << current_positional
+        positional_enumerator.next unless current_positional.repeat?
+      end
+
+      def pending_required_positional?
+        !(current_positional.blank? || current_positional.optional? ||
+            collected.include?(current_positional))
+      end
+
+      def positional_enumerator
+        @positional_enumerator ||= definition.positional.each
+      end
+
+      def current_positional
+        positional_enumerator.peek
+      rescue ::StopIteration
+        nil
+      end
+    end
+  end
+end

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

@@ -1,29 +1,49 @@
 # frozen_string_literal: true
 
-require 'eac_cli/runner/definition'
-require 'eac_cli/runner/docopt_doc'
+require 'eac_cli/definition'
+require 'eac_cli/docopt/runner_extension'
+require 'eac_cli/parser'
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
   module Runner
+    require_sub __FILE__
     extend ::ActiveSupport::Concern
 
     included do
       extend ClassMethods
       include InstanceMethods
+      ::EacCli::Docopt::RunnerExtension.check(self)
     end
 
     module ClassMethods
+      def create(*context_args)
+        r = new
+        r.context = ::EacCli::Runner::Context.new(*context_args)
+        r
+      end
+
       def runner_definition(&block)
-        @runner_definition ||= ::EacCli::Runner::Definition.new
+        @runner_definition ||= ::EacCli::Definition.new
         @runner_definition.instance_eval(&block) if block
         @runner_definition
       end
     end
 
     module InstanceMethods
-      def doc
-        ::EacCli::Runner::DocoptDoc.new(self.class.runner_definition).to_s
+      def context
+        return @context if @context
+
+        raise 'Context was required, but was not set yet'
+      end
+
+      def context=(new_context)
+        @context = new_context
+        @parsed = nil
+      end
+
+      def parsed
+        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition).parse(context.argv)
       end
     end
   end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module Runner
+    class Context
+      attr_reader :argv, :parent, :program_name
+
+      def initialize(*context_args)
+        options = context_args.extract_options!
+        @argv = (context_args[0] || options.delete(:argv)).freeze
+        @parent = context_args[1] || options.delete(:parent)
+        @program_name = options.delete(:program_name)
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/version.rb

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

data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/runner'
+
+RSpec.describe ::EacCli::Runner do
+  let(:stub_runner) do
+    r = Class.new(::EacRubyUtils::Console::DocoptRunner) do
+      def run; end
+    end
+    r.include described_class
+    r.runner_definition do
+      desc 'A stub runner.'
+      arg_opt '-o', '--opt1', 'A argument option'
+      pos_arg 'pos1'
+    end
+    r
+  end
+
+  let(:instance) { stub_runner.new(argv: %w[-o aaa bbb]) }
+
+  before { instance.run }
+
+  it { expect(instance.options.fetch('--opt1')).to eq('aaa') }
+  it { expect(instance.options.fetch('<pos1>')).to eq('bbb') }
+
+  context 'without docopt runner' do
+    let(:runner_class) do
+      the_module = described_class
+      ::Class.new do
+        include the_module
+
+        runner_definition do
+          arg_opt '-o', '--opt1', 'A arg option.'
+          bool_opt '-o', '--opt2', 'A boolean option'
+          pos_arg :pos1
+          pos_arg :pos2, repeat: true, optional: true
+        end
+
+        def run; end
+      end
+    end
+
+    context 'when all args are supplied' do
+      let(:instance) { runner_class.create(%w[--opt1 aaa --opt2 bbb ccc ddd]) }
+
+      it { expect(instance.parsed.opt1).to eq('aaa') }
+      it { expect(instance.parsed.opt2?).to eq(true) }
+      it { expect(instance.parsed.pos1).to eq('bbb') }
+      it { expect(instance.parsed.pos2).to eq(%w[ccc ddd]) }
+    end
+
+    context 'when only required args are supplied' do
+      let(:instance) { runner_class.create(%w[bbb]) }
+
+      it { expect(instance.parsed.opt1).to be_nil }
+      it { expect(instance.parsed.opt2?).to eq(false) }
+      it { expect(instance.parsed.pos1).to eq('bbb') }
+      it { expect(instance.parsed.pos2).to eq([]) }
+    end
+
+    context 'when required args are not supplied' do
+      let(:instance) { runner_class.create(%w[]) }
+
+      it do
+        expect { instance.parsed }.to raise_error(::EacCli::Parser::Error)
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/boolean.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class Boolean
+    class << self
+      def parse(value)
+        return parse_string(value) if value.is_a?(::String)
+        return parse_string(value.to_s) if value.is_a?(::Symbol)
+        return parse_number(value) if value.is_a?(::Number)
+
+        value ? true : false
+      end
+
+      private
+
+      def parse_string(value)
+        ['', 'n', 'no', 'f', 'false'].include?(value.strip.downcase) ? false : true
+      end
+
+      def parse_number(value)
+        value.zero?
+      end
+    end
+
+    attr_reader :value
+
+    def initialize(value)
+      @value = self.class.parse(value)
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner.rb

@@ -14,6 +14,12 @@ module EacRubyUtils
     class DocoptRunner
       include ::EacRubyUtils::Contextualizable
 
+      class << self
+        def create(settings = {})
+          new(settings)
+        end
+      end
+
       attr_reader :settings
 
       def initialize(settings = {})

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb

@@ -3,11 +3,11 @@
 module EacRubyUtils
   module Console
     class DocoptRunner
-      DOCOPT_ERROR_EXIT_CODE = 0x22220000
+      DOCOPT_ERROR_EXIT_CODE = 0xC0
 
       class << self
         def run(options = {})
-          new(options).send(:run)
+          create(options).send(:run)
         rescue Docopt::Exit => e
           STDERR.write(e.message + "\n")
           ::Kernel.exit(DOCOPT_ERROR_EXIT_CODE) # rubocop:disable Rails/Exit

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb

@@ -25,6 +25,8 @@ module EacRubyUtils
       end
 
       module SubcommandsSupport
+        EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME = :extra_available_subcommands
+
         def check_subcommands_arg
           if subcommand_arg_as_list?
             singleton_class.include(SubcommandsSupport::SubcommandArgAsList)
@@ -43,7 +45,7 @@ module EacRubyUtils
         end
 
         def subcommand
-          @subcommand ||= subcommand_class_name(subcommand_name).constantize.new(
+          @subcommand ||= subcommand_class_name(subcommand_name).constantize.create(
             argv: subcommand_args,
             program_name: subcommand_program,
             parent: self
@@ -77,7 +79,11 @@ module EacRubyUtils
         end
 
         def available_subcommands
-          (setting_value(:subcommands, false) || auto_available_subcommands).sort
+          r = ::Set.new(setting_value(:subcommands, false) || auto_available_subcommands)
+          if respond_to?(EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME, true)
+            r += send(EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME)
+          end
+          r.sort
         end
 
         def auto_available_subcommands

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env.rb

@@ -2,12 +2,16 @@
 
 require 'addressable'
 require 'eac_ruby_utils/envs/base_env'
+require 'eac_ruby_utils/patches/object/if_present'
+require 'eac_ruby_utils/patches/module/require_sub'
 require 'net/ssh'
 require 'shellwords'
 
 module EacRubyUtils
   module Envs
     class SshEnv < ::EacRubyUtils::Envs::BaseEnv
+      require_sub __FILE__, include_modules: true
+
       USER_PATTERN = /[a-z_][a-z0-9_-]*/.freeze
       HOSTNAME_PATTERN = /[^@]+/.freeze
       USER_HOSTNAME_PATTERN = /\A(?:(#{USER_PATTERN})@)?(#{HOSTNAME_PATTERN})\z/.freeze
@@ -49,17 +53,16 @@ module EacRubyUtils
       private
 
       def ssh_command_line
-        r = %w[ssh]
-        r += ['-p', uri.port] if uri.port.present?
-        r += ssh_command_line_options
-        r << user_hostname_uri
-        r.map { |a| Shellwords.escape(a) }.join(' ')
+        (%w[ssh] +
+          %w[nodasho dasho port].flat_map { |m| send("ssh_command_line_#{m}_args") } +
+          [user_hostname_uri])
+          .map { |a| Shellwords.escape(a) }.join(' ')
       end
 
-      def ssh_command_line_options
-        r = []
-        uri.query_values&.each { |k, v| r += ['-o', "#{k}=#{v}"] }
-        r
+      def ssh_command_line_port_args
+        uri.port.if_present([]) do |v|
+          ['-p', v]
+        end
       end
 
       def user_hostname_uri

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/dasho_options.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patches/module/common_concern'
+require 'eac_ruby_utils/patches/module/simple_cache'
+
+module EacRubyUtils
+  module Envs
+    class SshEnv < ::EacRubyUtils::Envs::BaseEnv
+      module DashoOptions
+        common_concern
+
+        module ClassMethods
+          def add_nodasho_option(name)
+            return if nodasho_options.include?(name)
+
+            nodasho_options << name
+            const_set("#{name.underscore}_option".upcase, name)
+          end
+
+          def nodasho_options
+            @nodasho_options ||= []
+          end
+        end
+
+        module InstanceMethods
+          def ssh_command_line_dasho_args
+            r = []
+            uri.query_values&.each do |k, v|
+              r += ['-o', "#{k}=#{v}"] unless nodasho_options.include?(k)
+            end
+            r
+          end
+
+          def ssh_command_line_nodasho_args
+            nodasho_options.flat_map do |option_name|
+              uri_query_value(option_name).if_present([]) do |option_value|
+                send("ssh_command_line_#{option_name.underscore}_args", option_value)
+              end
+            end
+          end
+
+          def nodasho_options
+            self.class.nodasho_options
+          end
+
+          def uri_query_value(name)
+            uri.query_values.if_present { |v| v[name] }
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/identity_file.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+require 'eac_ruby_utils/envs/ssh_env/dasho_options'
+require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/patches/object/if_present'
+
+module EacRubyUtils
+  module Envs
+    class SshEnv < ::EacRubyUtils::Envs::BaseEnv
+      module IdentityFile
+        extend ::ActiveSupport::Concern
+
+        included do
+          include ::EacRubyUtils::Envs::SshEnv::DashoOptions
+          add_nodasho_option('IdentityFile')
+        end
+
+        def ssh_command_line_identity_file_args(value)
+          ['-i', value]
+        end
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env/quiet.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+require 'eac_ruby_utils/boolean'
+require 'eac_ruby_utils/envs/ssh_env/dasho_options'
+
+module EacRubyUtils
+  module Envs
+    class SshEnv < ::EacRubyUtils::Envs::BaseEnv
+      module Quiet
+        extend ::ActiveSupport::Concern
+
+        included do
+          include ::EacRubyUtils::Envs::SshEnv::DashoOptions
+          add_nodasho_option('Quiet')
+        end
+
+        def ssh_command_line_quiet_args(value)
+          ::EacRubyUtils::Boolean.parse(value) ? ['-q'] : []
+        end
+      end
+    end
+  end
+end