ehbrs-tools 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8563bd63534580d6d7a099be6db131d899c4cd430ca5693f18578116d5c36b79
-  data.tar.gz: f7ec380ad444fc03ba43c906c09154294f0d685dda9a713fe77da78de3b4ded9
+  metadata.gz: 54ab663243b4a28f6150b487f58429b8641562d36227dff9b7088a2233a968b8
+  data.tar.gz: 9951aa6733798e9c4f41468e030edc8145a4bb270caef14c57d24f4d9dd200fe
 SHA512:
-  metadata.gz: dc550a52d559e31d2ce7455543b0c9024c133bcab23af4a78df484141a54c70f6e76b97b339f7257e9a879ae0043e6b97f063bd0d36a28afa501cc96a27f53a6
-  data.tar.gz: 4e24dc4ea1d43c39cba77906c2c61f1bc1a946f0bc550f9a4516269d2d0498b68cf4342d4fb230094920c4f6d8e3c1c604e2c1d47d12087e8f98d27e101cb473
+  metadata.gz: d4ac11d9a3d40d9b402c0906dc40825ae88145e02e166ead9de9279911aa4bd410e129bd79b3c3c2dc966ffad17c93870c031cc007e32c1ddeed43e19be92e42
+  data.tar.gz: d2769f8bc2f8471800a8cef1c3763a42fbd4fb32097b4230ac0dc7ede00f7d1c59b29cb9e4b4321639178bdd6695071a2be2b71f49ffbc25ed8742bd87621960

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.16.2'
+    VERSION = '0.16.3'
   end
 end

data/vendor/eac_cli/eac_cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.50'
+  s.add_dependency 'eac_ruby_utils', '~> 0.55'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
 end

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

@@ -12,12 +12,14 @@ module EacCli
 
     def parsed_uncached
       raise 'Definition has no alternatives' if alternatives.empty?
+      raise first_error unless alternatives.select(&:success?).any?
 
-      alternatives.each do |alt_parser|
-        return alt_parser.parsed unless alt_parser.error?
-      end
+      alternatives_parsed(true).merge(alternatives_parsed(false))
+    end
 
-      raise first_error
+    def alternatives_parsed(error)
+      alternatives.select { |a| error == a.error? }.map(&:parsed).reverse
+                  .inject(::EacRubyUtils::Struct.new) { |a, e| a.merge(e) }
     end
 
     def alternatives_uncached

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

@@ -22,6 +22,10 @@ module EacCli
         error.present?
       end
 
+      def success?
+        !error?
+      end
+
       def parsed
         @parsed ||= collector.to_data.freeze
       end

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

@@ -44,6 +44,8 @@ module EacCli
       extend AfterClassMethods
       include InstanceMethods
       ::EacCli::Docopt::RunnerExtension.check(self)
+      include ActiveSupport::Callbacks
+      define_callbacks :run
     end
 
     module AfterClassMethods
@@ -55,8 +57,7 @@ module EacCli
 
       def run(*runner_context_args)
         r = create(*runner_context_args)
-        r.parsed
-        r.run
+        r.run_run
         r
       end
 
@@ -72,6 +73,13 @@ module EacCli
     end
 
     module InstanceMethods
+      def run_run
+        parsed
+        run_callbacks(:run) { run }
+      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
+        # Do nothing
+      end
+
       def runner_context
         return @runner_context if @runner_context
 

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module EacCli
+  module Runner
+    class Exit < ::StandardError
+      attr_reader :status
+
+      def initialize(status = true)
+        @status = status
+      end
+    end
+  end
+end

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

@@ -13,6 +13,21 @@ module EacCli
           options_argument false
           bool_opt '-h', '--help', 'Show help.', usage: true
         end
+
+        set_callback :run, :before do
+          help_run
+        end
+      end
+
+      def help_run
+        return unless parsed.help?
+
+        puts help_text
+        raise ::EacCli::Runner::Exit
+      end
+
+      def help_text
+        ::EacCli::Docopt::DocBuilder.new(self.class.runner_definition).to_s
       end
     end
   end

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

@@ -44,7 +44,7 @@ module EacCli
 
       def run_with_subcommand
         if subcommand_name
-          subcommand_runner.run
+          subcommand_runner.run_run
         else
           run_without_subcommand
         end

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

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

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

@@ -28,7 +28,10 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when all args are supplied' do
     let(:argv) { %w[--opt1 aaa --opt2 bbb ccc ddd] }
-    let(:parsed_expected) { { opt1: 'aaa', opt2: true, pos1: 'bbb', pos2: %w[ccc ddd] } }
+    let(:parsed_expected) do
+      { opt1: 'aaa', opt2: true, opt3: false, pos1: 'bbb',
+        pos2: %w[ccc ddd] }
+    end
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt1).to eq('aaa') }
@@ -39,7 +42,7 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when only required args are supplied' do
     let(:argv) { %w[bbb] }
-    let(:parsed_expected) { { opt1: nil, opt2: false, pos1: 'bbb', pos2: [] } }
+    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: false, pos1: 'bbb', pos2: [] } }
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt1).to be_nil }
@@ -58,7 +61,7 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when alternative args are supplied' do
     let(:argv) { %w[--opt3] }
-    let(:parsed_expected) { { opt3: true } }
+    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: true, pos1: nil, pos2: [] } }
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt3?).to eq(true) }

data/vendor/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/help'
+require 'eac_ruby_utils/fs/temp'
+
+RSpec.describe ::EacCli::RunnerWith::Help do
+  let(:runner) do
+    the_module = described_class
+    Class.new do
+      include the_module
+
+      runner_definition do
+        desc 'A stub runner.'
+        pos_arg :a_argument
+      end
+
+      def run
+        puts 'Runner run'
+      end
+    end
+  end
+
+  let(:runner_argv) { ['--help'] }
+  let(:instance) { runner.create(argv: runner_argv) }
+  let(:expected_output) do
+    <<~OUTPUT
+      A stub runner.
+
+      Usage:
+        __PROGRAM__ [options] <a_argument>
+        __PROGRAM__ --help
+
+      Options:
+        -h --help    Show help.
+
+    OUTPUT
+  end
+
+  it 'show help text' do
+    expect { instance.run_run }.to output(expected_output).to_stdout_from_any_process
+  end
+end

data/vendor/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb

@@ -8,7 +8,6 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
     the_module = described_class
     the_child = child_runner
     Class.new do
-      include ::EacCli::Runner
       include the_module
       const_set('ChildCmd', the_child)
 

data/vendor/eac_docker/lib/eac_docker/container.rb

@@ -8,6 +8,7 @@ module EacDocker
     immutable_accessor :interactive, :temporary, :tty, type: :boolean
     immutable_accessor :env, type: :hash
     immutable_accessor :command_arg, :volume, type: :array
+    attr_reader :id
     common_constructor :image
 
     def immutable_constructor_args
@@ -16,6 +17,23 @@ module EacDocker
 
     alias immutable_volume volume
 
+    def hostname
+      ::EacDocker::Executables.docker.command(
+        'inspect', '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}',
+        id
+      ).execute!.strip
+    end
+
+    def on_detached
+      command = ::EacDocker::Executables.docker.command(*(%w[run --detach] + run_command_args))
+      self.id = command.execute!.strip
+      begin
+        yield(self)
+      ensure
+        stop
+      end
+    end
+
     def volume(left_part, right_part = null)
       immutable_volume(right_part.if_present(left_part) { |v| "#{left_part}:#{v}" })
     end
@@ -29,8 +47,14 @@ module EacDocker
         command_args
     end
 
+    def stop
+      ::EacDocker::Executables.docker.command('stop', id).execute!
+    end
+
     private
 
+    attr_writer :id
+
     def run_command_boolean_args
       r = []
       r << '--interactive' if interactive?

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_docker/executables'
+require 'eac_docker/images/base'
+require 'eac_ruby_utils/core_ext'
+
+module EacDocker
+  module Images
+    class Coded < ::EacDocker::Images::Base
+      enable_simple_cache
+      enable_immutable
+      immutable_accessor :tag
+      common_constructor :path do
+        self.path = path.to_pathname
+      end
+
+      def immutable_constructor_args
+        [path]
+      end
+
+      def provide
+        id
+        self
+      end
+
+      private
+
+      def id_uncached
+        ::EacDocker::Executables.docker.command(*build_args).execute!.strip
+      end
+
+      def build_args
+        args = %w[build --quiet]
+        args += ['--tag', tag] if tag.present?
+        args + [path.to_path]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_docker/images/base'
+require 'eac_docker/images/coded'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/temp'
+
+module EacDocker
+  module Images
+    class Templatized < ::EacDocker::Images::Base
+      enable_immutable
+      immutable_accessor :tag
+
+      def provide
+        ::EacRubyUtils::Fs::Temp.on_directory do |provide_dir|
+          template.apply(self, provide_dir)
+          coded_image(provide_dir).tag(tag).provide
+        end
+      end
+
+      def coded_image(provide_dir)
+        ::EacDocker::Images::Coded.new(provide_dir)
+      end
+    end
+  end
+end

data/vendor/eac_docker/lib/eac_docker/registry.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacDocker
+  class Registry
+    common_constructor :name
+
+    def to_s
+      name
+    end
+
+    def sub(suffix)
+      self.class.new("#{name}#{suffix}")
+    end
+  end
+end

data/vendor/eac_docker/lib/eac_docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacDocker
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/vendor/eac_docker/spec/lib/eac_docker/images/coded_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'eac_docker/images/coded'
+
+RSpec.describe(::EacDocker::Images::Coded, docker: true) do
+  let(:fixtures_dir) { ::Pathname.new('coded_spec_files').expand_path(__dir__) }
+  let(:instance) { described_class.new(fixtures_dir / 'image1') }
+
+  describe '#provide' do
+    it { expect { instance.provide }.not_to raise_error }
+  end
+end

data/vendor/eac_docker/spec/lib/eac_docker/images/coded_spec_files/image1/Dockerfile

@@ -0,0 +1 @@
+from ubuntu:bionic

data/vendor/eac_docker/spec/lib/eac_docker/images/templatized_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_docker/images/templatized'
+
+RSpec.describe(::EacDocker::Images::Templatized, docker: true) do
+  let(:fixtures_dir) { ::Pathname.new('templatized_spec_files').expand_path(__dir__) }
+  let(:instance) { StubDockerImage.new }
+
+  before do
+    ::EacRubyUtils::Templates::Searcher.default.included_paths << fixtures_dir
+    stub_const('StubDockerImage', Class.new(described_class))
+  end
+
+  describe '#provide' do
+    it { expect { instance.provide }.not_to raise_error }
+  end
+end

data/vendor/eac_docker/spec/lib/eac_docker/images/templatized_spec_files/stub_docker_image/Dockerfile

@@ -0,0 +1 @@
+from ubuntu:bionic

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
-require 'eac_ruby_utils/simple_cache'
-require 'eac_ruby_utils/patches/object/if_present'
+require 'eac_ruby_utils/common_concern/module_setup'
 
 module EacRubyUtils
   class CommonConcern
@@ -16,53 +14,7 @@ module EacRubyUtils
     end
 
     def setup(a_module)
-      Setup.new(self, a_module).run
-    end
-
-    class Setup
-      include ::EacRubyUtils::SimpleCache
-      attr_reader :a_module, :common_concern
-
-      def initialize(common_concern, a_module)
-        @common_concern = common_concern
-        @a_module = a_module
-      end
-
-      def run
-        setup = self
-        a_module.extend(::ActiveSupport::Concern)
-        a_module.included do
-          %w[class_methods instance_methods after_callback].each do |suffix|
-            setup.send("setup_#{suffix}", self)
-          end
-        end
-      end
-
-      def setup_class_methods(base)
-        class_methods_module.if_present { |v| base.extend v }
-      end
-
-      def setup_instance_methods(base)
-        instance_methods_module.if_present { |v| base.include v }
-      end
-
-      def setup_after_callback(base)
-        common_concern.after_callback.if_present do |v|
-          base.instance_eval(&v)
-        end
-      end
-
-      def class_methods_module_uncached
-        a_module.const_get(CLASS_METHODS_MODULE_NAME)
-      rescue NameError
-        nil
-      end
-
-      def instance_methods_module_uncached
-        a_module.const_get(INSTANCE_METHODS_MODULE_NAME)
-      rescue NameError
-        nil
-      end
+      ::EacRubyUtils::CommonConcern::ModuleSetup.new(self, a_module).run
     end
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/class_setup.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/patches/object/if_present'
+
+module EacRubyUtils
+  class CommonConcern
+    class ClassSetup
+      include ::EacRubyUtils::SimpleCache
+      attr_reader :a_class, :module_setup, :include_method
+
+      def initialize(module_setup, a_class, include_method)
+        @module_setup = module_setup
+        @a_class = a_class
+        @include_method = include_method
+      end
+
+      def run
+        %w[class_methods instance_methods after_callback].each do |suffix|
+          send("setup_#{suffix}")
+        end
+      end
+
+      def setup_class_methods
+        class_methods_module.if_present { |v| a_class.extend v }
+      end
+
+      def setup_instance_methods
+        instance_methods_module.if_present { |v| a_class.send(include_method, v) }
+      end
+
+      def setup_after_callback
+        module_setup.common_concern.after_callback.if_present do |v|
+          a_class.instance_eval(&v)
+        end
+      end
+
+      def class_methods_module_uncached
+        module_setup.a_module.const_get(CLASS_METHODS_MODULE_NAME)
+      rescue NameError
+        nil
+      end
+
+      def instance_methods_module_uncached
+        module_setup.a_module.const_get(INSTANCE_METHODS_MODULE_NAME)
+      rescue NameError
+        nil
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/module_setup.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+require 'eac_ruby_utils/common_concern/class_setup'
+require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/patches/object/if_present'
+
+module EacRubyUtils
+  class CommonConcern
+    class ModuleSetup
+      include ::EacRubyUtils::SimpleCache
+      attr_reader :a_module, :common_concern
+
+      def initialize(common_concern, a_module)
+        @common_concern = common_concern
+        @a_module = a_module
+      end
+
+      def run
+        setup = self
+        a_module.extend(::ActiveSupport::Concern)
+        a_module.included do
+          ::EacRubyUtils::CommonConcern::ClassSetup.new(setup, self, :include).run
+        end
+        a_module.prepended do
+          ::EacRubyUtils::CommonConcern::ClassSetup.new(setup, self, :prepend).run
+        end
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb

@@ -61,6 +61,8 @@ module EacRubyUtils
       setup_class_attr_readers(klass)
       setup_class_attr_writers(klass)
       setup_class_initialize(klass)
+
+      klass
     end
 
     def setup_class_attr_readers(klass)
@@ -79,9 +81,14 @@ module EacRubyUtils
       klass.define_callbacks :initialize
       klass.send(:define_method, :initialize) do |*args|
         Initialize.new(common_constructor, args, self).run
+        super(*SuperArgs.new(common_constructor, args, self).result)
       end
     end
 
+    def super_args
+      options[:super_args]
+    end
+
     class Initialize
       attr_reader :common_constructor, :args, :object
 
@@ -129,5 +136,51 @@ module EacRubyUtils
           " (given #{args.count}, expected #{common_constructor.args_count})"
       end
     end
+
+    class SuperArgs
+      attr_reader :common_constructor, :args, :object
+
+      def initialize(common_constructor, args, object)
+        @common_constructor = common_constructor
+        @args = args
+        @object = object
+      end
+
+      def auto_result
+        r = []
+        sub_args.each do |name, value|
+          i = super_arg_index(name)
+          r[i] = value if i
+        end
+        r
+      end
+
+      def result
+        result_from_options || auto_result
+      end
+
+      def result_from_options
+        return unless common_constructor.super_args
+
+        object.instance_exec(&common_constructor.super_args)
+      end
+
+      def sub_args
+        common_constructor.args.each_with_index.map do |name, index|
+          [name, args[index]]
+        end.to_h
+      end
+
+      def super_arg_index(name)
+        super_method.parameters.each_with_index do |arg, index|
+          return index if arg[1] == name
+        end
+        nil
+      end
+
+      def super_method
+        object.class.superclass ? object.class.superclass.instance_method(:initialize) : nil
+      end
+    end
   end
 end

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/hash/indifferent_access'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/envs/command/extra_options'
+require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/envs/process'
 require 'eac_ruby_utils/envs/spawn'
 require 'pp'
@@ -11,8 +9,8 @@ require 'shellwords'
 module EacRubyUtils
   module Envs
     class Command
-      include EacRubyUtils::Console::Speaker
-      include EacRubyUtils::Envs::Command::ExtraOptions
+      require_sub __FILE__, include_modules: true
+      enable_console_speaker
 
       def initialize(env, command, extra_options = {})
         @env = env
@@ -47,7 +45,7 @@ module EacRubyUtils
         c = c.map { |x| escape(x) }.join(' ') if c.is_a?(Enumerable)
         append_command_options(
           @env.command_line(
-            append_chdir(append_pipe(append_envvars(c)))
+            append_chdir(append_concat(append_envvars(c)))
           ),
           options
         )

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/concat.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/struct'
+
+module EacRubyUtils
+  module Envs
+    class Command
+      module Concat
+        def concat(operator, other_command)
+          duplicate_by_extra_options(concat: ::EacRubyUtils::Struct.new(
+            operator: operator, command: other_command
+          ))
+        end
+
+        def or(other_command)
+          concat('||', other_command)
+        end
+
+        def pipe(other_command)
+          concat('|', other_command)
+        end
+
+        private
+
+        def append_concat(command)
+          extra_options[:concat].if_present(command) do |v|
+            "#{command} #{v.operator} #{v.command.command}"
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/envvars.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  module Envs
+    class Command
+      module Envvars
+        def envvar(name, value)
+          duplicate_by_extra_options(envvars: envvars.merge(name => value))
+        end
+
+        private
+
+        def append_envvars(command)
+          e = envvars.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(' ')
+          e.present? ? "#{e} #{command}" : command
+        end
+
+        def envvars
+          extra_options[:envvars] ||= {}.with_indifferent_access
+        end
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/extra_options.rb

@@ -12,39 +12,18 @@ module EacRubyUtils
           duplicate_by_extra_options(chdir: dir)
         end
 
-        def envvar(name, value)
-          duplicate_by_extra_options(envvars: envvars.merge(name => value))
-        end
-
         def status_result(status_code, result)
           duplicate_by_extra_options(status_results: status_results.merge(status_code => result))
         end
 
-        def pipe(other_command)
-          duplicate_by_extra_options(pipe: other_command)
-        end
-
         private
 
         attr_reader :extra_options
 
-        def envvars
-          extra_options[:envvars] ||= {}.with_indifferent_access
-        end
-
         def status_results
           extra_options[:status_results] ||= {}.with_indifferent_access
         end
 
-        def append_envvars(command)
-          e = envvars.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(' ')
-          e.present? ? "#{e} #{command}" : command
-        end
-
-        def append_pipe(command)
-          extra_options[:pipe].present? ? "#{command} | #{extra_options[:pipe].command}" : command
-        end
-
         def append_chdir(command)
           extra_options[:chdir].present? ? "(cd '#{extra_options[:chdir]}' ; #{command} )" : command
         end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 
 module EacRubyUtils
   class Struct
     def initialize(initial_data = {})
-      self.data = ::ActiveSupport::HashWithIndifferentAccess.new(initial_data)
+      self.data = initial_data.symbolize_keys
     end
 
     def [](key)
@@ -19,6 +20,11 @@ module EacRubyUtils
       bool ? fetch(key).present? : data.fetch(key)
     end
 
+    def merge(other)
+      other = self.class.new(other) unless other.is_a?(self.class)
+      self.class.new(to_h.merge(other.to_h))
+    end
+
     def method_missing(method_name, *arguments, &block)
       property_method?(method_name) ? fetch(method_name) : super
     end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.53.0'
+  VERSION = '0.55.0'
 end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_concern_spec.rb

@@ -9,34 +9,47 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
     end
   end
 
-  module MyModule
-    module ClassMethods
-      def my_class_method
-        'class'
+  let(:stub_module) do
+    ::Module.new do
+      module ClassMethods # rubocop:disable RSpec/LeakyConstantDeclaration
+        def my_class_method
+          'class'
+        end
       end
-    end
 
-    module InstanceMethods
-      def my_instance_method
-        'instance'
+      module InstanceMethods # rubocop:disable RSpec/LeakyConstantDeclaration
+        def my_instance_method
+          'instance'
+        end
       end
     end
   end
 
-  class MyClass
-    class << self
-      attr_accessor :valor
+  let(:stub_class) do
+    ::Class.new do
+      class << self
+        attr_accessor :valor
+      end
+
+      def method1
+        'from_stub_module'
+      end
     end
   end
 
-  let(:subject) { MyClass.new }
+  let(:stub_class_instance) { stub_class.new }
 
   before do
-    instance.setup(MyModule)
-    MyClass.include MyModule
+    instance.setup(stub_module)
   end
 
-  it { expect(subject.my_instance_method).to eq('instance') }
-  it { expect(subject.class.my_class_method).to eq('class') }
-  it { expect(subject.class.valor).to eq('changed') }
+  context 'when included' do
+    before do
+      stub_class.include stub_module
+    end
+
+    it { expect(stub_class_instance.my_instance_method).to eq('instance') }
+    it { expect(stub_class_instance.class.my_class_method).to eq('class') }
+    it { expect(stub_class_instance.class.valor).to eq('changed') }
+  end
 end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_constructor_spec.rb

@@ -3,34 +3,92 @@
 require 'eac_ruby_utils/common_constructor'
 
 RSpec.describe ::EacRubyUtils::CommonConstructor do
-  ARG_LIST = %i[a b c d].freeze
+  ARG_LIST = %i[a b c d].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
+
   let(:instance) do
     described_class.new(*ARG_LIST, default: %w[Vcc Vd]) do
       @z = 'Vz'
     end
   end
 
-  class MyClass
-    attr_reader :z
+  let(:a_class) do
+    ::Class.new do
+      attr_reader :z
+    end
   end
 
-  let(:subject) { MyClass.new('Va', 'Vb', 'Vc') }
+  let(:a_class_instance) { a_class.new('Va', 'Vb', 'Vc') }
 
   before do
-    instance.setup_class(::MyClass)
+    instance.setup_class(a_class)
   end
 
-  it { expect(subject.z).to eq('Vz') }
+  it { expect(a_class_instance.z).to eq('Vz') }
 
   ARG_LIST.each do |attr|
     expected_value = "V#{attr}"
     it "attribute \"#{attr}\" equal to \"#{expected_value}\"" do
-      expect(subject.send(attr)).to eq(expected_value)
+      expect(a_class_instance.send(attr)).to eq(expected_value)
     end
 
     [false, true].each do |include_all|
       it "respond_to?('#{attr}', #{include_all}) == #{include_all}" do
-        expect(subject.respond_to?("#{attr}=", include_all)).to eq(include_all)
+        expect(a_class_instance.respond_to?("#{attr}=", include_all)).to eq(include_all)
+      end
+    end
+  end
+
+  context 'with super class' do
+    let(:super_class) do
+      ::Class.new do
+        attr_reader :super_a, :super_b
+
+        def initialize(a, b) # rubocop:disable Naming/MethodParameterName
+          @super_a = a
+          @super_b = b
+        end
+      end
+    end
+
+    let(:sub_class) do
+      sub_constructor.setup_class(::Class.new(super_class))
+    end
+
+    let(:sub_object) { sub_class.new(1, 2, 3, 4) }
+
+    context 'with super_args parameter' do
+      let(:sub_constructor) do
+        described_class.new(:c, :a, :b, :d, super_args: -> { [c, a] })
+      end
+
+      it { expect(sub_object.a).to eq(2) }
+      it { expect(sub_object.b).to eq(3) }
+      it { expect(sub_object.c).to eq(1) }
+      it { expect(sub_object.d).to eq(4) }
+      it { expect(sub_object.super_a).to eq(1) }
+      it { expect(sub_object.super_b).to eq(2) }
+    end
+
+    context 'without super_args parameter' do
+      let(:sub_constructor) do
+        described_class.new(:c, :a, :b, :d)
+      end
+
+      it { expect(sub_object.a).to eq(2) }
+      it { expect(sub_object.b).to eq(3) }
+      it { expect(sub_object.c).to eq(1) }
+      it { expect(sub_object.d).to eq(4) }
+      it { expect(sub_object.super_a).to eq(2) }
+      it { expect(sub_object.super_b).to eq(3) }
+    end
+
+    context 'with undefined super arguments' do
+      let(:sub_constructor) do
+        described_class.new(:x, :y, :w, :a)
+      end
+
+      it do
+        expect { sub_object }.to raise_error(::ArgumentError)
       end
     end
   end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/struct_spec.rb

@@ -3,7 +3,8 @@
 require 'eac_ruby_utils/struct'
 
 RSpec.describe ::EacRubyUtils::Struct do
-  let(:instance) { described_class.new(a: 1, b: '') }
+  let(:instance) { described_class.new('a' => 1, b: '') }
+  let(:other) { described_class.new('a' => 'm1', c: 'm2') }
 
   describe '#[]' do
     it { expect(instance[:a]).to eq(1) }
@@ -35,6 +36,12 @@ RSpec.describe ::EacRubyUtils::Struct do
     it { expect { instance.fetch('c?') }.to raise_error(::KeyError) }
   end
 
+  describe '#merge' do
+    let(:merged) { instance.merge(other) }
+
+    it { expect(merged.to_h).to eq(a: 'm1', b: '', c: 'm2') }
+  end
+
   describe '#property_method' do
     it { expect(instance.a).to eq(1) }
     it { expect(instance.a?).to eq(true) }
@@ -43,4 +50,8 @@ RSpec.describe ::EacRubyUtils::Struct do
     it { expect { instance.c }.to raise_error(::NoMethodError) }
     it { expect { instance.c? }.to raise_error(::NoMethodError) }
   end
+
+  describe '#to_h' do
+    it { expect(instance.to_h).to eq(a: 1, b: '') }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-12 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -253,6 +253,7 @@ files:
 - vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner.rb
 - vendor/eac_cli/lib/eac_cli/runner/context.rb
+- vendor/eac_cli/lib/eac_cli/runner/exit.rb
 - vendor/eac_cli/lib/eac_cli/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/help.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb
@@ -262,6 +263,7 @@ files:
 - vendor/eac_cli/spec/lib/eac_cli/docopt/runner_extension_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb
+- vendor/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/output_file_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb
 - vendor/eac_cli/spec/rubocop_spec.rb
@@ -273,10 +275,17 @@ files:
 - vendor/eac_docker/lib/eac_docker/executables.rb
 - vendor/eac_docker/lib/eac_docker/images.rb
 - vendor/eac_docker/lib/eac_docker/images/base.rb
+- vendor/eac_docker/lib/eac_docker/images/coded.rb
 - vendor/eac_docker/lib/eac_docker/images/named.rb
+- vendor/eac_docker/lib/eac_docker/images/templatized.rb
+- vendor/eac_docker/lib/eac_docker/registry.rb
 - vendor/eac_docker/lib/eac_docker/rspec.rb
 - vendor/eac_docker/lib/eac_docker/version.rb
 - vendor/eac_docker/spec/lib/eac_docker/executables_spec.rb
+- vendor/eac_docker/spec/lib/eac_docker/images/coded_spec.rb
+- vendor/eac_docker/spec/lib/eac_docker/images/coded_spec_files/image1/Dockerfile
+- vendor/eac_docker/spec/lib/eac_docker/images/templatized_spec.rb
+- vendor/eac_docker/spec/lib/eac_docker/images/templatized_spec_files/stub_docker_image/Dockerfile
 - vendor/eac_docker/spec/rubocop_spec.rb
 - vendor/eac_docker/spec/spec_helper.rb
 - vendor/eac_ruby_utils/Gemfile
@@ -290,6 +299,8 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/boolean.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/by_reference.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/class_setup.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/module_setup.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/base.rb
@@ -316,6 +327,8 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/base_env.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/concat.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/envvars.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/extra_options.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/executable.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/file.rb