avm-tools 0.77.0 → 0.82.0

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/patches/module/abstract_methods.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/abstract_methods'
+
+class Module
+  def enable_abstract_methods(*methods)
+    include ::EacRubyUtils::AbstractMethods
+    abstract_methods(*methods)
+  end
+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.52.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: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.77.0
+  version: 0.82.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -300,6 +300,7 @@ files:
 - lib/avm/eac_rails_base1/runner.rb
 - lib/avm/eac_rails_base1/runner/bundle.rb
 - lib/avm/eac_rails_base1/runner/code_runner.rb
+- lib/avm/eac_rails_base1/runner/rails_server.rb
 - lib/avm/eac_rails_base1/runner_with/bundle.rb
 - lib/avm/eac_redmine_base0.rb
 - lib/avm/eac_redmine_base0/core_update.rb
@@ -434,6 +435,7 @@ files:
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
 - lib/avm/patches.rb
+- lib/avm/patches/class/i18n.rb
 - lib/avm/patches/eac_ruby_gems_utils/gem.rb
 - lib/avm/patches/i18n.rb
 - lib/avm/patches/object/i18n.rb
@@ -485,8 +487,6 @@ files:
 - lib/avm/tools/runner.rb
 - lib/avm/tools/runner/eac_rails_base0.rb
 - lib/avm/tools/runner/eac_rails_base0/apache_path.rb
-- lib/avm/tools/runner/eac_rails_base0/rails_server.rb
-- lib/avm/tools/runner/eac_rails_base0/runner.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
 - lib/avm/tools/runner/eac_redmine_base0/core_update.rb
 - lib/avm/tools/runner/eac_redmine_base0/docker.rb
@@ -507,6 +507,8 @@ files:
 - lib/avm/tools/runner/git/revisions_test.rb
 - lib/avm/tools/runner/git/subrepo.rb
 - lib/avm/tools/runner/git/subrepo/check.rb
+- lib/avm/tools/runner/git/subrepo/clone.rb
+- lib/avm/tools/runner/git/subrepo/fix.rb
 - lib/avm/tools/runner/instance.rb
 - lib/avm/tools/runner/instance/info.rb
 - lib/avm/tools/runner/launcher.rb
@@ -620,6 +622,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
@@ -629,6 +632,8 @@ 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
 - vendor/eac_cli/spec/spec_helper.rb
@@ -900,6 +905,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
@@ -926,6 +933,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
@@ -980,6 +989,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/options_consumer.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/sym_keys_hash.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/abstract_methods.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/common_concern.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/console_speaker.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/immutable.rb