eac_tools 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37f8e08239e5bac225ad919b4805592413d710cf364e354098aedcd2a9ab758
-  data.tar.gz: 7f57813fb27c9757cc6c03b016d69a9e777ccec79a875d4b946ee7136642d04b
+  metadata.gz: 6548064142eb8ef0905dfc0c1705229f1554f3adb631fa0ec171888c32e8f0fa
+  data.tar.gz: 0c76aefc07d8a02763ffbcdd551a07b0f0a019f5b1fa626ce727ca4ce5eec0da
 SHA512:
-  metadata.gz: a2027d28a82968c9d2e71b7699be1829e16b7752d7a727d018822e0dfc9f7b4bbf4bd24f491070071b30acd2c7bd61717cc0dbe102fec922ead1af734ac42f83
-  data.tar.gz: e5343d8c9b7b5b20d46ccf1393b2254babe9d2320739902a910fc86b61c9aa50555f9732485f01d79d52825e31d46a6fed87205f5131157b80af548eb48afc97
+  metadata.gz: 18a95cc1eb6a32ec6f0273fb07be9c9217cba540033166b95007ebcfa73f53e29619fd4d5bfde46d57c7085c8af8834be5f7a2ad945fb06350d4621b9f7e8227
+  data.tar.gz: cb554e78ef18fe33ff56de3cf1f9e75f0da77b07a7a37e5dabfb569cfc20123ba140913da82f271ae6245499982c3f1a62291fdde931cf5b9ece6e737c6da98e

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.23.0)
-      avm (~> 0.35, >= 0.35.1)
+    eac_tools (0.24.0)
+      avm (~> 0.37)
       avm-eac_asciidoctor_base0 (~> 0.5)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.1, >= 0.1.2)
@@ -10,10 +10,10 @@ PATH
       avm-eac_rails_base1 (~> 0.5)
       avm-eac_redmine_base0 (~> 0.12)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.19)
+      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
       avm-eac_webapp_base0 (~> 0.4)
       avm-eac_wordpress_base0 (~> 0.1, >= 0.1.2)
-      avm-tools (~> 0.132, >= 0.132.1)
+      avm-tools (~> 0.133)
       eac_ruby_utils (~> 0.98)
 
 PATH
@@ -80,7 +80,7 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.19.0)
+    avm-eac_ruby_base1 (0.19.1)
       avm (~> 0.35, >= 0.35.1)
       avm-eac_generic_base0 (~> 0.5)
       eac_ruby_utils (~> 0.98)
@@ -106,16 +106,16 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.132.1)
+    avm-tools (0.133.0)
       aranha-parsers (~> 0.14, >= 0.14.1)
-      avm (~> 0.35, >= 0.35.1)
-      avm-eac_ruby_base1 (~> 0.19)
+      avm (~> 0.37)
+      avm-eac_ruby_base1 (~> 0.19, >= 0.19.1)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.3, >= 0.3.2)
       avm-git (~> 0.4)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
-      eac_git (~> 0.12, >= 0.12.1)
+      eac_git (~> 0.12, >= 0.12.2)
       eac_ruby_base0 (~> 0.16, >= 0.16.6)
       eac_templates (~> 0.3, >= 0.3.1)
       git (~> 1.11)
@@ -124,7 +124,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.36.0)
+    avm (0.37.0)
       eac_cli (~> 0.27, >= 0.27.8)
       eac_config (~> 0.10)
       eac_docker (~> 0.4, >= 0.4.2)
@@ -177,7 +177,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.98.0)
+    eac_ruby_utils (0.100.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.6)
       bundler
@@ -229,7 +229,7 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_git (0.12.1)
+    eac_git (0.12.2)
       eac_ruby_utils (~> 0.83)
       parseconfig (~> 1.0, >= 1.0.8)
     eac_rest (0.6.1)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.23.0'
+  VERSION = '0.24.0'
 end

data/sub/avm/lib/avm/sources/base/application.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/applications/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Application
+        APPLICATION_NAME_KEY = 'application'
+
+        # @return [Avm::Applications::Base]
+        def application
+          @application ||= ::Avm::Applications::Base.new(application_id)
+        end
+
+        # @return [String]
+        def application_id
+          application_id_by_configuration || application_id_by_directory
+        end
+
+        # @return [String, nil]
+        def application_id_by_configuration
+          configuration.entry(APPLICATION_NAME_KEY).value
+        end
+
+        # @return [String]
+        def application_id_by_directory
+          path.basename.to_path
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base/configuration.rb

@@ -24,6 +24,8 @@ module Avm
 
         # @return [EacRubyUtils::Envs::Command, nil]
         def configuration_value_to_env_command(value)
+          return value if value.is_a?(::EacRubyUtils::Envs::Command)
+
           configuration_value_to_shell_words(value).if_present { |v| env.command(v).chdir(path) }
         end
 

data/sub/avm/lib/avm/sources/base/testing.rb

@@ -57,7 +57,7 @@ module Avm
 
         def configured_enumerable_value_as_test_commands(value)
           configured_hash_value_as_test_commands(
-            value.each_with_index.map { |v| ["test_#{v[1]}", v[0]] }.to_h
+            value.each_with_index.map { |v, i| ["test_#{i}", v] }.to_h
           )
         end
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.36.0'
+  VERSION = '0.37.0'
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.19.0'
+    VERSION = '0.19.1'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec.rb

@@ -33,10 +33,17 @@ RSpec.describe ::Avm::EacRubyBase1::SourceGenerators::Base do
 
   def directory_to_h(dir)
     dir.children.map do |child|
-      [child.basename.to_path, fs_object_to_h(child)]
+      [fs_object_basename(child), fs_object_to_h(child)]
     end.to_h
   end
 
+  # @return [String]
+  def fs_object_basename(obj)
+    r = obj.basename.to_path
+    r = '.gitignore' if r == '_gitignore'
+    r
+  end
+
   def fs_object_to_h(obj)
     if obj.file?
       file_to_h(obj)

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/Gemfile.lock

@@ -0,0 +1 @@
+Is expected that this content be replaced by "TRUNCATED\n".

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/_gitignore

@@ -0,0 +1,2 @@
+/Gemfile.local
+/Gemfile.lock

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/Gemfile.lock

@@ -0,0 +1 @@
+Is expected that this content be replaced by "TRUNCATED\n".

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/_gitignore

@@ -0,0 +1,2 @@
+/Gemfile.local
+/Gemfile.lock

data/sub/avm-tools/avm-tools.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
-  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19'
+  s.add_dependency 'avm', '~> 0.37'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19', '>= 0.19.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'avm-git', '~> 0.4'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.1'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
   s.add_dependency 'eac_ruby_base0', '~> 0.16', '>= 0.16.6'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'git', '~> 1.11'

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_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.100.0'
 end

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.24.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-14 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.37'
   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.37'
 - !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
@@ -188,20 +188,14 @@ 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
@@ -497,12 +491,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
@@ -834,6 +832,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