eac_tools 0.86.4 → 0.86.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 011f97eae6daa1839bb3c2938d98554408f6e4a20668234656ef8edf79774e16
-  data.tar.gz: 06c5b0b6586b45f323b8db0d6c50f892c514f6f49893838898db9c0baa646e1f
+  metadata.gz: 4a3acc6bda5ae96d94b303fcf69e2e9f2e4b860bd19cb9d228919171d1bd172d
+  data.tar.gz: 20787d56237058d215e77bd713b304b877413e8b6d65682eac8b3fe236da1288
 SHA512:
-  metadata.gz: 9331c22d9f4f02fdad091ab6a46ce650b05301b2f11dd93d4590b3a21776aff08d25bfeebdb3370f3cfe5bedcf550e242bb4120fb439eeea1e37ce63cae621f8
-  data.tar.gz: 433b4e4280272b529171d525b050fbf4bc8573015c57387868815e904421cd472c1ca26e181a6588a200c4ff996c6d4de7ed51b0b58e57f63860752d77bb7292
+  metadata.gz: 0a607f5f6aebeebafb2fdfc943a8c76ab32358c5055d4e99c15e7ddd35b62d0d19686c37dd0016eb9590832f06bfeafeef735b488df543af85f4974a5b423102
+  data.tar.gz: caeea6fd5aef5b034e494b7ca9ee3db07da9199bce519632202559f5aa201928cce14863f2244daafefbf86a35bf4fa65f62d1102e93f67e290a9090f0cbe1fb

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.86.4)
-      avm (~> 0.86)
+    eac_tools (0.86.5)
+      avm (~> 0.86, >= 0.86.1)
       avm-eac_asciidoctor_base0 (~> 0.22)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.2)
       avm-eac_github_base0 (~> 0.3)
@@ -18,8 +18,8 @@ PATH
       avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.3)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
-      avm-git (~> 0.16)
-      avm-tools (~> 0.160, >= 0.160.2)
+      avm-git (~> 0.17)
+      avm-tools (~> 0.161)
       eac_ruby_utils (~> 0.121)
 
 PATH
@@ -48,8 +48,8 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.16.0)
-      avm (~> 0.86)
+    avm-git (0.17.0)
+      avm (~> 0.86, >= 0.86.1)
       avm-files (~> 0.7)
       eac_git (~> 0.16)
       eac_ruby_utils (~> 0.121)
@@ -58,25 +58,15 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.160.2)
-      aranha-parsers (~> 0.22)
-      avm (~> 0.86)
-      avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
-      avm-eac_ubuntu_base0 (~> 0.5)
-      avm-files (~> 0.7)
-      avm-git (~> 0.16)
+    avm-tools (0.161.0)
+      avm (~> 0.86, >= 0.86.1)
       clipboard (~> 1.3, >= 1.3.6)
-      curb (~> 0.9, >= 0.9.11)
-      eac_git (~> 0.16)
       eac_ruby_base0 (~> 0.19)
-      eac_templates (~> 0.5, >= 0.5.1)
-      git (~> 1.19, >= 1.19.1)
-      ruby-progressbar (~> 1.13)
 
 PATH
   remote: sub/avm
   specs:
-    avm (0.86.0)
+    avm (0.86.1)
       aranha-parsers (~> 0.22)
       eac_cli (~> 0.40, >= 0.40.1)
       eac_config (~> 0.14, >= 0.14.2)
@@ -87,6 +77,7 @@ PATH
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.3)
       minitar (~> 0.9)
+      ruby-progressbar (~> 1.13)
 
 PATH
   remote: sub/eac_git

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Eduardo H. Bogoni']
   s.summary     = 'Ruby base library for Agora Vai! Methodology (https://avm.esquiloazul.tech).'
 
-  s.files = Dir['{lib,locale}/**/*']
+  s.files = Dir['{lib,locale,template}/**/*']
   s.required_ruby_version = '>= 2.7'
 
   s.add_dependency 'aranha-parsers', '~> 0.22'
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.3'
   s.add_dependency 'minitar', '~> 0.9'
+  s.add_dependency 'ruby-progressbar', '~> 1.13'
 
   s.add_development_dependency 'avm-eac_ruby_base1', '~> 0.33'
   s.add_development_dependency 'avm-git', '~> 0.14'

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

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

data/sub/{avm-tools → avm}/spec/lib/avm/launcher/context_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Avm::Launcher::Context do
         mylib_repos
       end
 
-      context 'when sub is a GitSubrepo' do # rubocop:disable RSpec/NestedGroups
+      context 'when sub is a GitSubrepo' do
         let(:sub) { described_class.current.instance('/app/sub1') }
         let(:instance) { described_class.current.instance('/app/sub1/mylib') }
 
@@ -53,7 +53,7 @@ RSpec.describe Avm::Launcher::Context do
         it { expect(instance.stereotypes).to include(Avm::Git::LauncherStereotypes::GitSubrepo) }
       end
 
-      context 'when sub is a GitSubtree' do # rubocop:disable RSpec/NestedGroups
+      context 'when sub is a GitSubtree' do
         let(:sub) { described_class.current.instance('/app/sub1') }
         let(:instance) { described_class.current.instance('/app/sub1/mylib') }
 
@@ -75,7 +75,7 @@ RSpec.describe Avm::Launcher::Context do
         it { expect(instance.stereotypes).to include(Avm::Git::LauncherStereotypes::GitSubtree) }
       end
 
-      context 'when subtree is present' do # rubocop:disable RSpec/NestedGroups
+      context 'when subtree is present' do
         before do
           app = init_git('subtree_main_app')
           touch_commit(app, 'file1')
@@ -90,7 +90,7 @@ RSpec.describe Avm::Launcher::Context do
         end
       end
 
-      context 'when subinstance in HEAD and not in git_current_revision' do # rubocop:disable RSpec/NestedGroups
+      context 'when subinstance in HEAD and not in git_current_revision' do
         it 'does not return subinstance' do
           app = init_git('app') # HEAD: master
           touch_commit(app, 'file2')
@@ -100,8 +100,8 @@ RSpec.describe Avm::Launcher::Context do
         end
       end
 
-      context 'when subinstances in/not in HEAD and not in/in git_current_revision' do # rubocop:disable RSpec/NestedGroups
-        context 'when subinstance in HEAD and not in git_current_revision' do # rubocop:disable RSpec/NestedGroups
+      context 'when subinstances in/not in HEAD and not in/in git_current_revision' do
+        context 'when subinstance in HEAD and not in git_current_revision' do
           it 'does not return subinstance' do
             app = init_git('app') # HEAD: master
             touch_commit(app, 'file2')
@@ -111,7 +111,7 @@ RSpec.describe Avm::Launcher::Context do
           end
         end
 
-        context 'when subinstance not in HEAD and in git_current_revision' do # rubocop:disable RSpec/NestedGroups
+        context 'when subinstance not in HEAD and in git_current_revision' do
           it 'returns subinstance' do # rubocop:disable RSpec/ExampleLength
             app = init_git('app') # HEAD: master
             touch_commit(app, 'file3')

data/sub/avm/spec/spec_helper/eac_launcher/settings.yml

@@ -0,0 +1,6 @@
+---
+Instances:
+  /ruby_gem_stub:
+    git_current_revision: git_current_revision_setted
+    git_publish_remote: git_publish_remote_setted
+    publishable: false

data/sub/avm/spec/spec_helper.rb

@@ -2,3 +2,4 @@
 
 require 'eac_ruby_utils/rspec/default_setup'
 EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__)).stub_avm_contexts
+EacRubyUtils.require_sub(__FILE__)

data/sub/avm-git/avm-git.gemspec

@@ -13,11 +13,13 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,locale}/**/*']
   s.required_ruby_version = '>= 2.7'
 
-  s.add_dependency 'avm', '~> 0.86'
+  s.add_dependency 'avm', '~> 0.86', '>= 0.86.1'
   s.add_dependency 'avm-files', '~> 0.7'
   s.add_dependency 'eac_git', '~> 0.16'
   s.add_dependency 'eac_ruby_utils', '~> 0.121'
   s.add_dependency 'git', '~> 1.19', '>= 1.19.1'
 
+  s.add_development_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
+  s.add_development_dependency 'avm-tools', '~> 0.160', '>= 0.160.2'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.9'
 end

data/sub/{avm-tools/lib/avm/tools/runner/git → avm-git/lib/avm/git/runners/base}/commit.rb

@@ -7,9 +7,9 @@ require 'filesize'
 require 'avm/git/commit'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         class Commit
           runner_with :help do
             desc 'Mostra informações de um commit.'

data/sub/{avm-tools/lib/avm/tools/runner/git → avm-git/lib/avm/git/runners/base}/deploy.rb

@@ -4,9 +4,9 @@ require 'avm/git/scms/git'
 require 'eac_config/node'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         class Deploy
           DEFAULT_REFERENCE = 'HEAD'
 

data/sub/{avm-tools/lib/avm/tools/runner/git → avm-git/lib/avm/git/runners/base}/dirty_files.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         class DirtyFiles
           DEFAULT_FORMAT = '%p'
           FIELDS = {

data/sub/{avm-tools/lib/avm/tools/runner/git → avm-git/lib/avm/git/runners/base}/organize.rb

@@ -4,9 +4,9 @@ require 'avm/git/organize/repository'
 require 'eac_cli/default_runner'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         class Organize
           runner_with :help do
             desc 'Organize branches.'

data/sub/{avm-tools/lib/avm/tools/runner/git → avm-git/lib/avm/git/runners/base}/revisions_test.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
+require 'eac_cli/core_ext'
 require 'avm/git/revision_test'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         class RevisionsTest
           runner_with :help do
             desc 'Test multiple revisions until a error is found.'

data/sub/{avm-tools/lib/avm/tools/runner/git → avm-git/lib/avm/git/runners/base}/subrepo/check.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
+require 'eac_cli/core_ext'
 require 'eac_git/local'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         class Subrepo
           class Check
             runner_with :help do

data/sub/{avm-tools/lib/avm/tools/runner/git → avm-git/lib/avm/git/runners/base}/subrepo/clone.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
+require 'eac_cli/core_ext'
 require 'eac_git/local'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         class Subrepo
           class Clone
             runner_with :help do

data/sub/{avm-tools/lib/avm/tools/runner/git → avm-git/lib/avm/git/runners/base}/subrepo/fix.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
+require 'eac_cli/core_ext'
 require 'avm/git/scms/git'
 require 'avm/git/subrepo_checks'
 require 'avm/scms/auto_commit/rules/unique'
@@ -8,9 +8,9 @@ require 'avm/scms/auto_commit/for_file'
 require 'eac_git/local'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         class Subrepo
           class Fix
             runner_with :help do

data/sub/{avm-tools/lib/avm/tools/runner/git → avm-git/lib/avm/git/runners/base}/subrepo.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         class Subrepo
           require_sub __FILE__
           runner_with :help, :subcommands do

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'avm/tools/core_ext'
+require 'eac_cli/core_ext'
 require 'avm/git/launcher/base'
 
 module Avm
-  module Tools
-    class Runner
-      class Git
+  module Git
+    module Runners
+      class Base
         require_sub __FILE__
         runner_with :help, :subcommands do
           desc 'Git utilities for AVM.'
@@ -14,6 +14,13 @@ module Avm
           subcommands
         end
 
+        COMMAND_ARGUMENT = 'git'
+
+        # @return [String]
+        def self.command_argument
+          COMMAND_ARGUMENT
+        end
+
         def repository_path
           repository_path? ? parsed.path : '.'
         end

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

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

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

data/sub/{avm-tools → avm-git}/spec/lib/avm/git/launcher_stereotypes/git_subrepo/publish_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Avm::Git::LauncherStereotypes::GitSubrepo::Publish do
         temp_context(settings_path)
       end
 
-      context 'with app with subrepo' do # rubocop:disable RSpec/NestedGroups
+      context 'with app with subrepo' do
         let(:remote_repos) { init_remote('mylib') }
 
         before do
@@ -31,7 +31,7 @@ RSpec.describe Avm::Git::LauncherStereotypes::GitSubrepo::Publish do
 
         it { check_publish_status(:updated) } # rubocop:disable RSpec/NoExpectationExample
 
-        context 'after subrepo updated and before publishing' do # rubocop:disable RSpec/ContextWording, RSpec/NestedGroups
+        context 'after subrepo updated and before publishing' do # rubocop:disable RSpec/ContextWording
           before do
             Avm::Launcher::Context.current.publish_options[:confirm] = true
             touch_commit(app, 'mylib/file3')
@@ -40,12 +40,12 @@ RSpec.describe Avm::Git::LauncherStereotypes::GitSubrepo::Publish do
           it { expect(Avm::Launcher::Context.current.publish_options[:confirm]).to be(true) }
           it { check_publish_status(:pending) } # rubocop:disable RSpec/NoExpectationExample
 
-          context 'after publishing' do # rubocop:disable RSpec/ContextWording, RSpec/NestedGroups
+          context 'after publishing' do # rubocop:disable RSpec/ContextWording
             before { described_class.new(app_mylib_instance).run }
 
             it { check_publish_status(:updated) } # rubocop:disable RSpec/NoExpectationExample
 
-            context 'after reset context' do # rubocop:disable RSpec/ContextWording, RSpec/NestedGroups
+            context 'after reset context' do # rubocop:disable RSpec/ContextWording
               before do
                 sleep 2
                 Avm::Launcher::Context.current = Avm::Launcher::Context.new(

data/sub/{avm-tools/spec/lib/avm/tools/runner/git → avm-git/spec/lib/avm/git/runners/base}/deploy_spec.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 require 'avm/eac_ubuntu_base0/rspec/ssh_docker_server'
-require 'avm/tools/runner'
+require 'avm/git/runners/base'
 require 'tmpdir'
 
-RSpec.describe Avm::Tools::Runner::Git::Deploy, :git do # rubocop:disable RSpec/MultipleMemoizedHelpers
+RSpec.describe Avm::Git::Runners::Base::Deploy, :git do
   let(:git) { stubbed_git_local_repo }
   let(:reference) { git.current_branch }
-  let(:stub_file1) { 'stub1.txt' } # rubocop:disable RSpec/IndexedLet
-  let(:stub_content1) { 'CONTENT 111' } # rubocop:disable RSpec/IndexedLet
-  let(:stub_file2) { 'stub2.txt' } # rubocop:disable RSpec/IndexedLet
-  let(:stub_content2) { 'CONTENT 222' } # rubocop:disable RSpec/IndexedLet
-  let(:commit_sha1) do # rubocop:disable RSpec/IndexedLet
+  let(:stub_file1) { 'stub1.txt' }
+  let(:stub_content1) { 'CONTENT 111' }
+  let(:stub_file2) { 'stub2.txt' }
+  let(:stub_content2) { 'CONTENT 222' }
+  let(:commit_sha1) do
     git.file(stub_file1).write(stub_content1)
     git.command('add', stub_file1).execute!
     git.command('commit', '-m', 'First commit.').execute!
@@ -22,7 +22,7 @@ RSpec.describe Avm::Tools::Runner::Git::Deploy, :git do # rubocop:disable RSpec/
   end
   let(:target_dir) { File.join(Dir.mktmpdir, 'target') }
 
-  let(:commit_sha2) do # rubocop:disable RSpec/IndexedLet
+  let(:commit_sha2) do
     git.command('checkout', commit_sha1).execute!
     git.file(stub_file1).delete
     git.file(stub_file2).write(stub_content2)
@@ -31,10 +31,10 @@ RSpec.describe Avm::Tools::Runner::Git::Deploy, :git do # rubocop:disable RSpec/
     git.rev_parse('HEAD')
   end
 
-  let(:target_stub_file1) { File.join(target_dir, stub_file1) } # rubocop:disable RSpec/IndexedLet
-  let(:target_stub_file2) { File.join(target_dir, stub_file2) } # rubocop:disable RSpec/IndexedLet
+  let(:target_stub_file1) { File.join(target_dir, stub_file1) }
+  let(:target_stub_file2) { File.join(target_dir, stub_file2) }
 
-  context 'with local target' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+  context 'with local target' do
     before do
       commit_sha1
       avm_tools_runner_run(target_dir)
@@ -43,7 +43,7 @@ RSpec.describe Avm::Tools::Runner::Git::Deploy, :git do # rubocop:disable RSpec/
     it { expect(File.read(target_stub_file1)).to eq(stub_content1) }
     it { expect(File.exist?(target_stub_file2)).to be(false) }
 
-    context 'with second commit' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+    context 'with second commit' do
       before do
         commit_sha2
         avm_tools_runner_run(target_dir)
@@ -54,9 +54,9 @@ RSpec.describe Avm::Tools::Runner::Git::Deploy, :git do # rubocop:disable RSpec/
     end
   end
 
-  context 'with append directories' do # rubocop:disable RSpec/MultipleMemoizedHelpers
-    let(:target_stub_file3) { File.join(target_dir, 'stub3.txt') } # rubocop:disable RSpec/IndexedLet
-    let(:target_stub_file4) { File.join(target_dir, 'stub4.txt') } # rubocop:disable RSpec/IndexedLet
+  context 'with append directories' do
+    let(:target_stub_file3) { File.join(target_dir, 'stub3.txt') }
+    let(:target_stub_file4) { File.join(target_dir, 'stub4.txt') }
 
     before do
       EacConfig::Node.context.current.entry('my_value').value = '123'
@@ -70,9 +70,9 @@ RSpec.describe Avm::Tools::Runner::Git::Deploy, :git do # rubocop:disable RSpec/
     it { expect(File.read(target_stub_file4)).to eq("MyValue: %%MY_VALUE%%\n") }
   end
 
-  context 'with instance' do # rubocop:disable RSpec/MultipleMemoizedHelpers
-    let(:target_stub_file3) { File.join(target_dir, 'stub3.txt') } # rubocop:disable RSpec/IndexedLet
-    let(:target_stub_file4) { File.join(target_dir, 'stub4.txt') } # rubocop:disable RSpec/IndexedLet
+  context 'with instance' do
+    let(:target_stub_file3) { File.join(target_dir, 'stub3.txt') }
+    let(:target_stub_file4) { File.join(target_dir, 'stub4.txt') }
 
     before do
       EacConfig::Node.context.current.entry('my-instance_dev.my_value').value = '123'
@@ -86,7 +86,7 @@ RSpec.describe Avm::Tools::Runner::Git::Deploy, :git do # rubocop:disable RSpec/
     it { expect(File.read(target_stub_file4)).to eq("MyValue: %%MY_VALUE%%\n") }
   end
 
-  context 'with ssh target', :docker do # rubocop:disable RSpec/MultipleMemoizedHelpers
+  context 'with ssh target', :docker do
     let(:ssh_server) { Avm::EacUbuntuBase0::Rspec::SshDockerServer.new }
     let(:env) { ssh_server.env }
     let(:tmpdir) { env.command('mktemp', '-d').execute! }
@@ -109,7 +109,7 @@ RSpec.describe Avm::Tools::Runner::Git::Deploy, :git do # rubocop:disable RSpec/
     it { expect(env.file(target_stub_file1).read).to eq(stub_content1) }
     it { expect(env.file(target_stub_file2).exist?).to be(false) }
 
-    context 'with second commit' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+    context 'with second commit' do
       before do
         commit_sha2
         avm_tools_runner_run(target_url)

data/sub/avm-git/spec/spec_helper/eac_launcher.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+ROOT_DIR = File.expand_path('../..', __dir__)
+
+require 'avm/launcher/context'
+
+RSpec.configure do |config|
+  config.before do
+    require 'avm/launcher/context'
+    Avm::Launcher::Context.current = Avm::Launcher::Context.new(
+      settings_file: File.join(__dir__, 'eac_launcher', 'settings.yml'),
+      cache_root: Dir.mktmpdir
+    )
+    @remotes_dir = Dir.mktmpdir
+    allow(ProgressBar).to receive(:create).and_return(double.as_null_object)
+  end
+
+  def temp_context(settings_path)
+    require 'avm/launcher/context'
+    require 'tmpdir'
+    Avm::Launcher::Context.current = Avm::Launcher::Context.new(
+      projects_root: Dir.mktmpdir, settings_file: settings_path, cache_root: Dir.mktmpdir
+    )
+  end
+
+  def init_remote(name)
+    require 'avm/git/launcher/base'
+    r = Avm::Git::Launcher::Base.new(File.join(@remotes_dir, name))
+    r.init_bare
+    r
+  end
+
+  def init_git(subdir)
+    require 'avm/git/launcher/base'
+    r = Avm::Git::Launcher::Base.new(File.join(Avm::Launcher::Context.current.root.real,
+                                               subdir))
+    r.git
+    r.execute!('config', 'user.email', 'theuser@example.net')
+    r.execute!('config', 'user.name', 'The User')
+    r
+  end
+
+  def touch_commit(repos, subpath)
+    require 'fileutils'
+    FileUtils.mkdir_p(File.dirname(repos.subpath(subpath)))
+    FileUtils.touch(repos.subpath(subpath))
+    repos.execute!('add', repos.subpath(subpath))
+    repos.execute!('commit', '-m', subpath)
+  end
+end

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

@@ -1,4 +1,5 @@
 # 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__)).stub_avm_contexts
+EacRubyUtils.require_sub(__FILE__)

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

@@ -10,25 +10,16 @@ Gem::Specification.new do |s|
   s.authors     = ['Esquilo Azul Company']
   s.summary     = 'Tools for AVM.'
 
-  s.files = Dir['{exe,lib,template,sub}/**/*', 'Gemfile']
+  s.files = Dir['{exe,lib}/**/*', 'Gemfile']
   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.22'
-  s.add_dependency 'avm', '~> 0.86'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.33', '>= 0.33.1'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
-  s.add_dependency 'avm-files', '~> 0.7'
-  s.add_dependency 'avm-git', '~> 0.16'
+  s.add_dependency 'avm', '~> 0.86', '>= 0.86.1'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
-  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_git', '~> 0.16'
   s.add_dependency 'eac_ruby_base0', '~> 0.19'
-  s.add_dependency 'eac_templates', '~> 0.5', '>= 0.5.1'
-  s.add_dependency 'git', '~> 1.19', '>= 1.19.1'
-  s.add_dependency 'ruby-progressbar', '~> 1.13'
 
+  s.add_development_dependency 'avm-git', '~> 0.17'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.8.1'
 end

data/sub/avm-tools/lib/avm/tools/runner/files/format.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'avm/file_formats/search_formatter'
+require 'avm/registry'
 require 'eac_cli/core_ext'
-require 'avm/git/launcher/base'
 
 module Avm
   module Tools
@@ -14,7 +14,7 @@ module Avm
             bool_opt '-a', '--apply', 'Confirm changes.'
             bool_opt '-n', '--no-recursive', 'No recursive.'
             bool_opt '-v', '--verbose', 'Verbose'
-            bool_opt '-d', '--git-dirty', 'Select Git dirty files to format.'
+            bool_opt '-d', '--dirty', 'Select modified files to format.'
             pos_arg :paths, repeat: true, optional: true
           end
 
@@ -28,17 +28,17 @@ module Avm
               ::Avm::FileFormats::SearchFormatter::OPTION_VERBOSE => parsed.verbose? }
           end
 
-          def git
-            @git ||= ::Avm::Git::Launcher::Base.new('.')
+          def scm
+            @scm ||= ::Avm::Registry.scms.detect('.')
           end
 
-          def git_dirty_files
-            git.dirty_files.map { |f| git.root_path.join(f.path) }.select(&:exist?).map(&:to_s)
+          def dirty_files
+            scm.dirty_files.map { |f| scm.root_path.join(f.path) }.select(&:exist?).map(&:to_s)
           end
 
           def source_paths
-            if parsed.git_dirty?
-              parsed.paths + git_dirty_files
+            if parsed.dirty?
+              parsed.paths + dirty_files
             else
               parsed.paths.if_present(%w[.])
             end

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

@@ -9,7 +9,7 @@ module Avm
         class Issue
           require_sub __FILE__
           runner_with :help, :subcommands do
-            desc 'Issue operations within Git.'
+            desc 'Issue operations within source.'
             subcommands
           end
         end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.160.2'
+    VERSION = '0.161.0'
   end
 end

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/require_sub'
+
 module Avm
   module Tools
-    require 'avm/tools/version'
-    require 'avm/tools/git'
+    ::EacRubyUtils.require_sub(__FILE__)
   end
 end

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

@@ -2,6 +2,3 @@
 
 require 'eac_ruby_utils/rspec/default_setup'
 EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))
-
-APP_ROOT = File.expand_path('..', __dir__)
-EacRubyUtils.require_sub(__FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.86.4
+  version: 0.86.5
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.86'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.86.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.86'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.86.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -288,34 +294,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.160'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.160.2
+        version: '0.161'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.160'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.160.2
+        version: '0.161'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -455,6 +455,17 @@ files:
 - sub/avm-git/lib/avm/git/organize/reference_update.rb
 - sub/avm-git/lib/avm/git/organize/repository.rb
 - sub/avm-git/lib/avm/git/revision_test.rb
+- sub/avm-git/lib/avm/git/runners.rb
+- sub/avm-git/lib/avm/git/runners/base.rb
+- sub/avm-git/lib/avm/git/runners/base/commit.rb
+- sub/avm-git/lib/avm/git/runners/base/deploy.rb
+- sub/avm-git/lib/avm/git/runners/base/dirty_files.rb
+- sub/avm-git/lib/avm/git/runners/base/organize.rb
+- sub/avm-git/lib/avm/git/runners/base/revisions_test.rb
+- sub/avm-git/lib/avm/git/runners/base/subrepo.rb
+- sub/avm-git/lib/avm/git/runners/base/subrepo/check.rb
+- sub/avm-git/lib/avm/git/runners/base/subrepo/clone.rb
+- sub/avm-git/lib/avm/git/runners/base/subrepo/fix.rb
 - sub/avm-git/lib/avm/git/scms.rb
 - sub/avm-git/lib/avm/git/scms/git.rb
 - sub/avm-git/lib/avm/git/scms/git/branch.rb
@@ -502,12 +513,21 @@ files:
 - sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename_modify.target.yaml
 - sub/avm-git/spec/lib/avm/git/commit_spec.rb
 - sub/avm-git/spec/lib/avm/git/launcher/base_spec.rb
+- sub/avm-git/spec/lib/avm/git/launcher_stereotypes/git_subrepo/publish_spec.rb
+- sub/avm-git/spec/lib/avm/git/launcher_stereotypes/git_subrepo/publish_spec_settings.yml
+- sub/avm-git/spec/lib/avm/git/launcher_stereotypes/git_subrepo/warp_spec.rb
+- sub/avm-git/spec/lib/avm/git/launcher_stereotypes/git_subrepo/warp_spec_settings.yml
+- sub/avm-git/spec/lib/avm/git/runners/base/deploy_spec.rb
+- sub/avm-git/spec/lib/avm/git/runners/base/deploy_spec_files/append1/stub3.txt.template
+- sub/avm-git/spec/lib/avm/git/runners/base/deploy_spec_files/append2/stub4.txt
 - sub/avm-git/spec/lib/avm/git/scms/git/commit/deploy_spec.rb
 - sub/avm-git/spec/lib/avm/git/scms/git_spec.rb
 - sub/avm-git/spec/lib/avm/git/scms/git_subrepo_spec.rb
 - sub/avm-git/spec/lib/avm/git/vendor/github_spec.rb
 - sub/avm-git/spec/rubocop_spec.rb
 - sub/avm-git/spec/spec_helper.rb
+- sub/avm-git/spec/spec_helper/eac_launcher.rb
+- sub/avm-git/spec/spec_helper/eac_launcher/settings.yml
 - sub/avm-tools/Gemfile
 - sub/avm-tools/README.textile
 - sub/avm-tools/avm-tools.gemspec
@@ -531,16 +551,6 @@ files:
 - sub/avm-tools/lib/avm/tools/runner/files.rb
 - sub/avm-tools/lib/avm/tools/runner/files/format.rb
 - sub/avm-tools/lib/avm/tools/runner/files/rotate.rb
-- sub/avm-tools/lib/avm/tools/runner/git.rb
-- sub/avm-tools/lib/avm/tools/runner/git/commit.rb
-- sub/avm-tools/lib/avm/tools/runner/git/deploy.rb
-- sub/avm-tools/lib/avm/tools/runner/git/dirty_files.rb
-- sub/avm-tools/lib/avm/tools/runner/git/organize.rb
-- sub/avm-tools/lib/avm/tools/runner/git/revisions_test.rb
-- sub/avm-tools/lib/avm/tools/runner/git/subrepo.rb
-- sub/avm-tools/lib/avm/tools/runner/git/subrepo/check.rb
-- sub/avm-tools/lib/avm/tools/runner/git/subrepo/clone.rb
-- sub/avm-tools/lib/avm/tools/runner/git/subrepo/fix.rb
 - sub/avm-tools/lib/avm/tools/runner/instance.rb
 - sub/avm-tools/lib/avm/tools/runner/instance/data.rb
 - sub/avm-tools/lib/avm/tools/runner/instance/data/clear.rb
@@ -583,31 +593,12 @@ files:
 - sub/avm-tools/lib/avm/tools/runner_with/instance_data_performer.rb
 - sub/avm-tools/lib/avm/tools/self.rb
 - sub/avm-tools/lib/avm/tools/version.rb
-- sub/avm-tools/spec/dummy/avm-tools_stub/avm-tools.gemspec
-- sub/avm-tools/spec/dummy/avm-tools_stub/lib/avm/tools.rb
-- sub/avm-tools/spec/dummy/avm-tools_stub/lib/avm/tools/version.rb
-- sub/avm-tools/spec/dummy/ruby_gem_stub/lib/ruby_gem_stub.rb
-- sub/avm-tools/spec/dummy/ruby_gem_stub/lib/ruby_gem_stub/version.rb
-- sub/avm-tools/spec/dummy/ruby_gem_stub/ruby_gem_stub.gemspec
-- sub/avm-tools/spec/lib/avm/git/launcher_stereotypes/git_subrepo/publish_spec.rb
-- sub/avm-tools/spec/lib/avm/git/launcher_stereotypes/git_subrepo/publish_spec_settings.yml
-- sub/avm-tools/spec/lib/avm/git/launcher_stereotypes/git_subrepo/warp_spec.rb
-- sub/avm-tools/spec/lib/avm/git/launcher_stereotypes/git_subrepo/warp_spec_settings.yml
-- sub/avm-tools/spec/lib/avm/launcher/context_spec.rb
-- sub/avm-tools/spec/lib/avm/launcher/context_spec.yml
 - sub/avm-tools/spec/lib/avm/tools/runner/files/rotate_spec.rb
-- 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/launcher_stereotypes/list_spec.rb
 - sub/avm-tools/spec/lib/avm/tools/runner/source/issue/complete_spec.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
-- sub/avm-tools/spec/spec_helper/eac_launcher.rb
-- sub/avm-tools/spec/spec_helper/eac_launcher/settings.yml
-- sub/avm-tools/template/avm/self/docker_image/Dockerfile
-- sub/avm-tools/template/avm/self/docker_image/entrypoint.sh
 - sub/avm/Gemfile
 - sub/avm/avm.gemspec
 - sub/avm/lib/avm.rb
@@ -824,6 +815,12 @@ files:
 - sub/avm/lib/avm/with/extra_subcommands.rb
 - sub/avm/locale/en.yml
 - sub/avm/locale/pt-BR.yml
+- sub/avm/spec/dummy/avm-tools_stub/avm-tools.gemspec
+- sub/avm/spec/dummy/avm-tools_stub/lib/avm/tools.rb
+- sub/avm/spec/dummy/avm-tools_stub/lib/avm/tools/version.rb
+- sub/avm/spec/dummy/ruby_gem_stub/lib/ruby_gem_stub.rb
+- sub/avm/spec/dummy/ruby_gem_stub/lib/ruby_gem_stub/version.rb
+- sub/avm/spec/dummy/ruby_gem_stub/ruby_gem_stub.gemspec
 - sub/avm/spec/lib/avm/applications/base/entries_spec.rb
 - sub/avm/spec/lib/avm/applications/base/entries_spec_files/config.yml
 - sub/avm/spec/lib/avm/applications/base_spec.rb
@@ -831,6 +828,8 @@ files:
 - sub/avm/spec/lib/avm/file_formats/base_spec.rb
 - sub/avm/spec/lib/avm/instances/base_spec.rb
 - sub/avm/spec/lib/avm/instances/base_spec_files/config.yml
+- sub/avm/spec/lib/avm/launcher/context_spec.rb
+- sub/avm/spec/lib/avm/launcher/context_spec.yml
 - sub/avm/spec/lib/avm/launcher/instances/base_spec.rb
 - sub/avm/spec/lib/avm/launcher/instances/base_spec_files/projects/avm-tools_stub/avm-tools.gemspec
 - sub/avm/spec/lib/avm/launcher/instances/base_spec_files/projects/avm-tools_stub/lib/avm/tools.rb
@@ -846,6 +845,10 @@ files:
 - sub/avm/spec/lib/avm/sources/runner_spec.rb
 - sub/avm/spec/rubocop_spec.rb
 - sub/avm/spec/spec_helper.rb
+- sub/avm/spec/spec_helper/eac_launcher.rb
+- sub/avm/spec/spec_helper/eac_launcher/settings.yml
+- sub/avm/template/avm/self/docker_image/Dockerfile
+- sub/avm/template/avm/self/docker_image/entrypoint.sh
 - sub/eac_git/Gemfile
 - sub/eac_git/eac_git.gemspec
 - sub/eac_git/lib/eac_git.rb