eac_tools 0.76.1 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243403803692489258ccec3dc01aaa6f73effcd4764c3c6fa4f251cd94990c02
-  data.tar.gz: fb4250adf052f9aa3377f6b921875cc04db1dd260f766bf97de30054b1c91a73
+  metadata.gz: 1d70e40ff292d0e0d728294d8c9b7bb1906c46e00bb4935d5cded1dfb02ee87e
+  data.tar.gz: 83c1d1f602c4e2a76ffca74596cf0b53cec97303cb99f3fd2287380048318997
 SHA512:
-  metadata.gz: 2cec5914255d449c07faf6c718fc73e1763b41d1780c2c47f4f7c5207c4a0b8908503f368e602726d34ac85a852ec8d67f8642d66bd6caa8deb2a2852be6563e
-  data.tar.gz: d72e9d339979ceb273bea144a33d527a9f34fdd8e4505bf1348c0adddfc6c529aba878010552e632edac47c60ad29885f3d59756f97b13846b535fece2f5c1e3
+  metadata.gz: 22b840c8531a025c38e2bd00109cd16b9921ee4fd192d5e5f9de62bd0dce445d193ce50293b802c32bbfec0c8f13ef6c20051f4746915b4e3d4b3189e4d82dc2
+  data.tar.gz: 434796f650c912a6aa982c9e61657e372d2b248c32044bb9833d6f61a07911072722dd5d212368e9d4650bccb10c1b719986c8299fd2e6baa18a75d11738bfd0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.76.1)
+    eac_tools (0.77.0)
       avm (~> 0.79)
       avm-eac_asciidoctor_base0 (~> 0.19)
-      avm-eac_generic_base0 (~> 0.12)
+      avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
       avm-eac_php_base0 (~> 0.4, >= 0.4.2)
       avm-eac_postgresql_base0 (~> 0.5, >= 0.5.2)
@@ -17,7 +17,7 @@ PATH
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.4)
-      avm-tools (~> 0.154)
+      avm-tools (~> 0.155)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
@@ -33,9 +33,9 @@ PATH
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.12.0)
-      avm (~> 0.66)
-      eac_ruby_utils (~> 0.112)
+    avm-eac_generic_base0 (0.12.1)
+      avm (~> 0.79)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
   remote: sub/avm-eac_latex_base0
@@ -163,13 +163,13 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.154.0)
+    avm-tools (0.155.0)
       aranha-parsers (~> 0.21)
       avm (~> 0.79)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
+      avm-eac_ruby_base1 (~> 0.31, >= 0.31.2)
       avm-eac_ubuntu_base0 (~> 0.5)
       avm-files (~> 0.6, >= 0.6.2)
-      avm-git (~> 0.13, >= 0.13.3)
+      avm-git (~> 0.13, >= 0.13.4)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.14, >= 0.14.1)
@@ -209,13 +209,6 @@ PATH
       addressable (~> 2.8, >= 2.8.4)
       eac_ruby_utils (~> 0.119)
 
-PATH
-  remote: sub/eac_docker
-  specs:
-    eac_docker (0.7.0)
-      eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.3, >= 0.3.2)
-
 PATH
   remote: sub/eac_git
   specs:
@@ -223,25 +216,6 @@ PATH
       eac_ruby_utils (~> 0.112)
       parseconfig (~> 1.1, >= 1.1.2)
 
-PATH
-  remote: sub/eac_ruby_base0
-  specs:
-    eac_ruby_base0 (0.19.0)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
-      eac_cli (~> 0.35)
-      eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.117)
-
-PATH
-  remote: sub/eac_ruby_utils
-  specs:
-    eac_ruby_utils (0.119.2)
-      activesupport (>= 4, < 7)
-      addressable (~> 2.8, >= 2.8.5)
-      bundler
-      filesize (~> 0.2)
-      net-ssh (~> 4.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -270,6 +244,9 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
+    eac_docker (0.7.0)
+      eac_ruby_utils (~> 0.112)
+      eac_templates (~> 0.3, >= 0.3.2)
     eac_envs-http (0.4.1)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.119, >= 0.119.1)
@@ -286,12 +263,23 @@ GEM
       eac_envs-http (~> 0.4, >= 0.4.1)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.119, >= 0.119.1)
+    eac_ruby_base0 (0.19.0)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
+      eac_cli (~> 0.35)
+      eac_fs (~> 0.16)
+      eac_ruby_utils (~> 0.117)
     eac_ruby_gem_support (0.8.1)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
       rspec (~> 3.12)
       rubocop (~> 1.56, >= 1.56.4)
       rubocop-rails (~> 2.21, >= 2.21.2)
       rubocop-rspec (~> 2.24, >= 2.24.1)
+    eac_ruby_utils (0.119.2)
+      activesupport (>= 4, < 7)
+      addressable (~> 2.8, >= 2.8.5)
+      bundler
+      filesize (~> 0.2)
+      net-ssh (~> 4.2)
     eac_templates (0.5.0)
       eac_config (~> 0.12)
       eac_ruby_utils (~> 0.112)
@@ -414,11 +402,8 @@ DEPENDENCIES
   avm-tools!
   eac_cli!
   eac_config!
-  eac_docker!
   eac_git!
-  eac_ruby_base0!
   eac_ruby_gem_support (~> 0.8.0)
-  eac_ruby_utils!
   eac_tools!
 
 BUNDLED WITH

data/lib/eac_tools/version.rb

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

data/sub/avm-eac_generic_base0/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
-eval_gemfile local_gemfile if ::File.exist?(local_gemfile)
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,8 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.66'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.required_ruby_version = '>= 2.7.0'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
+  s.add_dependency 'avm', '~> 0.79'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.2'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.8.1'
 end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base/apply.rb

@@ -15,7 +15,7 @@ module Avm
 
           # @return [Enumerable<Avm::FileFormats::FileResult>]
           def result
-            old_content = Hash[files.map { |f| [f, File.read(f)] }]
+            old_content = files.index_with { |f| File.read(f) }
             ::Avm::FileFormats::Utf8Assert.assert_files(files) { file_format.internal_apply(files) }
             files.map { |f| file_result(f, old_content[f]) }
           end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base/file_resource_name_helper.rb

@@ -7,9 +7,9 @@ module Avm
     class FileFormats
       class Base < ::Avm::FileFormats::Base
         module FileResourceNameHelper
-          def result_from_patterns(patterns, path)
+          def result_from_patterns(patterns, path, &block)
             patterns.lazy.map { |pattern| pattern.to_parser.parse(path.to_path) }
-              .find(&:present?).if_present { |v| yield(v) }
+              .find(&:present?).if_present(&block)
           end
 
           def result_from_superclass(path)

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/file_formats/base.rb

@@ -33,7 +33,7 @@ module Avm
           string.each_line do |line|
             b += "#{line.rstrip}\n"
           end
-          "#{b.strip}\n".gsub(/\t/, '  ')
+          "#{b.strip}\n".gsub("\t", '  ')
         end
       end
     end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.12.0'
+    VERSION = '0.12.1'
   end
 end

data/sub/avm-eac_generic_base0/spec/lib/avm/eac_generic_base0/file_formats/base_spec.rb

@@ -2,6 +2,6 @@
 
 require 'avm/eac_generic_base0/file_formats/base'
 
-::RSpec.describe ::Avm::EacGenericBase0::FileFormats::Base do
+RSpec.describe Avm::EacGenericBase0::FileFormats::Base do
   include_examples 'avm_file_formats_with_fixtures', __FILE__
 end

data/sub/avm-eac_generic_base0/spec/lib/avm/eac_generic_base0/sources/base_spec.rb

@@ -2,6 +2,6 @@
 
 require 'avm/eac_generic_base0/sources/base'
 
-::RSpec.describe ::Avm::EacGenericBase0::Sources::Base do
+RSpec.describe Avm::EacGenericBase0::Sources::Base do
   include_examples 'in_avm_registry', 'sources'
 end

data/sub/avm-eac_generic_base0/spec/rubocop_spec.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-::EacRubyUtils::Rspec.default_setup.describe_rubocop
+EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/avm-eac_generic_base0/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/rspec/default_setup'
-::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))

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

@@ -6,7 +6,7 @@ require 'avm/tools/version'
 
 Gem::Specification.new do |s|
   s.name        = 'avm-tools'
-  s.version     = ::Avm::Tools::VERSION
+  s.version     = Avm::Tools::VERSION
   s.authors     = ['Esquilo Azul Company']
   s.summary     = 'Tools for AVM.'
 
@@ -14,12 +14,14 @@ Gem::Specification.new do |s|
   s.bindir = 'exe'
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
+  s.required_ruby_version = '>= 2.7.0'
+
   s.add_dependency 'aranha-parsers', '~> 0.21'
   s.add_dependency 'avm', '~> 0.79'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.31', '>= 0.31.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
   s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
-  s.add_dependency 'avm-git', '~> 0.13', '>= 0.13.3'
+  s.add_dependency 'avm-git', '~> 0.13', '>= 0.13.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.14', '>= 0.14.1'
@@ -28,5 +30,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'git', '~> 1.18'
   s.add_dependency 'ruby-progressbar', '~> 1.13'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.8.1'
 end

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Instance < ::Avm::Instances::Runner
+        class System
+          ENVVAR_PARSER = /\A([^=]+)=(.+)\z/.to_parser do |m|
+            ::Struct.new(:name, :value).new(m[1].strip, m[2].strip)
+          end
+
+          runner_with :help do
+            desc 'Execute a command in the instance\'s environment.'
+            arg_opt '-C', '--chdir'
+            arg_opt '-e', '--envvar', repeat: true
+            pos_arg :command_args, required: true, repeat: true
+          end
+
+          delegate :command_args, to: :parsed
+
+          def run
+            start_banner
+            run_command
+          end
+
+          # @return [Pathname]
+          def chdir
+            (parsed.chdir || instance.install_path).to_pathname
+          end
+
+          private
+
+          # @return [EacRubyUtils::Envs::Command]
+          def command_without_envvars
+            instance.host_env.command(*command_args).chdir(chdir)
+          end
+
+          # @return [EacRubyUtils::Envs::Command]
+          def command
+            envvars.inject(command_without_envvars) { |a, e| a.envvar(e.name, e.value) }
+          end
+
+          # @return [Hash<String, String>]
+          def envvars
+            parsed.envvar.map { |v| ENVVAR_PARSER.parse!(v) }
+          end
+
+          def run_command
+            command.system!
+          end
+
+          def start_banner
+            infov 'Instance', instance
+            infov 'Environment', instance.host_env
+            infov 'Directory', chdir
+            infov 'Envvars', envvars.map { |e| "#{e.name}=#{e.value}" }.join(', ')
+            infov 'Command', ::Shellwords.join(command_args)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-tools/lib/avm/tools/runner/source/issue/complete.rb

@@ -11,10 +11,10 @@ module Avm
           class Complete
             runner_with :confirmation, :help do
               desc 'Closes a issue in a Git repository.'
-              bool_opt '-f', '--uncomplete-unfail', 'Do not exit with error if issue is not' \
-                ' completed or is invalid.'
-              arg_opt '-s', '--skip-validations', 'Does not validate conditions on <validations>' \
-                ' (Comma separated value).'
+              bool_opt '-f', '--uncomplete-unfail', 'Do not exit with error if issue is not ' \
+                                                    'completed or is invalid.'
+              arg_opt '-s', '--skip-validations', 'Does not validate conditions on <validations> ' \
+                                                  '(Comma separated value).'
             end
 
             def run

data/sub/avm-tools/lib/avm/tools/runner_with/instance_data_dump.rb

@@ -25,7 +25,7 @@ module Avm
 
         DUMP_EXPIRE_TIME = 1.day
         NO_DUMP_MESSAGE = 'Dump "%s" already exist and rewrite options was no setted nor ' \
-          'dump was expired.'
+                          'dump was expired.'
 
         # @return [Class]
         def data_performer_class

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.154.0'
+    VERSION = '0.155.0'
   end
 end

data/sub/avm-tools/spec/dummy/avm-tools_stub/avm-tools.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.files = Dir['{exe,lib}/**/*', 'Gemfile', 'MIT-LICENSE', 'README.rdoc']
+  s.required_ruby_version = '>= 2.7.0'
   s.bindir = 'exe'
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 

data/sub/avm-tools/spec/dummy/ruby_gem_stub/ruby_gem_stub.gemspec

@@ -12,4 +12,5 @@ Gem::Specification.new do |s|
   s.authors     = ['Esquilo Azul Company']
   s.summary     = 'Ruby gem stub for tests.'
   s.files = Dir['{lib}/**/*']
+  s.required_ruby_version = '>= 2.7.0'
 end

data/sub/avm-tools/spec/lib/avm/projects/stereotypes/git_subrepo/publish_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe Avm::Git::LauncherStereotypes::GitSubrepo::Publish do
             touch_commit(app, 'mylib/file3')
           end
 
-          it { expect(::Avm::Launcher::Context.current.publish_options[:confirm]).to eq(true) }
+          it { expect(::Avm::Launcher::Context.current.publish_options[:confirm]).to be(true) }
           it { check_publish_status(:pending) }
 
           context 'after publishing' do
@@ -60,15 +60,18 @@ RSpec.describe Avm::Git::LauncherStereotypes::GitSubrepo::Publish do
           end
         end
 
-        def check_publish_status(status_key)
+        def check_publish_status(status_key) # rubocop:disable Metrics/AbcSize
           instance = app_mylib_instance
           expect(instance).to be_a(::Avm::Launcher::Instances::Base)
           expect(instance.stereotypes).to include(::Avm::Git::LauncherStereotypes::GitSubrepo)
 
           status = ::Avm::Launcher::Publish::CheckResult.const_get("STATUS_#{status_key}".upcase)
           publish = described_class.new(instance)
-          expect(publish.check.status).to eq(status), "Expected: #{status}, Actual: " \
+          expect(publish.check.status).to(
+            eq(status),
+            "Expected: #{status}, Actual: " \
             "#{publish.check.status}, Message: #{publish.check.message}"
+          )
         end
 
         def app_mylib_instance

data/sub/avm-tools/spec/lib/avm/projects/stereotypes/git_subrepo/warp_spec.rb

@@ -27,10 +27,10 @@ RSpec.describe Avm::Git::LauncherStereotypes::GitSubrepo::Warp do
 
     it 'revisions should match' do
       master_ref = @repos.rev_parse('master')
-      expect(master_ref.present?).to eq true
+      expect(master_ref.present?).to be true
 
       master_ref_previous = @repos.rev_parse('master^')
-      expect(master_ref_previous.present?).to eq true
+      expect(master_ref_previous.present?).to be true
 
       @app2.execute!('subrepo', 'branch', 'mylib', '--fetch', '--force')
       expect(@app2.rev_parse('subrepo/mylib')).to eq master_ref

data/sub/avm-tools/spec/lib/avm/tools/runner/files/rotate_spec.rb

@@ -26,7 +26,7 @@ end
     ::FileUtils.touch(source_path)
   end
 
-  it { expect(::File.exist?(source_path)).to eq(true) }
+  it { expect(::File.exist?(source_path)).to be(true) }
 
   context 'when run' do
     let(:files_with_prefix) { ::Dir["#{workdir}/myfile_*.tar.gz"] }
@@ -35,7 +35,7 @@ end
       ::Avm::Tools::Runner.run(argv: ['files', 'rotate', source_path])
     end
 
-    it { expect(::File.exist?(source_path)).to eq(false) }
+    it { expect(::File.exist?(source_path)).to be(false) }
     it { expect(files_with_prefix.count).to eq(1) }
   end
 

data/sub/avm-tools/spec/lib/avm/tools/runner/git/deploy_spec.rb

@@ -41,7 +41,7 @@ require 'tmpdir'
     end
 
     it { expect(::File.read(target_stub_file1)).to eq(stub_content1) }
-    it { expect(::File.exist?(target_stub_file2)).to eq(false) }
+    it { expect(::File.exist?(target_stub_file2)).to be(false) }
 
     context 'with second commit' do
       before do
@@ -49,7 +49,7 @@ require 'tmpdir'
         avm_tools_runner_run(target_dir)
       end
 
-      it { expect(::File.exist?(target_stub_file1)).to eq(false) }
+      it { expect(::File.exist?(target_stub_file1)).to be(false) }
       it { expect(::File.read(target_stub_file2)).to eq(stub_content2) }
     end
   end
@@ -65,7 +65,7 @@ require 'tmpdir'
     end
 
     it { expect(::File.read(target_stub_file1)).to eq(stub_content1) }
-    it { expect(::File.exist?(target_stub_file2)).to eq(false) }
+    it { expect(::File.exist?(target_stub_file2)).to be(false) }
     it { expect(::File.read(target_stub_file3)).to eq("MyValue: 123\n") }
     it { expect(::File.read(target_stub_file4)).to eq("MyValue: %%MY_VALUE%%\n") }
   end
@@ -81,7 +81,7 @@ require 'tmpdir'
     end
 
     it { expect(::File.read(target_stub_file1)).to eq(stub_content1) }
-    it { expect(::File.exist?(target_stub_file2)).to eq(false) }
+    it { expect(::File.exist?(target_stub_file2)).to be(false) }
     it { expect(::File.read(target_stub_file3)).to eq("MyValue: 123\n") }
     it { expect(::File.read(target_stub_file4)).to eq("MyValue: %%MY_VALUE%%\n") }
   end
@@ -107,7 +107,7 @@ require 'tmpdir'
     end
 
     it { expect(env.file(target_stub_file1).read).to eq(stub_content1) }
-    it { expect(env.file(target_stub_file2).exist?).to eq(false) }
+    it { expect(env.file(target_stub_file2).exist?).to be(false) }
 
     context 'with second commit' do
       before do
@@ -115,7 +115,7 @@ require 'tmpdir'
         avm_tools_runner_run(target_url)
       end
 
-      it { expect(env.file(target_stub_file1).exist?).to eq(false) }
+      it { expect(env.file(target_stub_file1).exist?).to be(false) }
       it { expect(env.file(target_stub_file2).read).to eq(stub_content2) }
     end
   end