avm-tools 0.99.1 → 0.102.2

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_cli/old_configs_bridge'
 require 'eac_ruby_base0/application'
 require 'eac_ruby_utils/require_sub'
 require 'avm/instances/base'
@@ -13,6 +14,14 @@ module Avm
         @application ||= ::EacRubyBase0::Application.new(root.to_path)
       end
 
+      # @return [EacCli::OldConfigsBridge]
+      def build_config(path = nil)
+        ::EacCli::OldConfigsBridge.new(
+          application.name,
+          path.if_present({}) { |v| { storage_path: v } }
+        )
+      end
+
       def instance
         @instance ||= ::Avm::Self::Instance.by_id('avm-tools_self')
       end

data/lib/avm/tools/runner.rb

@@ -17,6 +17,10 @@ module Avm
       def application
         ::Avm::Self.application
       end
+
+      def run
+        ::Avm::Apps::Config.context.on(::Avm::Self.build_config) { super }
+      end
     end
   end
 end

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

@@ -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

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Config
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          desc 'Configuration utilities.'
+          subcommands
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avm/apps/config'
+require 'avm/self'
+require 'avm/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class Config
+        class LoadPath
+          runner_with :help do
+            desc 'Manipulate include path.'
+            arg_opt '-p', '--push', 'Add a path.'
+          end
+
+          def run
+            run_show
+            run_add
+          end
+
+          private
+
+          # @return [[EacCli::Config]]
+          def config_node
+            ::Avm::Apps::Config.current
+          end
+
+          def run_add
+            parsed.push.if_present do |v|
+              infov 'Path to add', v
+              config_node.load_path.push(v)
+              success 'Path included'
+            end
+          end
+
+          def run_show
+            infov 'Configuration path', config_node.url
+            infov 'Paths included', config_node.self_loaded_nodes.count
+            config_node.self_loaded_nodes.each do |loaded_node|
+              infov '  * ', loaded_node.url
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_redmine_base0/dev_docker.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/docker/runner'
+
+module Avm
+  module Tools
+    class Runner
+      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
+        class DevDocker < ::Avm::Docker::Runner
+          def docker_image
+            ::Avm::EacUbuntuBase0::DockerImage
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_redmine_base0/docker.rb

@@ -7,6 +7,9 @@ module Avm
     class Runner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
         class Docker < ::Avm::Docker::Runner
+          def use_default_registry?
+            false
+          end
         end
       end
     end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/apps/config'
 require 'avm/launcher/git/base'
 require 'avm/git/commit'
 
@@ -90,7 +91,7 @@ module Avm
           end
 
           def variables_source
-            instance || ::Avm.configs
+            instance || ::Avm::Apps::Config.current
           end
 
           def instance_uncached

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

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