avm-tools 0.101.0 → 0.103.1

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

@@ -6,11 +6,12 @@ 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
-          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
 
@@ -27,7 +28,7 @@ module EacCli
       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

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
 

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

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

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_cli/docopt/runner_extension'
+require 'eac_cli/parser/alternative'
 
 RSpec.describe ::EacCli::Parser::Alternative do
   let(:instance) { described_class.new(alternative, argv) }

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_cli/docopt_runner'
 require 'eac_cli/runner'
 
 RSpec.describe ::EacCli::Runner do

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

@@ -3,23 +3,19 @@
 require 'eac_cli/speaker'
 
 RSpec.describe ::EacCli::Speaker do
-  let(:instance) do
-    r = ::Object.new
-    r.extend(described_class)
-    r
-  end
+  let(:instance) { described_class.new }
 
-  describe '#request_input' do
+  describe '#input' do
     it 'recover value from hash list' do
       allow(instance).to receive(:request_string).and_return('opt1')
       list = { opt1: 'value1', opt2: 'value2' }
-      expect(instance.request_input('Question', list: list)).to eq('value1')
+      expect(instance.input('Question', list: list)).to eq('value1')
     end
 
     it 'recover value from array list' do
       allow(instance).to receive(:request_string).and_return('OPT1')
       list = %w[opt1 opt2]
-      expect(instance.request_input('Question', list: list)).to eq('opt1')
+      expect(instance.input('Question', list: list)).to eq('opt1')
     end
 
     {
@@ -28,7 +24,7 @@ RSpec.describe ::EacCli::Speaker do
       context "when bool: true and input is \"#{input}\"" do
         it "return #{expected}" do
           allow(instance).to receive(:request_string).and_return(input)
-          expect(instance.request_input('Question', bool: true)).to eq(expected)
+          expect(instance.input('Question', bool: true)).to eq(expected)
         end
       end
     end

data/vendor/eac_config/lib/eac_config/node.rb

@@ -7,9 +7,16 @@ require 'eac_config/load_nodes_search'
 require 'eac_config/node_entry'
 require 'eac_config/node_uri'
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/context'
 
 module EacConfig
   module Node
+    class << self
+      def context
+        @context ||= ::EacRubyUtils::Context.new
+      end
+    end
+
     attr_accessor :write_node
 
     common_concern do

data/vendor/eac_config/lib/eac_config/version.rb

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

data/vendor/eac_docker/eac_docker.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.64'
+  s.add_dependency 'eac_ruby_utils', '~> 0.69', '>= 0.69.1'
   s.add_dependency 'eac_templates', '~> 0.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'

data/vendor/eac_docker/lib/eac_docker/debug.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/boolean'
+
+module EacDocker
+  module Debug
+    class << self
+      ENABLE_ENVVAR = 'EAC_DOCKER_DEBUG'
+
+      def enabled?
+        ::EacRubyUtils::Boolean.parse(ENV[ENABLE_ENVVAR])
+      end
+    end
+  end
+end

data/vendor/eac_docker/lib/eac_docker/images/coded.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_docker/debug'
 require 'eac_docker/executables'
 require 'eac_docker/images/base'
 require 'eac_ruby_utils/core_ext'
@@ -26,6 +27,9 @@ module EacDocker
       private
 
       def id_uncached
+        if ::EacDocker::Debug.enabled?
+          ::EacDocker::Executables.docker.command(*build_args.excluding('--quiet')).system!
+        end
         ::EacDocker::Executables.docker.command(*build_args).execute!.strip
       end
 

data/vendor/eac_docker/lib/eac_docker/images/templatized.rb

@@ -11,17 +11,27 @@ module EacDocker
     class Templatized < ::EacDocker::Images::Base
       enable_immutable
       immutable_accessor :tag
+      attr_reader :provide_dir
 
       def provide
         ::EacRubyUtils::Fs::Temp.on_directory do |provide_dir|
-          template.apply(self, provide_dir)
-          coded_image(provide_dir).tag(tag).provide
+          begin
+            self.provide_dir = provide_dir
+            template.apply(self, provide_dir)
+            coded_image(provide_dir).tag(tag).provide
+          ensure
+            self.provide_dir = nil
+          end
         end
       end
 
       def coded_image(provide_dir)
         ::EacDocker::Images::Coded.new(provide_dir)
       end
+
+      private
+
+      attr_writer :provide_dir
     end
   end
 end