avm-tools 0.83.0 → 0.87.0

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/common_constructor/instance_initialize'
+require 'eac_ruby_utils/common_constructor/super_args'
+
+module EacRubyUtils
+  class CommonConstructor
+    class ClassInitialize
+      attr_reader :common_constructor, :klass
+
+      def initialize(common_constructor, klass)
+        @common_constructor = common_constructor
+        @klass = klass
+      end
+
+      def run
+        class_initialize = self
+        klass.send(:define_method, :initialize) do |*args|
+          ::EacRubyUtils::CommonConstructor::InstanceInitialize.new(
+            class_initialize.common_constructor, args, self
+          ).run
+          super(*::EacRubyUtils::CommonConstructor::SuperArgs.new(
+            class_initialize, args, self
+          ).result)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class CommonConstructor
+    class InstanceInitialize
+      attr_reader :common_constructor, :args, :object
+
+      def initialize(common_constructor, args, object)
+        @common_constructor = common_constructor
+        @args = args
+        @object = object
+      end
+
+      def run
+        validate_args_count
+        object.run_callbacks :initialize do
+          object_attributes_set
+          object_after_callback
+        end
+      end
+
+      private
+
+      def arg_value(arg_name)
+        arg_index = common_constructor.args.index(arg_name)
+        if arg_index < args.count
+          args[arg_index]
+        else
+          common_constructor.default_values[arg_index - common_constructor.args_count_min]
+        end
+      end
+
+      def object_after_callback
+        return unless common_constructor.after_set_block
+
+        object.instance_eval(&common_constructor.after_set_block)
+      end
+
+      def object_attributes_set
+        common_constructor.args.each do |arg_name|
+          object.send("#{arg_name}=", arg_value(arg_name))
+        end
+      end
+
+      def validate_args_count
+        return if common_constructor.args_count.include?(args.count)
+
+        raise ArgumentError, "#{object.class}.initialize: wrong number of arguments" \
+          " (given #{args.count}, expected #{common_constructor.args_count})"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/delegation'
+
+module EacRubyUtils
+  class CommonConstructor
+    class SuperArgs
+      attr_reader :class_initialize, :args, :object
+      delegate :common_constructor, to: :class_initialize
+
+      def initialize(class_initialize, args, object)
+        @class_initialize = class_initialize
+        @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
+        class_initialize.klass.superclass&.instance_method(:initialize)
+      end
+    end
+  end
+end

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

@@ -38,7 +38,7 @@ module EacRubyUtils
         def run_with_subcommand
           if subcommand_name
             check_valid_subcommand
-            subcommand.run
+            subcommand_run
           else
             run_without_subcommand
           end
@@ -52,6 +52,15 @@ module EacRubyUtils
           )
         end
 
+        def subcommand_run
+          if !subcommand.is_a?(::EacRubyUtils::Console::DocoptRunner) &&
+             subcommand.respond_to?(:run_run)
+            subcommand.run_run
+          else
+            subcommand.run
+          end
+        end
+
         def target_doc
           super.gsub(SUBCOMMANDS_MACRO,
                      "#{target_doc_subcommand_arg} [#{SUBCOMMAND_ARGS_ARG}...]") +

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/traverser.rb

@@ -57,8 +57,6 @@ module EacRubyUtils
           user_check_file(path)
         elsif path.directory?
           inner_check_directory(path, level)
-        else
-          raise "Unknown filesystem object: #{path}"
         end
       end
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/inflector.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require 'active_support/inflector'
+
 module EacRubyUtils
   class Inflector
     class << self
       VARIABLE_NAME_PATTERN = /[_a-z][_a-z0-9]*/i.freeze
 
       def variableize(string)
-        r = string.gsub(/[^_a-z0-9]/i, '_').gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
+        r = ::ActiveSupport::Inflector.transliterate(string).gsub(/[^_a-z0-9]/i, '_')
+                                      .gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
         m = VARIABLE_NAME_PATTERN.match(r)
         return r if m
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/template.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/templates/searcher'
+
+class Module
+  def template
+    @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'eac_ruby_utils/templates/searcher'
+require 'eac_ruby_utils/patches/module/template'
 
 class Object
-  class << self
-    def template
-      @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
-    end
-  end
-
   def template
     self.class.template
   end

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

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

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/yaml.rb

@@ -14,10 +14,18 @@ module EacRubyUtils
         ::YAML.dump(sanitize(object))
       end
 
+      def dump_file(path, object)
+        ::File.write(path.to_s, dump(object))
+      end
+
       def load(string)
         ::YAML.safe_load(string, permitted_classes)
       end
 
+      def load_file(path)
+        load(::File.read(path.to_s))
+      end
+
       def permitted_classes
         DEFAULT_PERMITTED_CLASSES
       end

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

@@ -19,7 +19,7 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
 
       module InstanceMethods # rubocop:disable RSpec/LeakyConstantDeclaration
         def my_instance_method
-          'instance'
+          'from_module'
         end
       end
     end
@@ -31,8 +31,8 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
         attr_accessor :valor
       end
 
-      def method1
-        'from_stub_module'
+      def my_instance_method
+        'from_class'
       end
     end
   end
@@ -48,7 +48,17 @@ RSpec.describe ::EacRubyUtils::CommonConcern do
       stub_class.include stub_module
     end
 
-    it { expect(stub_class_instance.my_instance_method).to eq('instance') }
+    it { expect(stub_class_instance.my_instance_method).to eq('from_class') }
+    it { expect(stub_class_instance.class.my_class_method).to eq('class') }
+    it { expect(stub_class_instance.class.valor).to eq('changed') }
+  end
+
+  context 'when prepended' do
+    before do
+      stub_class.prepend stub_module
+    end
+
+    it { expect(stub_class_instance.my_instance_method).to eq('from_module') }
     it { expect(stub_class_instance.class.my_class_method).to eq('class') }
     it { expect(stub_class_instance.class.valor).to eq('changed') }
   end

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

@@ -92,4 +92,34 @@ RSpec.describe ::EacRubyUtils::CommonConstructor do
       end
     end
   end
+
+  context 'with class hierarchy mixed with and without common_constructor' do
+    let(:klass_0) do
+      described_class.new(:a_param).setup_class(::Class.new)
+    end
+
+    let(:klass_1) do
+      ::Class.new(klass_0) do
+        def initialize(a_param)
+          super(a_param)
+        end
+      end
+    end
+
+    let(:klass_2) do
+      ::Class.new(klass_1)
+    end
+
+    let(:klass_3) do
+      described_class.new(:a_param).setup_class(::Class.new(klass_2))
+    end
+
+    4.times.each do |i|
+      context "wit #{i}-th class" do
+        let(:class_instance) { send("klass_#{i}").new(:a) }
+
+        it { expect(class_instance.a_param).to eq(:a) }
+      end
+    end
+  end
 end

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

@@ -5,7 +5,8 @@ require 'eac_ruby_utils/inflector'
 RSpec.describe ::EacRubyUtils::Inflector do
   describe '#variableize' do
     {
-      '_A_variableName' => 'a_variablename'
+      '_A_variableName' => 'a_variablename',
+      'àéíöũ' => 'aeiou'
     }.each do |source, expected|
       context "when source is \"#{source}\"" do
         it { expect(described_class.variableize(source)).to eq(expected) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.83.0
+  version: 0.87.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -347,8 +347,11 @@ files:
 - lib/avm/eac_writings_base0/project_build/chapters_content.rb
 - lib/avm/eac_writings_base0/project_build/copy_files.rb
 - lib/avm/eac_writings_base1.rb
+- lib/avm/eac_writings_base1/apache_host.rb
 - lib/avm/eac_writings_base1/build.rb
 - lib/avm/eac_writings_base1/build/file.rb
+- lib/avm/eac_writings_base1/deploy.rb
+- lib/avm/eac_writings_base1/instance.rb
 - lib/avm/eac_writings_base1/project.rb
 - lib/avm/executables.rb
 - lib/avm/files.rb
@@ -457,6 +460,8 @@ files:
 - lib/avm/projects/stereotypes/git.rb
 - lib/avm/projects/stereotypes/git/local_project_mixin.rb
 - lib/avm/projects/stereotypes/git/publish.rb
+- lib/avm/projects/stereotypes/git/update.rb
+- lib/avm/projects/stereotypes/git/update/subrepo.rb
 - lib/avm/projects/stereotypes/git/warp.rb
 - lib/avm/projects/stereotypes/git_subrepo.rb
 - lib/avm/projects/stereotypes/git_subrepo/publish.rb
@@ -499,6 +504,7 @@ files:
 - lib/avm/tools/runner/eac_redmine_base0/project_rename.rb
 - lib/avm/tools/runner/eac_wordpress_base0.rb
 - lib/avm/tools/runner/eac_writings_base0.rb
+- lib/avm/tools/runner/eac_writings_base1.rb
 - lib/avm/tools/runner/files.rb
 - lib/avm/tools/runner/files/format.rb
 - lib/avm/tools/runner/files/rotate.rb
@@ -616,13 +622,17 @@ files:
 - vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb
 - vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb
 - vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb
+- vendor/eac_cli/lib/eac_cli/docopt/runner_context_replacement.rb
 - vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb
 - vendor/eac_cli/lib/eac_cli/parser.rb
 - vendor/eac_cli/lib/eac_cli/parser/alternative.rb
 - vendor/eac_cli/lib/eac_cli/parser/alternative/argv.rb
 - vendor/eac_cli/lib/eac_cli/parser/alternative/double_dash.rb
+- vendor/eac_cli/lib/eac_cli/parser/alternative/long_options.rb
+- vendor/eac_cli/lib/eac_cli/parser/alternative/option_argument.rb
 - vendor/eac_cli/lib/eac_cli/parser/alternative/options.rb
 - vendor/eac_cli/lib/eac_cli/parser/alternative/positionals.rb
+- vendor/eac_cli/lib/eac_cli/parser/alternative/short_options.rb
 - vendor/eac_cli/lib/eac_cli/parser/collector.rb
 - vendor/eac_cli/lib/eac_cli/parser/error.rb
 - vendor/eac_cli/lib/eac_cli/patches.rb
@@ -916,6 +926,9 @@ files:
 - 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/common_constructor/class_initialize.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/instance_initialize.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/super_args.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/base.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/file.rb
@@ -1005,6 +1018,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/patch.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/require_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/simple_cache.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/template.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/debug.rb