avm-tools 0.102.1 → 0.104.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6182ce43a4fee65202cfec5b9134751ac9b15fb6df367b1393331263264339ef
-  data.tar.gz: 5ecb6def157bb85b53115f4bfe3fcda93f290c0a720a16969577d0606de9b1f9
+  metadata.gz: 4585c23cae62880e31d062cc01fbef21cd4736371756e717eaef78ddf16291bc
+  data.tar.gz: 7f45edf7e390d0ca3fbaf0de62ce51820090d9fc1fe5e692b9e6c0a6624efb3a
 SHA512:
-  metadata.gz: bd57b81fdfb81500e6426f17c7e981d141547a174e13d6e109a11b16db0987773bf6ab82269d025da663cb6872464ff883d2367a9809f9a5cb878472c09ac380
-  data.tar.gz: 17af742c5cf348bb9efec3551000f3ce5f0cd79010d2522b2239c61dc4b294dd9e0806e322a6c81a00401171ef87c5710da5ed9757ec0710a7d0f2c2fa60244b
+  metadata.gz: 1fa3e825fae8f70e9defcb19e44252ecd10872cf250fe043dfb8a6e40a5ccd12f6ce159f94afe602ad23a435e2e8ed84381d165f6498cb85ecfb6cdd3efe9033
+  data.tar.gz: 426f5496fe6e1701dc078f02ccd038d932a09fc362da23a89c9ce1e883ba0a515e1562031d0faaf0c817717a4fc92899af8820484297e0b183f860df33036f8d

data/lib/avm/data/package/dump.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/files/rotate'
 require 'minitar'
 

data/lib/avm/instances/base/dockerizable.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_docker/executables'
 require 'eac_ruby_utils/core_ext'
 require 'avm/docker/container'
 
@@ -16,7 +17,7 @@ module Avm
         end
 
         def docker_container_exist?
-          ::Avm::Executables.docker.command.append(
+          ::EacDocker::Executables.docker.command.append(
             ['ps', '-qaf', "name=#{docker_container_name}"]
           ).execute!.present?
         end

data/lib/avm/launcher/instances/runner_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Launcher

data/lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/patches/eac_ruby_gems_utils/gem'
-require 'avm/version'
+require 'avm/version_number'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -15,7 +15,7 @@ module Avm
           end
 
           def version
-            ruby_gem.version.if_present { |v| ::Avm::Version.new(v) }
+            ruby_gem.version.if_present { |v| ::Avm::VersionNumber.new(v) }
           end
 
           def version=(value)

data/lib/avm/self/instance.rb

@@ -12,6 +12,10 @@ module Avm
         ::Avm::Self::DockerImage
       end
 
+      def docker_registry
+        read_entry(::Avm::Self::Instance::EntryKeys::DOCKER_REGISTRY_NAME)
+      end
+
       def docker_run_arguments
         ['-e', "LOCAL_USER_ID=#{::Process.uid}"]
       end

data/lib/avm/tools/runner/app_src/eac_asciidoctor_base0/build.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/eac_asciidoctor_base0/sources/build'
 require 'os'
 

data/lib/avm/tools/runner/app_src/info.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools

data/lib/avm/tools/runner/app_src/test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools

data/lib/avm/tools/runner/app_src/update.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools

data/lib/avm/tools/runner/app_src/version_bump.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/version'
+require 'avm/version_number'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -63,7 +63,7 @@ module Avm
           end
 
           def target_version_from_new(_current, option_value)
-            ::Avm::Version.new(option_value)
+            ::Avm::VersionNumber.new(option_value)
           end
 
           def target_version_from_segment(current, option_value)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools

data/lib/avm/tools/runner/config/load_path.rb

@@ -2,7 +2,7 @@
 
 require 'avm/apps/config'
 require 'avm/self'
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/launcher/git/base'
 
 module Avm

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

@@ -19,6 +19,7 @@ module Avm
           end
 
           def run
+            runner_context.call(:git).command('reset', 'HEAD').system!
             format_files
             files.each do |file|
               ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file, rules).run

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/git/issue/complete'
 
 module Avm
@@ -8,81 +8,10 @@ module Avm
     class Runner
       class Git
         class Issue
-          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 '--complete', 'Run complete task.'
-            bool_opt '--deliver', 'Run "deliver" task.'
-            bool_opt '--validate', 'Validate for "complete" task.'
-          end
-
-          def run
-            run_validate if parsed.validate?
-            run_deliver if parsed.deliver?
-            run_complete if parsed.complete?
-            success('Done!')
-          end
-
-          def help_extra_text
-            "Validations:\n#{doc_validations_list}"
-          end
-
-          def run_validate
-            complete.start_banner
-            return true if complete.valid?
-
-            uncomplete_message('Some validation did not pass')
-          end
-
-          def run_complete
-            return complete.run if confirm?('Confirm issue completion?')
-
-            uncomplete_message('Issue was not completed')
-          end
-
-          def run_deliver
-            deliver.start_banner
-            return deliver.run if confirm?('Confirm issue delivery?')
-
-            uncomplete_message('Issue was not delivered')
-          end
-
-          private
-
-          def complete_uncached
-            ::Avm::Git::Issue::Complete.new(git_complete_issue_options)
-          end
-
-          def deliver_uncached
-            ::Avm::Git::Issue::Deliver.new(runner_context.call(:git_repo))
-          end
-
-          def skip_validations
-            parsed.skip_validations.to_s.split(',').map(&:strip).reject(&:blank?)
-          end
-
-          def git_complete_issue_options
-            { dir: runner_context.call(:repository_path), skip_validations: skip_validations }
-          end
-
-          def doc_validations_list
-            ::Avm::Git::Issue::Complete::VALIDATIONS.keys.map { |k| "  * #{k}" }.join("\n")
-          end
-
-          def uncomplete_unfail?
-            parsed.uncomplete_unfail?
-          end
-
-          def uncomplete_message(message)
-            if uncomplete_unfail?
-              warn(message)
-            else
-              fatal_error(message)
-            end
-            false
+          require_sub __FILE__
+          runner_with :help, :subcommands do
+            desc 'Issue operations within Git.'
+            subcommands
           end
         end
       end

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

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+require 'avm/git/issue/complete'
+
+module Avm
+  module Tools
+    class Runner
+      class Git
+        class Issue
+          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).'
+            end
+
+            def run
+              return unless run_validate
+              return unless run_complete
+
+              success('Done!')
+            end
+
+            def help_extra_text
+              "Validations:\n#{doc_validations_list}"
+            end
+
+            def run_validate
+              complete.start_banner
+              return true if complete.valid?
+
+              uncomplete_message('Some validation did not pass')
+            end
+
+            def run_complete
+              return complete.run if confirm?('Confirm issue completion?')
+
+              uncomplete_message('Issue was not completed')
+            end
+
+            private
+
+            def complete_uncached
+              ::Avm::Git::Issue::Complete.new(git_complete_issue_options)
+            end
+
+            def skip_validations
+              parsed.skip_validations.to_s.split(',').map(&:strip).reject(&:blank?)
+            end
+
+            def git_complete_issue_options
+              { dir: runner_context.call(:repository_path), skip_validations: skip_validations }
+            end
+
+            def doc_validations_list
+              ::Avm::Git::Issue::Complete::VALIDATIONS.keys.map { |k| "  * #{k}" }.join("\n")
+            end
+
+            def uncomplete_unfail?
+              parsed.uncomplete_unfail?
+            end
+
+            def uncomplete_message(message)
+              if uncomplete_unfail?
+                warn(message)
+              else
+                fatal_error(message)
+              end
+              false
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+require 'avm/git/issue/deliver'
+
+module Avm
+  module Tools
+    class Runner
+      class Git
+        class Issue
+          class Deliver
+            runner_with :confirmation, :help do
+              desc 'Deliver a issue in a Git repository.'
+            end
+
+            def run
+              deliver.start_banner
+              if confirm?('Confirm issue delivery?')
+                deliver.run
+              else
+                fatal_error 'Issue undelivered'
+              end
+            end
+
+            private
+
+            def deliver_uncached
+              ::Avm::Git::Issue::Deliver.new(runner_context.call(:git_repo))
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'avm/git/revision_test'
 
 module Avm

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'eac_git/local'
 
 module Avm

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'eac_git/local'
 
 module Avm

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 require 'eac_git/local'
 
 module Avm

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/core_ext'
+require 'avm/tools/core_ext'
 
 module Avm
   module Tools