eac_tools 0.23.0 → 0.25.0

data/sub/avm-tools/lib/avm/tools/runner/app_src/info.rb

@@ -7,6 +7,13 @@ module Avm
     class Runner
       class AppSrc
         class Info
+          SOURCE_PROPERTIES = {
+            path: 'Path',
+            application: 'Application',
+            class: 'Stereotype',
+            scm: 'SCM'
+          }.freeze
+
           runner_with :help do
             desc 'Show information about local project instance.'
             bool_opt '-p', '--parent', 'Show the parent source.'
@@ -14,7 +21,6 @@ module Avm
           end
 
           def run
-            show_instance
             show_source
             show_parent
             show_test_commands
@@ -22,11 +28,6 @@ module Avm
 
           private
 
-          def show_instance
-            infov 'Path', instance.path
-            infov 'Launcher stereotypes', instance.stereotypes.map(&:label).join(', ')
-          end
-
           def show_parent
             return unless parsed.parent?
 
@@ -34,8 +35,9 @@ module Avm
           end
 
           def show_source
-            infov 'Stereotype', runner_context.call(:subject).class
-            infov 'SCM', runner_context.call(:subject).scm
+            SOURCE_PROPERTIES.each do |property, label|
+              infov label, runner_context.call(:subject).send(property)
+            end
           end
 
           def show_test_commands

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.132.1'
+    VERSION = '0.133.0'
   end
 end

data/sub/eac_config/eac_config.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'addressable'
-  s.add_dependency 'eac_ruby_utils', '~> 0.97'
+  s.add_dependency 'addressable', '~> 2.8'
+  s.add_dependency 'eac_ruby_utils', '~> 0.100'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_config/lib/eac_config/entry_path.rb

@@ -51,7 +51,12 @@ module EacConfig
     end
 
     def to_s
-      "#{self.class}[#{parts.join(PART_SEPARATOR)}]"
+      "#{self.class}[#{to_string}]"
+    end
+
+    # @return [String]
+    def to_string
+      parts.join(PART_SEPARATOR)
     end
   end
 end

data/sub/eac_config/lib/eac_config/version.rb

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

data/sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_accessors.rb

@@ -0,0 +1,36 @@
+# 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 ClassAccessors
+      attr_reader :common_constructor, :klass
+
+      def initialize(common_constructor, klass)
+        @common_constructor = common_constructor
+        @klass = klass
+      end
+
+      def args
+        common_constructor.all_args
+      end
+
+      def perform
+        setup_class_attr_readers
+        setup_class_attr_writers
+      end
+
+      def setup_class_attr_readers
+        klass.send(:attr_reader, *args)
+        klass.send(:public, *args) if args.any?
+      end
+
+      def setup_class_attr_writers
+        klass.send(:attr_writer, *args)
+        klass.send(:private, *args.map { |a| "#{a}=" }) if args.any?
+      end
+    end
+  end
+end

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

@@ -13,17 +13,27 @@ module EacRubyUtils
         @klass = klass
       end
 
-      def run
+      def define_initialize_callbacks
+        klass.include(::ActiveSupport::Callbacks)
+        klass.define_callbacks :initialize
+      end
+
+      def define_initialize_method
         class_initialize = self
-        klass.send(:define_method, :initialize) do |*args|
+        klass.send(:define_method, :initialize) do |*args, &block|
           ::EacRubyUtils::CommonConstructor::InstanceInitialize.new(
-            class_initialize.common_constructor, args, self
-          ).run
+            class_initialize.common_constructor, args, self, block
+          ).perform
           super(*::EacRubyUtils::CommonConstructor::SuperArgs.new(
             class_initialize, args, self
           ).result)
         end
       end
+
+      def perform
+        define_initialize_callbacks
+        define_initialize_method
+      end
     end
   end
 end

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

@@ -3,18 +3,20 @@
 module EacRubyUtils
   class CommonConstructor
     class InstanceInitialize
-      attr_reader :common_constructor, :args, :object
+      attr_reader :common_constructor, :args, :object, :block
 
-      def initialize(common_constructor, args, object)
+      def initialize(common_constructor, args, object, block)
         @common_constructor = common_constructor
         @args = args
         @object = object
+        @block = block
       end
 
-      def run
+      def perform
         validate_args_count
         object.run_callbacks :initialize do
           object_attributes_set
+          object_block_set
           object_after_callback
         end
       end
@@ -36,12 +38,21 @@ module EacRubyUtils
         object.instance_eval(&common_constructor.after_set_block)
       end
 
+      def object_attribute_set(attr_name, attr_value)
+        object.send("#{attr_name}=", attr_value)
+      end
+
       def object_attributes_set
         common_constructor.args.each do |arg_name|
-          object.send("#{arg_name}=", arg_value(arg_name))
+          object_attribute_set(arg_name, arg_value(arg_name))
         end
       end
 
+      def object_block_set
+        block_arg = common_constructor.block_arg
+        object_attribute_set(block_arg, block) if block_arg
+      end
+
       def validate_args_count
         return if common_constructor.args_count.include?(args.count)
 

data/sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb

@@ -2,12 +2,13 @@
 
 require 'active_support/callbacks'
 require 'eac_ruby_utils/arguments_consumer'
+require 'eac_ruby_utils/common_constructor/class_accessors'
 require 'eac_ruby_utils/common_constructor/class_initialize'
 require 'ostruct'
 
 module EacRubyUtils
   class CommonConstructor
-    attr_reader :args, :options, :after_set_block
+    attr_reader :all_args, :options, :after_set_block
 
     class << self
       def parse_args_options(args)
@@ -37,11 +38,15 @@ module EacRubyUtils
 
     def initialize(*args, &after_set_block)
       args_processed = self.class.parse_args_options(args)
-      @args = args_processed.args
+      @all_args = args_processed.args
       @options = args_processed.options
       @after_set_block = after_set_block
     end
 
+    def args
+      block_arg? ? all_args[0..-2] : all_args
+    end
+
     def args_count
       (args_count_min..args_count_max)
     end
@@ -54,32 +59,32 @@ module EacRubyUtils
       args.count
     end
 
+    def block_arg
+      block_arg? ? all_args.last : nil
+    end
+
+    def block_arg?
+      options[:block_arg] || false
+    end
+
     def default_values
       options[:default] || []
     end
 
     def setup_class(klass)
-      setup_class_attr_readers(klass)
-      setup_class_attr_writers(klass)
+      setup_class_accessors(klass)
+
       setup_class_initialize(klass)
 
       klass
     end
 
-    def setup_class_attr_readers(klass)
-      klass.send(:attr_reader, *args)
-      klass.send(:public, *args) if args.any?
-    end
-
-    def setup_class_attr_writers(klass)
-      klass.send(:attr_writer, *args)
-      klass.send(:private, *args.map { |a| "#{a}=" }) if args.any?
+    def setup_class_accessors(klass)
+      ::EacRubyUtils::CommonConstructor::ClassAccessors.new(self, klass).perform
     end
 
     def setup_class_initialize(klass)
-      klass.include(::ActiveSupport::Callbacks)
-      klass.define_callbacks :initialize
-      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).run
+      ::EacRubyUtils::CommonConstructor::ClassInitialize.new(self, klass).perform
     end
 
     def super_args

data/sub/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb

@@ -29,8 +29,16 @@ module EacRubyUtils
         @values.values.map(&:value)
       end
 
+      def values_with_blank
+        [blank_value.value] + values
+      end
+
       def options
-        @values.values.map { |v| [v.label, v.value] }
+        @values.values.map(&:to_option)
+      end
+
+      def options_with_blank
+        [blank_value.to_option] + options
       end
 
       def method_missing(name, *args, &block)

data/sub/eac_ruby_utils/lib/eac_ruby_utils/listable/value.rb

@@ -30,6 +30,11 @@ module EacRubyUtils
         translate('description')
       end
 
+      # @return [Array] A two-item array in format `[label, value]`.
+      def to_option
+        [label, value]
+      end
+
       def translation_required?
         @translation_required
       end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/object/debug.rb

@@ -1,18 +1,33 @@
 # frozen_string_literal: true
 
 class Object
-  def pretty_debug
+  def pretty_debug(options = {})
+    print_debug_title(options)
+
     STDERR.write(pretty_inspect)
 
     self
   end
 
-  def print_debug
+  def print_debug(options = {})
+    print_debug_title(options)
     STDERR.write(to_debug + "\n")
 
     self
   end
 
+  def print_debug_title(title)
+    if title.is_a?(::Hash)
+      return unless title[:title]
+
+      title = title[:title]
+    end
+    char = '='
+    STDERR.write(char * (4 + title.length) + "\n")
+    STDERR.write("#{char} #{title} #{char}\n")
+    STDERR.write(char * (4 + title.length) + "\n")
+  end
+
   def to_debug
     "|#{::Object.instance_method(:to_s).bind(self).call}|#{self}|"
   end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

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

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

@@ -93,6 +93,32 @@ RSpec.describe ::EacRubyUtils::CommonConstructor do
     end
   end
 
+  context 'with block argument' do
+    let(:instance) do
+      described_class.new(:first, :second, :last, block_arg: true, default: ['second'])
+    end
+
+    let(:block) do
+      ::Proc.new { first + second }
+    end
+
+    let(:a_class) do
+      ::Class.new do
+        def result
+          last.run
+        end
+      end
+    end
+
+    let(:a_class_instance) { a_class.new('first') { 'last' } }
+
+    it { expect(a_class_instance.last).to be_a(::Proc) }
+    it { expect(a_class_instance.last.call).to eq('last') }
+
+    it { expect(a_class_instance.first).to eq('first') }
+    it { expect(a_class_instance.second).to eq('second') }
+  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)

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb

@@ -179,88 +179,38 @@ RSpec.describe ::EacRubyUtils::Listable do
   describe 'instance label and descriptions' do
     let(:instance) { stub_class.new }
 
-    context 'when inteiro value is A' do
-      before { instance.inteiro = stub_class::INTEIRO_A }
-
-      it { expect(instance.inteiro_label).to eq('Inteiro A') }
-      it { expect(instance.inteiro_description).to eq('Inteiro A Descr.') }
-    end
-
-    context 'when inteiro value is B' do
-      before { instance.inteiro = stub_class::INTEIRO_B }
-
-      it { expect(instance.inteiro_label).to eq('Inteiro BB') }
-      it { expect(instance.inteiro_description).to eq('Inteiro BB Descr.') }
-    end
-
-    context 'when inteiro value is C' do
-      before { instance.inteiro = stub_class::INTEIRO_C }
-
-      it { expect(instance.inteiro_label).to eq('Inteiro CCC') }
-      it { expect(instance.inteiro_description).to eq('Inteiro CCC Descr.') }
-    end
-
-    context 'when inteiro value is blank' do
-      before { instance.inteiro = nil }
-
-      it { expect(instance.inteiro_label).to eq('Inteiro em branco') }
-      it { expect(instance.inteiro_description).to eq('Inteiro em branco Descr.') }
-    end
-
-    context 'when code value is A' do
-      before { instance.code = stub_class::CODE_A }
-
-      it { expect(instance.code_label).to eq('Código A') }
-      it { expect(instance.code_description).to eq('Código A Descr.') }
-    end
-
-    context 'when code value is B' do
-      before { instance.code = stub_class::CODE_B }
-
-      it { expect(instance.code_label).to eq('Código B') }
-      it { expect(instance.code_description).to eq('Código B Descr.') }
-    end
-
-    context 'when code value is blank' do
-      before { instance.code = nil }
-
-      it { expect(instance.code_label).to eq('') }
-      it { expect(instance.code_description).to eq('') }
-    end
-
-    context 'when cadeia value is A' do
-      before { instance.cadeia = stub_class::CADEIA_A }
-
-      it { expect(instance.cadeia_label).to eq('Cadeia AAA') }
-      it { expect(instance.cadeia_description).to eq('Cadeia AAA Descr.') }
-    end
-
-    context 'when cadeia value is B' do
-      before { instance.cadeia = stub_class::CADEIA_B }
-
-      it { expect(instance.cadeia_label).to eq('Cadeia BB') }
-      it { expect(instance.cadeia_description).to eq('Cadeia BB Descr.') }
-    end
-
-    context 'when cadeia value is C' do
-      before { instance.cadeia = stub_class::CADEIA_C }
-
-      it { expect(instance.cadeia_label).to eq('Cadeia C') }
-      it { expect(instance.cadeia_description).to eq('Cadeia C Descr.') }
-    end
-
-    context 'when type value is A' do
-      before { instance.type = stub_class::TYPE_A }
-
-      it { expect(instance.type_label).to eq('Tipo A') }
-      it { expect(instance.type_description).to eq('Tipo A Descr.') }
-    end
-
-    context 'when type value is B' do
-      before { instance.type = stub_class::TYPE_B }
-
-      it { expect(instance.type_label).to eq('Tipo B') }
-      it { expect(instance.type_description).to eq('Tipo B Descr.') }
+    {
+      inteiro: {
+        INTEIRO_A: ['Inteiro A', 'Inteiro A Descr.'],
+        INTEIRO_B: ['Inteiro BB', 'Inteiro BB Descr.'],
+        INTEIRO_C: ['Inteiro CCC', 'Inteiro CCC Descr.'],
+        nil => ['Inteiro em branco', 'Inteiro em branco Descr.']
+      },
+      code: {
+        CODE_A: ['Código A', 'Código A Descr.'],
+        CODE_B: ['Código B', 'Código B Descr.'],
+        nil => ['', '']
+      },
+      cadeia: {
+        CADEIA_A: ['Cadeia AAA', 'Cadeia AAA Descr.'],
+        CADEIA_B: ['Cadeia BB', 'Cadeia BB Descr.'],
+        CADEIA_C: ['Cadeia C', 'Cadeia C Descr.']
+      },
+      type: {
+        TYPE_A: ['Tipo A', 'Tipo A Descr.'],
+        TYPE_B: ['Tipo B', 'Tipo B Descr.']
+      }
+    }.each do |attr, attr_values|
+      attr_values.each do |attr_value_const, expected_values|
+        context "when #{attr} value is #{attr_value_const}" do
+          let(:attr_value) { attr_value_const ? stub_class.const_get(attr_value_const) : nil }
+
+          before { instance.send("#{attr}=", attr_value) }
+
+          it { expect(instance.send("#{attr}_label")).to eq(expected_values[0]) }
+          it { expect(instance.send("#{attr}_description")).to eq(expected_values[1]) }
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.39'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.39'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +135,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -148,6 +145,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -162,6 +165,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -188,34 +194,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.132'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.132.1
+        version: '0.133'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.132'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.132.1
+        version: '0.133'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.98'
+        version: '0.101'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.98'
+        version: '0.101'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -497,12 +497,16 @@ files:
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec_files/dir4/false_command.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/Gemfile
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/Gemfile.lock
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/_gitignore
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/dashed-mygem.gemspec
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/lib/dashed/mygem.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/lib/dashed/mygem/version.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/spec/rubocop_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/spec/spec_helper.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/Gemfile
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/Gemfile.lock
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/_gitignore
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/lib/mygem.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/lib/mygem/version.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/mygem.gemspec
@@ -774,6 +778,8 @@ files:
 - sub/avm/lib/avm/entries/auto_values/entry.rb
 - sub/avm/lib/avm/entries/auto_values/uri_entry.rb
 - sub/avm/lib/avm/entries/base.rb
+- sub/avm/lib/avm/entries/base/inherited_entry_value.rb
+- sub/avm/lib/avm/entries/base/uri_component_entry_value.rb
 - sub/avm/lib/avm/entries/entry.rb
 - sub/avm/lib/avm/entries/uri_builder.rb
 - sub/avm/lib/avm/executables.rb
@@ -834,6 +840,7 @@ files:
 - sub/avm/lib/avm/source_generators/runner.rb
 - sub/avm/lib/avm/sources.rb
 - sub/avm/lib/avm/sources/base.rb
+- sub/avm/lib/avm/sources/base/application.rb
 - sub/avm/lib/avm/sources/base/configuration.rb
 - sub/avm/lib/avm/sources/base/instance.rb
 - sub/avm/lib/avm/sources/base/locale.rb
@@ -1053,6 +1060,7 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_concern/class_setup.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_concern/module_setup.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_accessors.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/class_initialize.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/instance_initialize.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor/super_args.rb