avm-tools 0.101.0 → 0.103.1

data/lib/avm/git/issue/complete/working_tree.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        module WorkingTree
+          def clean_workspace_result
+            ::Avm::Result.success_or_error(clean_workspace?, 'yes', 'no')
+          end
+
+          def clean_workspace?
+            @git.dirty_files.none?
+          end
+        end
+      end
+    end
+  end
+end

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

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

data/lib/avm/git/revision_test.rb

@@ -13,12 +13,8 @@ module Avm
 
       def banner
         infov 'Revision to test', sha1
-        on_speaker_node do |node|
-          node.stderr_line_prefix = '  '
-          infov '* Subject', commit.subject
-          infov '* Success?', successful_label
-          infov '* STDOUT', stdout_cache.content_path
-          infov '* STDERR', stderr_cache.content_path
+        ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  ')) do
+          revision_banner
         end
       end
 
@@ -49,6 +45,13 @@ module Avm
         ::File.expand_path(git.to_s)
       end
 
+      def revision_banner
+        infov '* Subject', commit.subject
+        infov '* Success?', successful_label
+        infov '* STDOUT', stdout_cache.content_path
+        infov '* STDERR', stderr_cache.content_path
+      end
+
       def root_cache
         ::Avm.fs_cache.child('git', 'revision_test', git_absolute_path.parameterize, sha1,
                              options.fetch(:test_command).to_s.parameterize)

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/context.rb

@@ -13,7 +13,7 @@ module Avm
   module Launcher
     class Context
       include ::EacRubyUtils::SimpleCache
-      include ::EacCli::Speaker
+      enable_speaker
 
       DEFAULT_PROJECTS_ROOT = '.'
       DEFAULT_SETTINGS_FILE = ::File.join(ENV['HOME'], '.config', 'eac_launcher', 'settings.yml')

data/lib/avm/launcher/git/publish_base.rb

@@ -10,7 +10,7 @@ module Avm
     module Git
       class PublishBase < ::Avm::Launcher::Publish::Base
         include ::EacRubyUtils::SimpleCache
-        include ::EacCli::Speaker
+        enable_speaker
 
         CHECKERS = %w[remote_url remote_fetch publish_remote_no_exist remote_equal remote_following
                       local_following].freeze
@@ -26,6 +26,8 @@ module Avm
             return result if result
           end
           divergent_result_check_result
+        rescue ::Avm::Launcher::Instances::Error => e
+          ::Avm::Launcher::Publish::CheckResult.blocked(e.message)
         rescue ::StandardError => e
           raise e unless remote_unavailable_error?(e)
 

data/lib/avm/launcher/git/warp_base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/launcher/git/mirror_update'
+require 'avm/launcher/instances/error'
 require 'avm/launcher/vendor/github'
 require 'avm/projects/stereotypes/git/publish'
 
@@ -27,7 +28,17 @@ module Avm
 
         attr_reader :instance
 
+        def validate_source_current_revision
+          if source_git.rev_parse(source_instance.options.git_current_revision, false).present?
+            return
+          end
+
+          raise ::Avm::Launcher::Instances::Error, 'Refspec ' \
+            "\"#{source_instance.options.git_current_revision}\" not found in \"#{source_git}\""
+        end
+
         def update
+          validate_source_current_revision
           ::Avm::Launcher::Git::MirrorUpdate.new(
             path,
             source_instance.real,

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

@@ -2,6 +2,7 @@
 
 require_relative 'base/cache'
 require 'avm/launcher/errors/non_project'
+require 'eac_ruby_utils/speaker/sender'
 
 module Avm
   module Launcher
@@ -10,7 +11,7 @@ module Avm
         class << self
           def extend_object(object)
             object.extend ::EacRubyUtils::SimpleCache
-            object.extend ::EacCli::Speaker
+            object.extend ::EacRubyUtils::Speaker::Sender
             object.extend ::Avm::Launcher::Instances::Base::Cache
             super
           end

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

@@ -3,9 +3,7 @@
 module Avm
   module Launcher
     module Instances
-      module Errors
-        class Error < StandardError
-        end
+      class Error < StandardError
       end
     end
   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/launcher/ruby/gem/build.rb

@@ -10,7 +10,7 @@ module Avm
     module Ruby
       module Gem
         class Build
-          include ::EacCli::Speaker
+          enable_speaker
 
           def initialize(original_gem_root)
             @original_gem_root = original_gem_root

data/lib/avm/projects/stereotype/job_comparator.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Projects
+    module Stereotype
+      class JobComparator
+        common_constructor :job1, :job2
+
+        def result
+          return -1 if run_before?(job1, job2)
+          return 1 if run_before?(job2, job1)
+
+          job1.object_id <=> job2.class.name
+        end
+
+        private
+
+        def run_before?(a_job, other_job)
+          return false unless a_job.respond_to?(:run_before)
+
+          a_job.run_before.map(&:to_sym).include?(job_stereotype_key(other_job))
+        end
+
+        def job_stereotype_key(job)
+          job.class.name.split('::')[0..-2].join('::').demodulize.variableize.to_sym
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/git/update.rb

@@ -19,8 +19,7 @@ module Avm
             clean_all
             selected_subrepos.map do |f|
               infov 'Subrepo', f
-              on_speaker_node do |node|
-                node.stderr_line_prefix = '  '
+              ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  ')) do
                 ::Avm::Projects::Stereotypes::Git::Update::Subrepo.new(self, f).run
               end
             end

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/projects/stereotypes/ruby_gem/publish.rb

@@ -15,7 +15,7 @@ module Avm
       class RubyGem
         class Publish < ::Avm::Launcher::Publish::Base
           include ::EacRubyUtils::SimpleCache
-          include ::EacCli::Speaker
+          enable_speaker
 
           protected
 

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

@@ -19,6 +19,10 @@ module Avm
             gemfile_lock_commit
           end
 
+          def run_before
+            [:git]
+          end
+
           private
 
           def bundle_update

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
@@ -44,7 +44,7 @@ module Avm
           end
 
           def confirm?
-            parsed.yes? || request_input('Confirm version bump?', bool: true)
+            parsed.yes? || input('Confirm version bump?', bool: true)
           end
 
           def current_version_uncached
@@ -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