eac_tools 0.19.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f682e3e2b625d82f32da7855fb153e206693a1c0d4c934e0bb9b16216b2f7998
-  data.tar.gz: 7cfa294cbdec42a2f1ad21199d2a744ccff5afc7e0c85714dd6685ee146781b4
+  metadata.gz: 04cbda8d8b53185b46e806e22d26098771f627a4574eb028e9836905e700a27d
+  data.tar.gz: 7862b02bf94a320aee41d7ef63052b2049484a5f1540392268b41402b4eb6ba4
 SHA512:
-  metadata.gz: 1743063c5a1e76873664826ccfdf0fdb4c78ff668098a4ee1c8da4a8312f43b9e88694f37e0011d394045065572165376a486a9a4cdeef0538fae441f38e7df8
-  data.tar.gz: 592727978f8b7902f25bc4b03252871dd80ef62611feb5fd0377ae822d6b379ea0c0ae2d050920a455b38ab40625fd67805f23d95209e674f060670e48b7c4fd
+  metadata.gz: d51e79b98e8a886236b82b1cafbbe7e3f817cf4dcc18bce329f19d4d5a176a2ae10c78ed5ca871d6de8e79b31244687bccfd0a4fdca71bf88e9e806aa6faab28
+  data.tar.gz: 42d8f5266e63f7dac0bf2f952bea10d9ad342fd223c1f41ea7984aeb3f37bce37dc5389bd00da9411607badf39bfed74f24b3fac04dd4bd6a3b3b4a2b55c4736

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.19.0)
-      avm (~> 0.35)
+    eac_tools (0.22.0)
+      avm (~> 0.35, >= 0.35.1)
       avm-eac_asciidoctor_base0 (~> 0.4)
       avm-eac_generic_base0 (~> 0.5)
-      avm-eac_latex_base0 (~> 0.1)
+      avm-eac_latex_base0 (~> 0.1, >= 0.1.1)
       avm-eac_rails_base0 (~> 0.6, >= 0.6.1)
       avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
       avm-eac_redmine_base0 (~> 0.11)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.16)
+      avm-eac_ruby_base1 (~> 0.19)
       avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
       avm-eac_wordpress_base0 (~> 0.1, >= 0.1.1)
-      avm-tools (~> 0.131)
+      avm-tools (~> 0.132, >= 0.132.1)
       eac_ruby_utils (~> 0.98)
 
 PATH
@@ -36,7 +36,7 @@ PATH
 PATH
   remote: sub/avm-eac_latex_base0
   specs:
-    avm-eac_latex_base0 (0.1.0)
+    avm-eac_latex_base0 (0.1.1)
       avm (~> 0.34)
       avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
       eac_ruby_utils (~> 0.97)
@@ -80,10 +80,10 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.16.0)
-      avm (~> 0.34)
-      avm-eac_generic_base0 (~> 0.2)
-      eac_ruby_utils (~> 0.95, >= 0.95.1)
+    avm-eac_ruby_base1 (0.19.0)
+      avm (~> 0.35, >= 0.35.1)
+      avm-eac_generic_base0 (~> 0.5)
+      eac_ruby_utils (~> 0.98)
 
 PATH
   remote: sub/avm-eac_webapp_base0
@@ -106,39 +106,39 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.131.0)
-      aranha-parsers (~> 0.4)
-      avm (~> 0.34)
-      avm-eac_ruby_base1 (~> 0.8)
+    avm-tools (0.132.1)
+      aranha-parsers (~> 0.14, >= 0.14.1)
+      avm (~> 0.35, >= 0.35.1)
+      avm-eac_ruby_base1 (~> 0.19)
       avm-eac_ubuntu_base0 (~> 0.3)
-      avm-files (~> 0.1)
-      avm-git (~> 0.3, >= 0.3.1)
-      clipboard (~> 1.3, >= 1.3.3)
-      curb (~> 0.9.10)
+      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_ruby_base0 (~> 0.16, >= 0.16.4)
+      eac_ruby_base0 (~> 0.16, >= 0.16.6)
       eac_templates (~> 0.3, >= 0.3.1)
-      git (~> 1.7)
-      ruby-progressbar (~> 1.10, >= 1.10.1)
+      git (~> 1.11)
+      ruby-progressbar (~> 1.11)
 
 PATH
   remote: sub/avm
   specs:
-    avm (0.35.0)
-      eac_cli (~> 0.27, >= 0.27.6)
+    avm (0.35.1)
+      eac_cli (~> 0.27, >= 0.27.8)
       eac_config (~> 0.10)
-      eac_docker (~> 0.3)
-      eac_git (~> 0.6)
-      eac_ruby_utils (~> 0.97)
-      eac_templates (~> 0.1, >= 0.1.1)
+      eac_docker (~> 0.4, >= 0.4.2)
+      eac_git (~> 0.12, >= 0.12.1)
+      eac_ruby_utils (~> 0.98)
+      eac_templates (~> 0.3, >= 0.3.1)
       filesize (~> 0.2)
-      htmlbeautifier (~> 1.3, >= 1.3.1)
+      htmlbeautifier (~> 1.4, >= 1.4.2)
       minitar (~> 0.9)
 
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.27.7)
+    eac_cli (0.27.8)
       colorize (~> 0.8.1)
       eac_config (~> 0.8)
       eac_ruby_utils (~> 0.95)
@@ -290,7 +290,7 @@ GEM
     os (1.1.4)
     parallel (1.22.1)
     parseconfig (1.1.2)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     parslet (2.0.0)
     public_suffix (4.0.7)

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.6'
+  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.8'
   s.add_dependency 'eac_config', '~> 0.10'
-  s.add_dependency 'eac_docker', '~> 0.3'
-  s.add_dependency 'eac_git', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.97'
-  s.add_dependency 'eac_templates', '~> 0.1', '>= 0.1.1'
+  s.add_dependency 'eac_docker', '~> 0.4', '>= 0.4.2'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.98'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'filesize', '~> 0.2'
-  s.add_dependency 'htmlbeautifier', '~> 1.3', '>= 1.3.1'
+  s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'
   s.add_dependency 'minitar', '~> 0.9'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '~> 0.14.1'

data/sub/avm/lib/avm/instances/runner.rb

@@ -7,10 +7,12 @@ module Avm
   module Instances
     class Runner < ::Avm::Runners::Base
       class << self
-        def instance_class
-          ::Avm.const_get(stereotype_name).const_get('Instance')
+        def application_stereotype
+          ::Avm::Registry.application_stereotypes.detect(stereotype_name)
         end
 
+        delegate :instance_class, to: :application_stereotype
+
         def stereotype_module
           ::Avm.const_get(stereotype_name)
         end

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

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

data/sub/avm/lib/avm/with/application_stereotype.rb

@@ -5,9 +5,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module With
     module ApplicationStereotype
-      common_concern do
-        include ClassMethods
-      end
+      common_concern
 
       module ClassMethods
         # @return [Avm::ApplicationStereotype::Base]

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacLatexBase0
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.34'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
+  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
+  s.add_dependency 'eac_ruby_utils', '~> 0.98'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/version_number'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    class PreferredVersionRequirements
+      enable_simple_cache
+      common_constructor :version do
+        self.version = ::Avm::VersionNumber.new(version)
+      end
+
+      # @return [Avm::VersionNumber]
+      def prefix_version
+        ::Avm::VersionNumber.new(
+          normalized_version.segments[0..normalized_version.segments.count - 2]
+        )
+      end
+
+      # @return [Gem::Requirement]
+      def to_requirement
+        r = ["~> #{prefix_version}"]
+        r << ">= #{normalized_version}" unless normalized_version.segments[-1].zero?
+        ::Gem::Requirement.new(r)
+      end
+
+      # @return [Array<String>]
+      def to_requirements_list
+        to_requirement.requirements.map { |r| "#{r[0]} #{r[1]}" }
+      end
+
+      private
+
+      # @return [Avm::VersionNumber]
+      def normalized_version_uncached
+        r = version
+        r = ::Avm::VersionNumber.new(r.segments + [0]) while r.segments.count < 3
+        r
+      end
+    end
+  end
+end

data/sub/{avm-tools/lib/avm/tools/runner/ruby → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/runners/base}/rubocop.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
 require 'avm/eac_ruby_base1/rubocop'
+require 'eac_cli/core_ext'
 
 module Avm
-  module Tools
-    class Runner
-      class Ruby
+  module EacRubyBase1
+    module Runners
+      class Base
         class Rubocop
           runner_with :help do
             desc 'Runs Rubocop (https://rubygems.org/gems/rubocop).'

data/sub/{avm-tools/lib/avm/tools/runner/ruby.rb → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/runners/base.rb}

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_cli/core_ext'
+require 'avm/runners/base'
 
 module Avm
-  module Tools
-    class Runner
-      class Ruby
+  module EacRubyBase1
+    module Runners
+      class Base < ::Avm::Runners::Base
         require_sub __FILE__
+
         runner_with :help, :subcommands do
           desc 'Ruby utilities for AVM.'
           subcommands

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Runners
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/bundler.rb

@@ -2,6 +2,7 @@
 
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/sources/base/bundle_command'
+require 'avm/eac_ruby_base1/sources/bundle_update'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -18,6 +19,11 @@ module Avm
               .envvar_gemfile
           end
 
+          # @return [Avm::EacRubyBase1::Sources::BundleUpdate]
+          def bundle_update
+            ::Avm::EacRubyBase1::Sources::BundleUpdate.new(self)
+          end
+
           # @return [String]
           def configured_gemfile_path
             configuration_entry(CONFIGURED_GEMFILE_PATH_ENTRY_KEY).value

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base.rb

@@ -2,8 +2,8 @@
 
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/rubygems/version_file'
+require 'avm/eac_ruby_base1/sources/runners'
 require 'avm/eac_ruby_base1/sources/update'
-require 'avm/eac_ruby_base1/sources/runners/bundler'
 require 'avm/version_number'
 require 'eac_ruby_utils/core_ext'
 

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/bundle_update.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class BundleUpdate
+        common_constructor :source
+        delegate :bundle, to: :source
+
+        def execute!
+          bundle('update').execute! + bundle('install').execute!
+        end
+
+        def system!
+          bundle('update').system!
+          bundle('install').system!
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/update_dependencies_requirements.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/rubygems/gemspec'
+require 'avm/eac_ruby_base1/sources/update_dependency_requirements'
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      module Runners
+        class UpdateDependenciesRequirements
+          runner_with :help do
+            bool_opt '-a', '--all'
+            pos_arg :gem_name, repeat: true, optional: true
+          end
+
+          def run
+            runner_context.call(:source_banner)
+            infov 'Gems to update', gem_names.count
+            gem_names.each do |gem_name|
+              infov 'Gem to update', gem_name
+              ::Avm::EacRubyBase1::Sources::UpdateDependencyRequirements
+                .new(runner_context.call(:source), gem_name).perform
+            end
+          end
+
+          def gemspec
+            ::Avm::EacRubyBase1::Rubygems::Gemspec.from_file(
+              runner_context.call(:source).gemspec_path
+            )
+          end
+
+          private
+
+          def gem_names_uncached
+            ::Set.new(parsed.gem_name + gem_names_from_all).sort
+          end
+
+          def gem_names_from_all
+            return [] unless parsed.all?
+
+            gemspec.dependencies.map(&:gem_name)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update.rb

@@ -14,10 +14,8 @@ module Avm
         end
 
         def bundle_update
-          infom 'Running "bundle update"...'
-          source.bundle('update').execute!
-          infom 'Running "bundle install"...'
-          source.bundle('install').execute!
+          infom 'Running "bundle update && bundle install"...'
+          source.bundle_update.execute!
         end
 
         protected

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/preferred_version_requirements'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class UpdateDependencyRequirements
+        enable_simple_cache
+        common_constructor :source, :gem_name
+
+        def perform
+          source.scm.commit_if_change(commit_message) { update_code }
+        end
+
+        private
+
+        # @return [String]
+        def commit_message
+          i18n_translate(__method__,
+                         name: gem_name,
+                         requirements_list: requirements_list.join(', '),
+                         __locale: source.locale)
+        end
+
+        # @return [Array<String>]
+        def requirements_list_uncached
+          ::Avm::EacRubyBase1::PreferredVersionRequirements.new(
+            source.gemfile_lock_gem_version(gem_name)
+          ).to_requirements_list
+        end
+
+        def gemspec_uncached
+          ::Avm::EacRubyBase1::Rubygems::Gemspec.from_file(source.gemspec_path)
+        end
+
+        def parent_bundle
+          return unless source.parent.if_present { |v| v.is_a?(::Avm::EacRubyBase1::Sources::Base) }
+
+          source.parent.bundle_update.execute!
+        end
+
+        def update_code
+          update_gemspec
+          source.bundle.system!
+          parent_bundle
+        end
+
+        def update_gemspec
+          gemspec.dependency(gem_name).version_specs = requirements_list
+          gemspec.write(source.gemspec_path)
+          source.bundle('exec', 'rubocop', source.gemspec_path).system!
+        end
+      end
+    end
+  end
+end

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

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

data/sub/avm-eac_ruby_base1/locale/en.yml

@@ -6,3 +6,5 @@ en:
           no_scm_update_commit_message: "Gem \"%{name}\" (Local): update to '%{version}'."
           scm_update_commit_message: '**/.gitrepo: fix/update.'
           update_gemfile_lock_commit_message: 'All gems: update.'
+        update_dependency_requirements:
+          commit_message: "Gem \"%{name}\": update to '%{requirements_list}'."

data/sub/avm-eac_ruby_base1/locale/pt-BR.yml

@@ -6,3 +6,5 @@ pt-BR:
           no_scm_update_commit_message: "Gem \"%{name}\" (Local): atualiza para '%{version}'."
           scm_update_commit_message: '**/.gitrepo: conserta/atualiza.'
           update_gemfile_lock_commit_message: 'Todas as gems: atualiza.'
+        update_dependency_requirements:
+          commit_message: "Gem \"%{name}\": atualiza para to '%{requirements_list}'."

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/preferred_version_requirements_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/preferred_version_requirements'
+
+::RSpec.describe ::Avm::EacRubyBase1::PreferredVersionRequirements do
+  describe '#to_requirements_list' do
+    {
+      '0.1.0' => ['~> 0.1'],
+      '0.1.1' => ['~> 0.1', '>= 0.1.1'],
+      '0.5' => ['~> 0.5'],
+      '4.2.11.3' => ['~> 4.2.11', '>= 4.2.11.3'],
+      '1' => ['~> 1.0']
+    }.each do |source, expected|
+      context "when version is \"#{source}\"" do
+        subject(:instance) { described_class.new(source) }
+
+        it do
+          expect(instance.to_requirements_list).to eq(expected)
+        end
+      end
+    end
+  end
+end

data/sub/{avm-tools/spec/lib/avm/tools/runner/ruby → avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base}/rubocop_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+require 'avm/eac_ruby_base1/runners/base/rubocop'
 require 'avm/eac_ruby_base1/sources/base'
-require 'avm/tools/runner'
 
-::RSpec.describe ::Avm::Tools::Runner::Ruby::Rubocop do
+::RSpec.describe ::Avm::EacRubyBase1::Runners::Base::Rubocop do
   let(:fixtures_root) { ::Pathname.new(__dir__).expand_path.join('rubocop_spec_files') }
   let(:dir1) { fixtures_root.join('dir1') }
   let(:dir2) { fixtures_root.join('dir2') }
@@ -12,7 +12,8 @@ require 'avm/tools/runner'
 
   {
     dir1: '0.48.1',
-    dir2: ::Avm::EacRubyBase1::Sources::Base.new(APP_ROOT).gemfile_lock_gem_version('rubocop').to_s,
+    dir2: ::Avm::EacRubyBase1::Sources::Base.new(::File.expand_path('../../../../../..', __dir__))
+            .gemfile_lock_gem_version('rubocop').to_s,
     dir3: '0.48.1',
     dir4: '33.33.33'
   }.each do |dir_name, rubocop_version|
@@ -25,8 +26,8 @@ require 'avm/tools/runner'
       end
 
       it "return #{rubocop_version} as Rubocop version" do
-        argv = ['--quiet', 'ruby', 'rubocop', '-C', dir.to_s, '--', '--version']
-        expect { ::Avm::Tools::Runner.run(argv: argv) }.to(
+        argv = ['-C', dir.to_s, '--', '--version']
+        expect { described_class.run(argv: argv) }.to(
           output("#{rubocop_version}\n").to_stdout_from_any_process
         )
       end

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

@@ -14,19 +14,19 @@ Gem::Specification.new do |s|
   s.bindir = 'exe'
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  s.add_dependency 'aranha-parsers', '~> 0.4'
-  s.add_dependency 'avm', '~> 0.34'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.8'
+  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-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'avm-files', '~> 0.1'
-  s.add_dependency 'avm-git', '~> 0.3', '>= 0.3.1'
-  s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.3'
-  s.add_dependency 'curb', '~> 0.9.10'
+  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_ruby_base0', '~> 0.16', '>= 0.16.4'
+  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.7'
-  s.add_dependency 'ruby-progressbar', '~> 1.10', '>= 1.10.1'
+  s.add_dependency 'git', '~> 1.11'
+  s.add_dependency 'ruby-progressbar', '~> 1.11'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-tools/lib/avm/tools/runner/instance.rb

@@ -22,7 +22,9 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::Registry.instances.detect(parsed.instance_id)
+          parsed.instance_id.if_present do |v|
+            ::Avm::Registry.instances.detect(v)
+          end
         end
       end
     end

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

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

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

@@ -47,6 +47,10 @@ module EacCli
         end
       end
 
+      def available_subcommands_to_s
+        available_subcommands.keys.sort.join(', ')
+      end
+
       def help_extra_text
         (['Subcommands:'] + available_subcommands.keys.sort.map { |s| "  #{s}" })
           .map { |v| "#{v}\n" }.join
@@ -101,7 +105,7 @@ module EacCli
         raise(::EacCli::Parser::Error.new(
                 self.class.runner_definition, runner_context.argv,
                 "Subcommand \"#{subcommand_name}\" not found " \
-                  "(Available: #{available_subcommands.keys})"
+                  "(Available: #{available_subcommands_to_s})"
               ))
       end
 

data/sub/eac_cli/lib/eac_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.35'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.35.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.35'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.35.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +75,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base0
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +152,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -194,14 +206,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.131'
+        version: '0.132'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.132.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.131'
+        version: '0.132'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.132.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -301,6 +319,7 @@ files:
 - sub/avm-eac_latex_base0/lib/avm/eac_latex_base0/version.rb
 - sub/avm-eac_latex_base0/spec/rubocop_spec.rb
 - sub/avm-eac_latex_base0/spec/spec_helper.rb
+- sub/avm-eac_latex_base0/template/avm/eac_latex_base0/instances/deploy/index.html.template
 - sub/avm-eac_latex_base0/template/avm/eac_latex_base0/sources/build/commons/all.tex
 - sub/avm-eac_latex_base0/template/avm/eac_latex_base0/sources/build/commons/ebook.tex
 - sub/avm-eac_latex_base0/template/avm/eac_latex_base0/sources/build/commons/images.tex
@@ -436,6 +455,7 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/preferred_version_requirements.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/configured.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/envvar.rb
@@ -445,6 +465,9 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec/add_or_replace_gem_line.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec/dependency.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/version_file.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/runners.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/runners/base.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/runners/base/rubocop.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources.rb
@@ -454,10 +477,12 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rake.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rubygems.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/version_bump.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/bundle_update.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_local.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/incompatible.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/update_dependencies_requirements.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tests.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tests/base.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tests/minitest.rb
@@ -467,6 +492,7 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tests/rspec.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update/sub_update.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb
 - sub/avm-eac_ruby_base1/locale/en.yml
 - sub/avm-eac_ruby_base1/locale/pt-BR.yml
@@ -475,8 +501,13 @@ files:
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/1.target.yaml
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/2.source.out
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/bundler/incompatible_parser_spec_files/2.target.yaml
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/preferred_version_requirements_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/version_file_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/version_file_spec_files/a_version_file.rb
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec.rb
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec_files/dir1/dir3/Gemfile
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec_files/dir2/empty.rb
+- 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/dashed-mygem.gemspec
@@ -657,8 +688,6 @@ files:
 - sub/avm-tools/lib/avm/tools/runner/launcher/instances.rb
 - sub/avm-tools/lib/avm/tools/runner/launcher/projects.rb
 - sub/avm-tools/lib/avm/tools/runner/launcher/publish.rb
-- sub/avm-tools/lib/avm/tools/runner/ruby.rb
-- sub/avm-tools/lib/avm/tools/runner/ruby/rubocop.rb
 - sub/avm-tools/lib/avm/tools/runner/self.rb
 - sub/avm-tools/lib/avm/tools/runner/self/docker.rb
 - sub/avm-tools/lib/avm/tools/runner/self/registry.rb
@@ -718,11 +747,6 @@ files:
 - sub/avm-tools/spec/lib/avm/tools/runner/git/deploy_spec.rb
 - sub/avm-tools/spec/lib/avm/tools/runner/git/deploy_spec_files/append1/stub3.txt.template
 - sub/avm-tools/spec/lib/avm/tools/runner/git/deploy_spec_files/append2/stub4.txt
-- sub/avm-tools/spec/lib/avm/tools/runner/ruby/rubocop_spec.rb
-- sub/avm-tools/spec/lib/avm/tools/runner/ruby/rubocop_spec_files/dir1/dir3/Gemfile
-- sub/avm-tools/spec/lib/avm/tools/runner/ruby/rubocop_spec_files/dir1/dir3/Gemfile.lock
-- sub/avm-tools/spec/lib/avm/tools/runner/ruby/rubocop_spec_files/dir2/empty.rb
-- sub/avm-tools/spec/lib/avm/tools/runner/ruby/rubocop_spec_files/dir4/false_command.rb
 - sub/avm-tools/spec/lib/avm/tools/runner_spec.rb
 - sub/avm-tools/spec/rubocop_spec.rb
 - sub/avm-tools/spec/spec_helper.rb
@@ -734,7 +758,6 @@ files:
 - sub/avm-tools/spec/spec_helper/stub_templates/stubbed_docker_server/id_rsa.pub
 - sub/avm-tools/spec/spec_helper/stubbed_docker_server.rb
 - sub/avm-tools/spec/spec_helper/templates.rb
-- sub/avm-tools/template/avm/eac_writings_base0/deploy/index.html.template
 - sub/avm-tools/template/avm/self/docker_image/Dockerfile
 - sub/avm-tools/template/avm/self/docker_image/entrypoint.sh
 - sub/avm/Gemfile

data/sub/avm-tools/spec/lib/avm/tools/runner/ruby/rubocop_spec_files/dir1/dir3/Gemfile.lock

@@ -1,27 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    parser (2.7.0.4)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    rainbow (2.2.2)
-      rake
-    rake (13.0.1)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rubocop (= 0.48.1)
-
-BUNDLED WITH
-   2.3.17