eac_tools 0.33.0 → 0.35.0

data/sub/avm-git/spec/lib/avm/git/commit_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'avm/git/commit'
+
+RSpec.describe ::Avm::Git::Commit, git: true do
+  let(:git) { stubbed_git_local_repo }
+
+  let(:first_commit_sha1) do
+    git.file('a.txt').write('AAA')
+    git.file('b.txt').write('BBB')
+    git.command('add', '.').execute!
+    git.command('commit', '-m', 'First commit.').execute!
+    git.rev_parse('HEAD')
+  end
+
+  let(:second_commit_sha1) do
+    first_commit_sha1
+    git.file('a.txt').write('AAAAA')
+    git.file('b.txt').delete
+    git.file('ç.txt').write('CCC')
+    git.command('add', '.').execute!
+    git.command('commit', '-m', 'Second commit.').execute!
+    git.rev_parse('HEAD')
+  end
+
+  let(:first_commit) { described_class.new(git, first_commit_sha1) }
+  let(:second_commit) { described_class.new(git, second_commit_sha1) }
+
+  describe '#files' do
+    it { expect(first_commit.files.count).to eq(2) }
+    it { expect(second_commit.files.count).to eq(3) }
+
+    {
+      'first_commit' => %w[a.txt b.txt],
+      'second_commit' => %w[a.txt b.txt ç.txt]
+    }.each do |commit_name, filenames|
+      filenames.each do |filename|
+        it "find file \"#{filename}\" in commit \"#{commit_name}\"" do
+          commit = send(commit_name)
+          file = commit.files.find { |f| f.path == filename }
+          expect(file).to be_a(::Avm::Git::Commit::File)
+        end
+      end
+    end
+  end
+
+  describe '#files_size' do
+    it { expect(first_commit.files_size).to eq(6) }
+    it { expect(second_commit.files_size).to eq(8) }
+  end
+
+  describe '#root_child?' do
+    it { expect(first_commit.root_child?).to eq(true) }
+    it { expect(second_commit.root_child?).to eq(false) }
+  end
+end

data/sub/avm-git/spec/lib/avm/git/scms/git_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'avm/git/scms/git'
+
+::RSpec.describe ::Avm::Git::Scms::Git do
+  include_examples 'in_avm_registry', 'scms'
+end

data/sub/avm-git/spec/lib/avm/git/scms/git_subrepo_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'avm/git/scms/git_subrepo'
+
+::RSpec.describe ::Avm::Git::Scms::GitSubrepo do
+  include_examples 'in_avm_registry', 'scms'
+end

data/sub/{avm-tools/spec/lib/avm/launcher → avm-git/spec/lib/avm/git}/vendor/github_spec.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/vendor/github'
+require 'avm/git/vendor/github'
 
-RSpec.describe ::Avm::Launcher::Vendor::Github do
+RSpec.describe ::Avm::Git::Vendor::Github do
   describe '#to_ssh_url' do
-    SSH_URL = 'git@github.com:esquilo-azul/eac_launcher.git'
-    NO_SSH_URL = 'https://otherhost.com/esquilo-azul/eac_launcher'
+    SSH_URL = 'git@github.com:esquilo-azul/eac_launcher.git' # rubocop:disable RSpec/LeakyConstantDeclaration
+    NO_SSH_URL = 'https://otherhost.com/esquilo-azul/eac_launcher' # rubocop:disable RSpec/LeakyConstantDeclaration
 
     {
       nil => nil,

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

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

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

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

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

@@ -15,11 +15,11 @@ 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.3'
-  s.add_dependency 'avm', '~> 0.45'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.21'
+  s.add_dependency 'avm', '~> 0.46'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.22'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
-  s.add_dependency 'avm-git', '~> 0.4'
+  s.add_dependency 'avm-git', '~> 0.5'
   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.3'

data/sub/avm-tools/lib/avm/launcher/git/warp_base.rb

@@ -2,7 +2,7 @@
 
 require 'avm/launcher/git/mirror_update'
 require 'avm/launcher/instances/error'
-require 'avm/launcher/vendor/github'
+require 'avm/git/vendor/github'
 require 'avm/projects/stereotypes/git/publish'
 
 module Avm
@@ -59,7 +59,7 @@ module Avm
         end
 
         def target_remote_url
-          ::Avm::Launcher::Vendor::Github.to_ssh_url(source_git.git.remote(source_remote_name).url)
+          ::Avm::Git::Vendor::Github.to_ssh_url(source_git.git.remote(source_remote_name).url)
         end
       end
     end

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

@@ -4,7 +4,7 @@ require 'eac_ruby_utils/simple_cache'
 require 'avm/launcher/git/sub_warp_base'
 require 'avm/launcher/errors/base'
 require 'avm/launcher/paths/real'
-require 'avm/launcher/vendor/github'
+require 'avm/git/vendor/github'
 
 module Avm
   module Projects
@@ -77,7 +77,7 @@ module Avm
           end
 
           def target_remote_url
-            ::Avm::Launcher::Vendor::Github.to_ssh_url(
+            ::Avm::Git::Vendor::Github.to_ssh_url(
               parent_git_warped.subrepo_remote_url(to_parent_git_path)
             )
           end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.137.0'
+    VERSION = '0.139.0'
   end
 end

data/sub/eac_docker/eac_docker.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.96'
-  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_docker/lib/eac_docker/images/templatized.rb

@@ -21,7 +21,7 @@ module EacDocker
         ::EacRubyUtils::Fs::Temp.on_directory do |provide_dir|
           begin
             self.provide_dir = provide_dir
-            template.apply(self, provide_dir)
+            write_in_provide_dir
             coded_image(provide_dir).tag(tag).provide
           ensure
             self.provide_dir = nil
@@ -33,6 +33,12 @@ module EacDocker
         ::EacDocker::Images::Coded.new(provide_dir)
       end
 
+      protected
+
+      def write_in_provide_dir
+        template.apply(self, provide_dir)
+      end
+
       private
 
       attr_writer :provide_dir

data/sub/eac_docker/lib/eac_docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacDocker
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '0.46'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '0.46'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -146,14 +146,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -168,6 +171,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -194,14 +200,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.137'
+        version: '0.139'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.137'
+        version: '0.139'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -475,6 +481,8 @@ files:
 - 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/gemfile_lock.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock/git.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
@@ -611,18 +619,82 @@ files:
 - sub/avm-files/lib/avm/files/version.rb
 - sub/avm-files/spec/rubocop_spec.rb
 - sub/avm-files/spec/spec_helper.rb
+- sub/avm-git/Gemfile
+- sub/avm-git/avm-git.gemspec
+- sub/avm-git/lib/avm/git.rb
+- sub/avm-git/lib/avm/git/auto_commit/commit_info.rb
+- sub/avm-git/lib/avm/git/auto_commit/rules.rb
+- sub/avm-git/lib/avm/git/auto_commit/rules/base.rb
+- sub/avm-git/lib/avm/git/auto_commit/rules/last.rb
+- sub/avm-git/lib/avm/git/auto_commit/rules/manual.rb
+- sub/avm-git/lib/avm/git/auto_commit/rules/new.rb
+- sub/avm-git/lib/avm/git/auto_commit/rules/nth.rb
+- sub/avm-git/lib/avm/git/auto_commit/rules/unique.rb
+- sub/avm-git/lib/avm/git/auto_commit_path.rb
+- sub/avm-git/lib/avm/git/auto_commit_path/ruby.rb
+- sub/avm-git/lib/avm/git/commit.rb
+- sub/avm-git/lib/avm/git/commit/class_methods.rb
+- sub/avm-git/lib/avm/git/commit/deploy.rb
+- sub/avm-git/lib/avm/git/commit/deploy_methods.rb
+- sub/avm-git/lib/avm/git/commit/diff_tree_line.rb
+- sub/avm-git/lib/avm/git/commit/file.rb
+- sub/avm-git/lib/avm/git/file_auto_fixup.rb
+- sub/avm-git/lib/avm/git/issue.rb
+- sub/avm-git/lib/avm/git/issue/complete.rb
+- sub/avm-git/lib/avm/git/issue/complete/commits.rb
+- sub/avm-git/lib/avm/git/issue/complete/git_subrepos.rb
+- sub/avm-git/lib/avm/git/issue/complete/local_branch.rb
+- sub/avm-git/lib/avm/git/issue/complete/local_tag.rb
+- sub/avm-git/lib/avm/git/issue/complete/push.rb
+- sub/avm-git/lib/avm/git/issue/complete/remote.rb
+- sub/avm-git/lib/avm/git/issue/complete/test.rb
+- sub/avm-git/lib/avm/git/issue/complete/tracker.rb
+- sub/avm-git/lib/avm/git/issue/complete/validation.rb
+- sub/avm-git/lib/avm/git/issue/complete/validations.rb
+- sub/avm-git/lib/avm/git/issue/complete/working_tree.rb
+- sub/avm-git/lib/avm/git/issue/deliver.rb
+- sub/avm-git/lib/avm/git/organize.rb
+- 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/scms.rb
+- sub/avm-git/lib/avm/git/scms/git.rb
+- sub/avm-git/lib/avm/git/scms/git/change_tracker.rb
+- sub/avm-git/lib/avm/git/scms/git/commit.rb
+- sub/avm-git/lib/avm/git/scms/git_subrepo.rb
+- sub/avm-git/lib/avm/git/scms/provider.rb
+- sub/avm-git/lib/avm/git/subrepo_check.rb
+- sub/avm-git/lib/avm/git/subrepo_check/parent.rb
+- sub/avm-git/lib/avm/git/subrepo_check/remote.rb
+- sub/avm-git/lib/avm/git/subrepo_check/show_result.rb
+- sub/avm-git/lib/avm/git/subrepo_checks.rb
+- sub/avm-git/lib/avm/git/vendor.rb
+- sub/avm-git/lib/avm/git/vendor/github.rb
+- sub/avm-git/lib/avm/git/version.rb
+- sub/avm-git/spec/lib/avm/git/auto_commit_path_spec.rb
+- sub/avm-git/spec/lib/avm/git/commit/deploy_spec.rb
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec.rb
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.source.out
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/add.target.yaml
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/modify.source.out
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/modify.target.yaml
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/remove.source.out
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/remove.target.yaml
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename.source.out
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename.target.yaml
+- sub/avm-git/spec/lib/avm/git/commit/diff_tree_line_spec_files/rename_modify.source.out
+- 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/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-tools/Gemfile
 - sub/avm-tools/README.textile
 - sub/avm-tools/avm-tools.gemspec
 - sub/avm-tools/exe/avm
 - sub/avm-tools/lib/avm.rb
-- sub/avm-tools/lib/avm/launcher/context.rb
-- sub/avm-tools/lib/avm/launcher/context/instance_collector.rb
-- sub/avm-tools/lib/avm/launcher/context/instance_discovery.rb
-- sub/avm-tools/lib/avm/launcher/context/instance_manager.rb
-- sub/avm-tools/lib/avm/launcher/context/instance_manager/cached_instance.rb
-- sub/avm-tools/lib/avm/launcher/context/instance_manager/cached_instances.rb
-- sub/avm-tools/lib/avm/launcher/context/settings.rb
 - sub/avm-tools/lib/avm/launcher/git.rb
 - sub/avm-tools/lib/avm/launcher/git/base.rb
 - sub/avm-tools/lib/avm/launcher/git/base/class_methods.rb
@@ -637,22 +709,13 @@ files:
 - sub/avm-tools/lib/avm/launcher/git/sub_warp_base.rb
 - sub/avm-tools/lib/avm/launcher/git/warp_base.rb
 - sub/avm-tools/lib/avm/launcher/instances.rb
-- sub/avm-tools/lib/avm/launcher/instances/base.rb
-- sub/avm-tools/lib/avm/launcher/instances/base/cache.rb
-- sub/avm-tools/lib/avm/launcher/instances/error.rb
-- sub/avm-tools/lib/avm/launcher/instances/runner_helper.rb
-- sub/avm-tools/lib/avm/launcher/instances/settings.rb
 - sub/avm-tools/lib/avm/launcher/paths.rb
-- sub/avm-tools/lib/avm/launcher/paths/logical.rb
 - sub/avm-tools/lib/avm/launcher/project.rb
 - sub/avm-tools/lib/avm/launcher/publish.rb
-- sub/avm-tools/lib/avm/launcher/publish/base.rb
 - sub/avm-tools/lib/avm/launcher/ruby.rb
 - sub/avm-tools/lib/avm/launcher/ruby/gem.rb
 - sub/avm-tools/lib/avm/launcher/ruby/gem/build.rb
 - sub/avm-tools/lib/avm/launcher/ruby/gem/specification.rb
-- sub/avm-tools/lib/avm/launcher/vendor.rb
-- sub/avm-tools/lib/avm/launcher/vendor/github.rb
 - sub/avm-tools/lib/avm/patches.rb
 - sub/avm-tools/lib/avm/patches/i18n.rb
 - sub/avm-tools/lib/avm/projects.rb
@@ -711,10 +774,6 @@ files:
 - sub/avm-tools/lib/avm/tools/runner/source/issue.rb
 - sub/avm-tools/lib/avm/tools/runner/source/issue/complete.rb
 - sub/avm-tools/lib/avm/tools/runner/source/issue/deliver.rb
-- sub/avm-tools/lib/avm/tools/runner/source/ruby.rb
-- sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler.rb
-- sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler/gemfile_lock.rb
-- sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler/gemfile_lock/git.rb
 - sub/avm-tools/lib/avm/tools/runner/source/subs.rb
 - sub/avm-tools/lib/avm/tools/runner/source/test.rb
 - sub/avm-tools/lib/avm/tools/runner/source/update.rb
@@ -737,7 +796,6 @@ files:
 - sub/avm-tools/spec/lib/avm/launcher/instances/base_spec.rb
 - sub/avm-tools/spec/lib/avm/launcher/ruby/gem/build_spec.rb
 - sub/avm-tools/spec/lib/avm/launcher/ruby/gem/specification_spec.rb
-- sub/avm-tools/spec/lib/avm/launcher/vendor/github_spec.rb
 - sub/avm-tools/spec/lib/avm/projects/stereotypes/git_subrepo/publish_spec.rb
 - sub/avm-tools/spec/lib/avm/projects/stereotypes/git_subrepo/publish_spec_settings.yml
 - sub/avm-tools/spec/lib/avm/projects/stereotypes/git_subrepo/warp_spec.rb
@@ -849,9 +907,23 @@ files:
 - sub/avm/lib/avm/instances/docker_image.rb
 - sub/avm/lib/avm/instances/entry_keys.rb
 - sub/avm/lib/avm/instances/runner.rb
+- sub/avm/lib/avm/launcher/context.rb
+- sub/avm/lib/avm/launcher/context/instance_collector.rb
+- sub/avm/lib/avm/launcher/context/instance_discovery.rb
+- sub/avm/lib/avm/launcher/context/instance_manager.rb
+- sub/avm/lib/avm/launcher/context/instance_manager/cached_instance.rb
+- sub/avm/lib/avm/launcher/context/instance_manager/cached_instances.rb
+- sub/avm/lib/avm/launcher/context/settings.rb
 - sub/avm/lib/avm/launcher/errors/base.rb
 - sub/avm/lib/avm/launcher/errors/non_project.rb
+- sub/avm/lib/avm/launcher/instances/base.rb
+- sub/avm/lib/avm/launcher/instances/base/cache.rb
+- sub/avm/lib/avm/launcher/instances/error.rb
+- sub/avm/lib/avm/launcher/instances/runner_helper.rb
+- sub/avm/lib/avm/launcher/instances/settings.rb
+- sub/avm/lib/avm/launcher/paths/logical.rb
 - sub/avm/lib/avm/launcher/paths/real.rb
+- sub/avm/lib/avm/launcher/publish/base.rb
 - sub/avm/lib/avm/launcher/publish/check_result.rb
 - sub/avm/lib/avm/path_string.rb
 - sub/avm/lib/avm/registry.rb

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

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/launcher/vendor/github'

data/sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler/gemfile_lock/git.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_base0/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Source < ::Avm::Sources::Runner
-        class Ruby
-          class Bundler
-            class GemfileLock
-              module Git
-                private
-
-                def git_continue
-                  return unless check_capability(__method__, :git_repo, :continue)
-
-                  infom "Adding \"#{gemfile_lock}\"..."
-                  instance.git_repo.command('add', gemfile_lock).execute!
-                  if rebase_conflict?
-                    git_continue_run('rebase')
-                  elsif cherry_conflict?
-                    git_continue_run('cherry-pick')
-                  else
-                    raise 'Unknown how to continue'
-                  end
-                end
-
-                def git_continue_run(command)
-                  infom "\"#{command}\" --continue..."
-                  cmd = instance.git_repo.command(command, '--continue')
-                          .envvar('GIT_EDITOR', 'true')
-                  return unless !cmd.system && !conflict?
-
-                  fatal_error "\"#{cmd}\" failed and there is no conflict"
-                end
-
-                def git_reset_checkout
-                  return unless check_capability(__method__, :git_repo, nil)
-
-                  git_reset_gemfile_lock
-                  git_checkout_gemfile_lock
-                end
-
-                def git_checkout_gemfile_lock
-                  infom 'Checkouting...'
-                  instance.git_repo.command('checkout', '--', gemfile_lock).system!
-                end
-
-                def git_reset_gemfile_lock
-                  infom 'Reseting...'
-                  instance.git_repo.command('reset', gemfile_lock).system! if
-                  ::File.exist?(gemfile_lock)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler/gemfile_lock.rb

@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_base0/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Source < ::Avm::Sources::Runner
-        class Ruby
-          class Bundler
-            class GemfileLock
-              require_sub __FILE__, include_modules: true
-              runner_with :help do
-                desc 'Manipulage a "Gemfile.lock" file.'
-                bool_opt '-c', '--continue', 'Continue Git rebase/cherry-pick.'
-                bool_opt '-i', '--install', 'Run "bundle install".'
-                bool_opt '-u', '--update', 'Run "bundle update".'
-                bool_opt '-r', '--recursive', 'Run until Git rebase/cherry-pick is finished.'
-                bool_opt '-a', '--all', 'Same as "-cirud".'
-                bool_opt '-d', '--delete', 'Delete Gemfile.lock'
-              end
-
-              def run
-                loop do
-                  git_reset_checkout
-                  delete_gemfile_lock
-                  bundle_update
-                  bundle_install
-                  git_continue
-                  break if complete?
-                end
-              end
-
-              private
-
-              def complete?
-                !option_or_all?(:recursive) || !conflict?
-              end
-
-              def delete_gemfile_lock
-                return unless check_capability(__method__, nil, :delete)
-
-                ::FileUtils.rm_f(gemfile_lock)
-              end
-
-              def rebasing?
-                instance.git_repo.root_path.join('.git', 'rebase-merge').exist?
-              end
-
-              def bundle_install
-                return unless check_capability(__method__, :ruby_gem, :install)
-
-                infom '"bundle install"...'
-                bundle_run('install')
-              end
-
-              def bundle_update
-                return unless check_capability(__method__, :ruby_gem, :update)
-
-                infom '"bundle update"...'
-                bundle_run('update')
-              end
-
-              def gemfile_lock
-                'Gemfile.lock'
-              end
-
-              def bundle_run(*args)
-                instance.ruby_gem.bundle(*args).system!
-              end
-
-              def conflict?
-                rebase_conflict? || cherry_conflict?
-              end
-
-              def rebase_conflict?
-                instance.git_repo.root_path.join('.git', 'REBASE_HEAD').exist?
-              end
-
-              def cherry_conflict?
-                instance.git_repo.root_path.join('.git', 'CHERRY_PICK_HEAD').exist?
-              end
-
-              def option_or_all?(option)
-                parsed[option] || parsed.all?
-              end
-
-              def instance
-                runner_context.call(:instance)
-              end
-
-              def check_capability(caller, capability, option)
-                return false unless option.blank? || option_or_all?(option)
-                return true if capability.if_present(true) { |v| instance.respond_to?(v) }
-
-                warn "Cannot run #{caller}: instance has no capability \"#{capability}\""
-                false
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_base0/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Source < ::Avm::Sources::Runner
-        class Ruby
-          class Bundler
-            require_sub __FILE__
-            runner_with :help, :subcommands do
-              desc 'Ruby\'s bundler utitilies for local projects.'
-              subcommands
-            end
-          end
-        end
-      end
-    end
-  end
-end