avm-tools 0.160.2 → 0.161.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b154f50057111e84c1d82da312b7112d9ab8bb5e0edfd5e30d978e6c131d5c
-  data.tar.gz: 98d34402b51f7e4067f47474c6a1871d94b03b54aaea7b527bf2891696467892
+  metadata.gz: 18e8fb1811160fff4ea550cd00d4dc07df7b6dfc04a479ada4fde54262b05525
+  data.tar.gz: a0f392810689ed69690988ad4335041cb5db89debea91df60534f98a49603d93
 SHA512:
-  metadata.gz: '092a678bd40b041317079126e5a5522c79e31b78019974f0e44b16700bb700ba91a8198d0e94814e66037750ec970a52724a010d215a043e69b3303451c53cdc'
-  data.tar.gz: eaa62db1a42bca9180b09ce0c8ba08c5c591cbbe2e55a1d86ae1cfd44d7f6b0fae35eb36ac2007c235329f60526c4cde94b8020c630accae5bc5414847bc20ff
+  metadata.gz: 63b61dc16475acf7604a8f171b4965171826e530f2a6faab121ef4e868e34cd3810ced5548c75f05d382596f4cec9a26b219f202633924c80fd060a559658254
+  data.tar.gz: 6b094b1d1c838f1514b33855e7000d6ca201747c6996d91148bbe20abf4e98ada529ea26692767652bd0be72714b59644cf87991a6ada50986187d9df749ce1c

data/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/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/lib/avm/tools/version.rb

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

data/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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.160.2
+  version: 0.161.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 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: aranha-parsers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
@@ -31,75 +17,19 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.86'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.86'
-- !ruby/object:Gem::Dependency
-  name: avm-eac_ruby_base1
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.33'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.33.1
+        version: 0.86.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: '0.86'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.33.1
-- !ruby/object:Gem::Dependency
-  name: avm-eac_ubuntu_base0
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: avm-files
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: avm-git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.86.1
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -120,40 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-- !ruby/object:Gem::Dependency
-  name: eac_git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_base0
   requirement: !ruby/object:Gem::Requirement
@@ -169,59 +65,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: eac_templates
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.19'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.19.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.19'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.19.1
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
+  name: avm-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :runtime
+        version: '0.17'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -264,16 +120,6 @@ files:
 - lib/avm/tools/runner/files.rb
 - lib/avm/tools/runner/files/format.rb
 - lib/avm/tools/runner/files/rotate.rb
-- lib/avm/tools/runner/git.rb
-- lib/avm/tools/runner/git/commit.rb
-- lib/avm/tools/runner/git/deploy.rb
-- lib/avm/tools/runner/git/dirty_files.rb
-- lib/avm/tools/runner/git/organize.rb
-- lib/avm/tools/runner/git/revisions_test.rb
-- lib/avm/tools/runner/git/subrepo.rb
-- lib/avm/tools/runner/git/subrepo/check.rb
-- lib/avm/tools/runner/git/subrepo/clone.rb
-- lib/avm/tools/runner/git/subrepo/fix.rb
 - lib/avm/tools/runner/instance.rb
 - lib/avm/tools/runner/instance/data.rb
 - lib/avm/tools/runner/instance/data/clear.rb
@@ -316,8 +162,6 @@ files:
 - lib/avm/tools/runner_with/instance_data_performer.rb
 - lib/avm/tools/self.rb
 - lib/avm/tools/version.rb
-- template/avm/self/docker_image/Dockerfile
-- template/avm/self/docker_image/entrypoint.sh
 homepage: 
 licenses: []
 metadata: {}

data/lib/avm/tools/runner/git/commit.rb

@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/simple_cache'
-require 'avm/git/launcher/base'
-require 'filesize'
-require 'avm/git/commit'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class Commit
-          runner_with :help do
-            desc 'Mostra informações de um commit.'
-            bool_opt '-f', '--files', 'Mostra os arquivos.'
-            bool_opt '-s', '--size', 'Mostra o tamanho de arquivos.'
-            pos_arg :ref
-          end
-
-          def run
-            input_banner
-            validate
-            main_info_banner
-            files_banner
-            size_banner
-          end
-
-          private
-
-          def input_banner
-            infov 'Repository', git
-            infov 'Reference', reference
-          end
-
-          def validate
-            return if reference_id.present?
-
-            fatal_error "Object ID not found for reference \"#{reference}\""
-          end
-
-          def main_info_banner
-            infov 'Reference ID', reference_id
-            infov 'Subject', commit.subject
-            infov 'Author', commit.author_all
-            infov 'Commiter', commit.commiter_all
-            infov 'Files', commit.files.count
-          end
-
-          def size_banner
-            return unless show_size?
-
-            infov 'Total files size', bytes_size(commit.files_size)
-          end
-
-          def files_banner
-            return unless parsed.files?
-
-            commit.files.each do |file|
-              infov "  #{file.path}", file_value(file)
-            end
-          end
-
-          def file_value(file)
-            s = file.status
-            s += ", #{bytes_size(file.dst_size)}" if show_size?
-            s
-          end
-
-          def reference_id
-            git.rev_parse(reference)
-          end
-
-          def reference
-            parsed.ref
-          end
-
-          def git_uncached
-            ::Avm::Git::Launcher::Base.new(runner_context.call(:repository_path))
-          end
-
-          def commit_uncached
-            ::Avm::Git::Commit.new(git, reference_id)
-          end
-
-          def human_files_size
-            ::Filesize.from("#{commit.files_size} B").pretty
-          end
-
-          def bytes_size(size)
-            b = "#{size} B"
-            "#{::Filesize.from(b).pretty} (#{b})"
-          end
-
-          def show_size?
-            parsed.size?
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/git/deploy.rb

@@ -1,111 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/scms/git'
-require 'eac_config/node'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class Deploy
-          DEFAULT_REFERENCE = 'HEAD'
-
-          runner_with :help do
-            desc 'Deploy a Git revision to a location (Local or remote).'
-            arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
-            arg_opt '-i', '--instance', 'Read entries from instance with id=<instance-id>.'
-            arg_opt '-r', '--reference', "Reference (default: #{DEFAULT_REFERENCE})."
-            pos_arg :target_url, optional: true
-          end
-
-          def run
-            input_banner
-            validate
-            main_info_banner
-            deploy
-            success 'Done'
-          end
-
-          private
-
-          def input_banner
-            infov 'Repository', git
-            infov 'Reference', reference
-            infov 'Instance ID', instance_id.if_present('- BLANK -')
-            infov 'Appended directories', appended_directories
-            infov 'Target URL', target_url
-          end
-
-          def validate
-            if reference_sha1.blank?
-              fatal_error "Object ID not found for reference \"#{reference}\""
-            end
-            fatal_error 'Nor <target-url> nor --instance was setted' if target_url.blank?
-          end
-
-          def main_info_banner
-            infov 'Reference SHA1', reference_sha1
-          end
-
-          def reference_sha1_uncached
-            git.git_repo.rev_parse(reference)
-          end
-
-          def reference
-            parsed.reference || DEFAULT_REFERENCE
-          end
-
-          def git_uncached
-            ::Avm::Git::Scms::Git.new(git_repository_path)
-          end
-
-          def git_repository_path
-            if runner_context.call(:repository_path) || dev_instance_fs_path.blank?
-              return runner_context.call(:repository_path)
-            end
-
-            dev_instance_fs_path
-          end
-
-          def dev_instance_fs_path
-            instance.if_present do |v|
-              v.application.instance('dev').read_entry_optional(
-                ::Avm::Instances::EntryKeys::INSTALL_PATH
-              )
-            end
-          end
-
-          def deploy
-            git.commit(reference_sha1)
-              .deploy_to_url(target_url)
-              .append_templatized_directories(appended_directories)
-              .variables_source_set(variables_source)
-              .run
-          end
-
-          def target_url
-            parsed.target_url.if_present { |v| return v }
-            instance.if_present { |v| return v.install_url }
-            nil
-          end
-
-          def variables_source
-            instance || ::EacConfig::Node.context.current
-          end
-
-          def instance_uncached
-            instance_id.if_present { |v| ::Avm::Instances::Base.by_id(v) }
-          end
-
-          def instance_id
-            parsed.instance
-          end
-
-          def appended_directories
-            parsed.append_dirs.to_s.split(':')
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/git/dirty_files.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/tools/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class DirtyFiles
-          DEFAULT_FORMAT = '%p'
-          FIELDS = {
-            i: :index, w: :worktree, p: :path, a: :absolute_path
-          }.transform_keys { |k| "%#{k}" }
-
-          runner_with :help do
-            desc 'Lists dirty files in Git repository.'
-            arg_opt '-f', '--format',
-                    "Format of each line (See \"Format fields\") [default: #{DEFAULT_FORMAT}]."
-          end
-
-          def help_extra_text
-            "Format fields:\n" + FIELDS.map { |k, v| "  #{k} => #{v}" }.join("\n") # rubocop:disable Style/StringConcatenation
-          end
-
-          def run
-            runner_context.call(:git).dirty_files.each do |file|
-              out("#{format_file(file)}\n")
-            end
-          end
-
-          private
-
-          def format
-            parsed.format || DEFAULT_FORMAT
-          end
-
-          def format_file(file)
-            FIELDS.inject(format) { |a, e| a.gsub(e.first, file.send(e.last)) }
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/git/organize.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/git/organize/repository'
-require 'eac_cli/default_runner'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class Organize
-          runner_with :help do
-            desc 'Organize branches.'
-            bool_opt '-a', '--all', 'Run all organizations.'
-            bool_opt '-n', '--no', 'Do not run operations.'
-            bool_opt '-o', '--originals', 'Remove refs/original branches.'
-            bool_opt '-s', '--subrepos', 'Remove git-subrepo branches.'
-            bool_opt '-y', '--yes', 'Run operations without confirmation.'
-          end
-
-          def run
-            start_banner
-            collect_references
-            after_collect_banner
-            run_operations
-          end
-
-          private
-
-          def after_collect_banner
-            infov 'Collected references', repository.collected_references.count
-            repository.collected_references.each do |ru|
-              infov "  * #{ru.reference}", ru.operation
-            end
-          end
-
-          def collect?(type)
-            parsed.fetch(type) || parsed.all?
-          end
-
-          def collect_references
-            %w[subrepos originals].each do |type|
-              repository.send("collect_#{type}") if collect?(type)
-            end
-          end
-
-          def run_operations
-            return warn('No operations to run (Run with --help to see options)') if
-            repository.collected_references.empty?
-            return unless run_operations?
-
-            repository.collected_references.each do |ru|
-              info "Doing operation #{ru}..."
-              ru.run_operation
-            end
-          end
-
-          def run_operations?
-            return true if parsed.yes?
-            return false if parsed.no?
-
-            input('Confirm operations?', bool: true)
-          end
-
-          def repository_uncached
-            ::Avm::Git::Organize::Repository.new(runner_context.call(:git).eac_git)
-          end
-
-          def start_banner
-            infov 'Repository', repository
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/git/revisions_test.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/tools/core_ext'
-require 'avm/git/revision_test'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class RevisionsTest
-          runner_with :help do
-            desc 'Test multiple revisions until a error is found.'
-            arg_opt '-c', '--command', 'Command to test instance.'
-            bool_opt '-n', '--no-cache', 'Does not use cache.'
-          end
-
-          def run
-            fatal_error('Repository is dirty') if runner_context.call(:git).dirty?
-
-            return_to_branch_on_end do
-              infov 'Revisions found', revisions.count
-              if revision_with_error
-                warn("First revision with error: #{revision_with_error}")
-              else
-                success('No error found in revisions')
-              end
-            end
-          end
-
-          private
-
-          def return_to_branch_on_end
-            current_branch = runner_context.call(:git).current_branch
-            yield
-          ensure
-            infom "Returning to original branch \"#{current_branch}\""
-            runner_context.call(:git).execute!('checkout', current_branch)
-          end
-
-          def revision_with_error_uncached
-            revision_with_error = nil
-            revisions.each do |revision|
-              revision.banner
-              unless revision.successful?
-                revision_with_error = revision
-                break
-              end
-            end
-            revision_with_error
-          end
-
-          def revisions_uncached
-            runner_context.call(:git).execute!('log', '--pretty=format:%H', 'origin/master..HEAD')
-              .each_line.map(&:strip).reverse.map do |sha1|
-              ::Avm::Git::RevisionTest.new(runner_context.call(:git), sha1, test_revision_options)
-            end
-          end
-
-          def test_revision_options
-            { test_command: parsed.command, no_cache: parsed.no_cache? }
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/git/subrepo/check.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/tools/core_ext'
-require 'eac_git/local'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class Subrepo
-          class Check
-            runner_with :help do
-              desc 'Check status of subrepos.'
-              bool_opt '-a', '--all', 'Select all subrepos.'
-              bool_opt '-f', '--fix-parent', 'Fix parent SHA1.'
-              bool_opt '-n', '--no-error', 'Do not exit with error if check fails.'
-              bool_opt '-r', '--remote', 'Check subrepos remote.'
-              pos_arg :subrepos, repeat: true, optional: true
-            end
-
-            def run
-              subrepo_checks.show_result
-              return if parsed.no_error?
-              return unless subrepo_checks.result.error?
-
-              fatal_error 'Failed'
-            end
-
-            private
-
-            def subrepo_checks_uncached
-              r = ::Avm::Git::SubrepoChecks.new(local_repos)
-              r.check_remote = parsed.remote?
-              r.fix_parent = parsed.fix_parent?
-              r.add_all_subrepos if parsed.all?
-              r.add_subrepos(*parsed.subrepos)
-              r
-            end
-
-            def local_repos_uncached
-              ::EacGit::Local.new(runner_context.call(:git))
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/git/subrepo/clone.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/tools/core_ext'
-require 'eac_git/local'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class Subrepo
-          class Clone
-            runner_with :help do
-              desc 'Clone git-subrepo repositories.'
-              arg_opt '-b', '--branch', 'Branch.'
-              arg_opt '-d', '--parent-dir', 'Target path\'s parent directory.'
-              pos_arg :url
-              pos_arg :target_path, optional: true
-            end
-
-            def run
-              start_banner
-              clean
-              clone
-            end
-
-            private
-
-            def start_banner
-              infov 'URL', url
-              infov 'Subpath', target_path
-              infov 'Branch', branch
-            end
-
-            def clean
-              infom 'Cleaning...'
-              git.command('subrepo', 'clean', '--all', '--force').system!
-            end
-
-            def clone
-              infom 'Cloning...'
-              infov 'Clone arguments', clone_args
-              git.command(*clone_args).system!
-            end
-
-            delegate :branch, :url, to: :parsed
-
-            def git_uncached
-              ::EacGit::Local.new('.')
-            end
-
-            def clone_args
-              ['subrepo'] + branch.if_present([]) { |v| ['--branch', v] } +
-                if ::File.exist?(target_path)
-                  ['init', target_path, '--remote', url]
-                else
-                  ['clone', url, target_path, '--message', clone_message, '--force']
-                end
-            end
-
-            def clone_message
-              "Subrepo \"#{target_path}\" (#{url})."
-            end
-
-            def repos_name_from_url
-              %r{/([^/]+)\z}.if_match(url, false) { |m| m[1].gsub(/\.git\z/, '') }
-            end
-
-            def target_path
-              parsed.target_path || target_path_from_parent_dir ||
-                fatal_error('No target path specified')
-            end
-
-            def target_path_from_parent_dir
-              return nil unless parsed.parent_dir && repos_name_from_url
-
-              ::File.join(parsed.parent_dir, repos_name_from_url)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/git/subrepo/fix.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/tools/core_ext'
-require 'avm/git/scms/git'
-require 'avm/git/subrepo_checks'
-require 'avm/scms/auto_commit/rules/unique'
-require 'avm/scms/auto_commit/for_file'
-require 'eac_git/local'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class Subrepo
-          class Fix
-            runner_with :help do
-              desc 'Fix git-subrepos\' parent property.'
-            end
-
-            def run
-              loop do
-                break if fix
-
-                amend_each
-                rebase_fixup
-              end
-            end
-
-            private
-
-            def amend_each
-              infov 'Dirty files', local_repos.dirty_files.count
-              local_repos.dirty_files.each do |file|
-                infov '  * Ammending', file.path
-                ::Avm::Scms::AutoCommit::ForFile.new(
-                  git_scm, file.path,
-                  [::Avm::Scms::AutoCommit::Rules::Unique.new]
-                ).run
-              end
-            end
-
-            def fix
-              infom 'Checking/fixing...'
-              c = new_check(true)
-              c.show_result
-              !c.result.error?
-            end
-
-            # @return [Avm::Git::Scms::Git]
-            def git_scm_uncached
-              ::Avm::Git::Scms::Git.new(runner_context.call(:git).root_path)
-            end
-
-            def new_check(fix_parent = false) # rubocop:disable Style/OptionalBooleanParameter
-              r = ::Avm::Git::SubrepoChecks.new(local_repos).add_all_subrepos
-              r.fix_parent = fix_parent
-              r
-            end
-
-            def local_repos_uncached
-              ::EacGit::Local.new(runner_context.call(:git))
-            end
-
-            def rebase_fixup
-              local_repos.command('rebase', '-i', 'origin/master', '--autosquash').envvar(
-                'GIT_SEQUENCE_EDITOR', 'true'
-              ).or(
-                local_repos.command('rebase', '--continue').envvar('GIT_SEQUENCE_EDITOR', 'true')
-              ).system!
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/git/subrepo.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/tools/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        class Subrepo
-          require_sub __FILE__
-          runner_with :help, :subcommands do
-            desc 'Git-subrepo (https://github.com/ingydotnet/git-subrepo) utilities.'
-            subcommands
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/git.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/tools/core_ext'
-require 'avm/git/launcher/base'
-
-module Avm
-  module Tools
-    class Runner
-      class Git
-        require_sub __FILE__
-        runner_with :help, :subcommands do
-          desc 'Git utilities for AVM.'
-          arg_opt '-C', '--path', 'Path to Git repository.'
-          subcommands
-        end
-
-        def repository_path
-          repository_path? ? parsed.path : '.'
-        end
-
-        def repository_path?
-          parsed.path.present?
-        end
-
-        def git
-          @git ||= ::Avm::Git::Launcher::Base.by_root(repository_path)
-        end
-
-        # @return [[EacGit::Local]]
-        def git_repo
-          git.eac_git
-        end
-      end
-    end
-  end
-end

data/template/avm/self/docker_image/Dockerfile

@@ -1,17 +0,0 @@
-FROM ruby:2.5
-RUN gem install avm-tools
-
-RUN apt-get update && apt-get -y --no-install-recommends install \
-    ca-certificates \
-    curl
-
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.4/gosu-$(dpkg --print-architecture)" \
-    && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.4/gosu-$(dpkg --print-architecture).asc" \
-    && gpg --verify /usr/local/bin/gosu.asc \
-    && rm /usr/local/bin/gosu.asc \
-    && chmod +x /usr/local/bin/gosu
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD []

data/template/avm/self/docker_image/entrypoint.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Add local user
-# Either use the LOCAL_USER_ID if passed in at runtime or
-# fallback
-
-USER_ID=${LOCAL_USER_ID:-9001}
-
-echo "Starting with UID : $USER_ID"
-useradd --shell /bin/bash -u $USER_ID -o -c "" -m user
-export HOME=/home/user
-exec /usr/local/bin/gosu user avm "$@"