avm-tools 0.98.0 → 0.102.0

data/lib/avm/projects/stereotypes/git_subtree/publish.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/publish_base'
+require 'avm/launcher/git/publish_base'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubtree
-        class Publish < ::EacLauncher::Git::PublishBase
+        class Publish < ::Avm::Launcher::Git::PublishBase
         end
       end
     end

data/lib/avm/projects/stereotypes/git_subtree/warp.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/warp_base'
-require 'eac_launcher/git/sub_warp_base'
+require 'avm/launcher/git/warp_base'
+require 'avm/launcher/git/sub_warp_base'
 
 module Avm
   module Projects
     module Stereotypes
       class GitSubtree
-        class Warp < ::EacLauncher::Git::WarpBase
-          include ::EacLauncher::Git::SubWarpBase
+        class Warp < ::Avm::Launcher::Git::WarpBase
+          include ::Avm::Launcher::Git::SubWarpBase
 
           private
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/projects/stereotype'
-require 'eac_launcher/ruby/gem/specification'
+require 'avm/launcher/ruby/gem/specification'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -21,7 +21,7 @@ module Avm
           end
 
           def load_gemspec(gemspec_file)
-            ::EacLauncher::Ruby::Gem::Specification.new(gemspec_file)
+            ::Avm::Launcher::Ruby::Gem::Specification.new(gemspec_file)
           end
         end
       end

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

@@ -4,18 +4,18 @@ require 'curb'
 require 'json'
 require 'eac_ruby_utils/simple_cache'
 require 'rubygems'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_launcher/publish/base'
-require 'eac_launcher/publish/check_result'
-require 'eac_launcher/ruby/gem'
+require 'eac_cli/speaker'
+require 'avm/launcher/publish/base'
+require 'avm/launcher/publish/check_result'
+require 'avm/launcher/ruby/gem'
 
 module Avm
   module Projects
     module Stereotypes
       class RubyGem
-        class Publish < ::EacLauncher::Publish::Base
+        class Publish < ::Avm::Launcher::Publish::Base
           include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
+          enable_speaker
 
           protected
 
@@ -42,23 +42,23 @@ module Avm
           end
 
           def new_gem_disallowed_check_result
-            ::EacLauncher::Publish::CheckResult.blocked(
+            ::Avm::Launcher::Publish::CheckResult.blocked(
               "#{gem_spec.full_name} does not exist in RubyGems"
             )
           end
 
           def version_published_check_result
-            ::EacLauncher::Publish::CheckResult.updated("#{gem_spec.full_name} already pushed")
+            ::Avm::Launcher::Publish::CheckResult.updated("#{gem_spec.full_name} already pushed")
           end
 
           def outdated_version_check_result
-            ::EacLauncher::Publish::CheckResult.outdated(
+            ::Avm::Launcher::Publish::CheckResult.outdated(
               "#{gem_spec.full_name} is outdated (Max: #{gem_version_max})"
             )
           end
 
           def version_unpublished_check_result
-            ::EacLauncher::Publish::CheckResult.pending("#{gem_spec.full_name} not found " \
+            ::Avm::Launcher::Publish::CheckResult.pending("#{gem_spec.full_name} not found " \
                 'in RubyGems')
           end
 
@@ -71,7 +71,7 @@ module Avm
           end
 
           def gem_build_uncached
-            ::EacLauncher::Ruby::Gem::Build.new(source)
+            ::Avm::Launcher::Ruby::Gem::Build.new(source)
           end
 
           def publish
@@ -82,7 +82,7 @@ module Avm
           end
 
           def new_gem_allowed?
-            ::EacLauncher::Context.current.publish_options[:new]
+            ::Avm::Launcher::Context.current.publish_options[:new]
           end
 
           def gem_published?
@@ -112,7 +112,7 @@ module Avm
           def push_gem
             info("Pushing gem #{gem_spec}...")
             command = ['gem', 'push', gem_build.output_file]
-            unless ::EacLauncher::Context.current.publish_options[:confirm]
+            unless ::Avm::Launcher::Context.current.publish_options[:confirm]
               command = %w[echo] + command + %w[(Dry-run)]
             end
             EacRubyUtils::Envs.local.command(command).system

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

@@ -10,7 +10,7 @@ module Avm
         class Update
           TRANSLATE_CLASS = self
 
-          enable_console_speaker
+          enable_speaker
           common_constructor :instance
 
           def run
@@ -19,6 +19,10 @@ module Avm
             gemfile_lock_commit
           end
 
+          def run_before
+            [:git]
+          end
+
           private
 
           def bundle_update

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

@@ -8,7 +8,7 @@ module Avm
     module Stereotypes
       class RubyGem
         class VersionBump
-          enable_console_speaker
+          enable_speaker
           common_constructor :instance, :target_version
 
           def run

data/lib/avm/ruby/gems/generator.rb

@@ -11,7 +11,7 @@ module Avm
         JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
         TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
 
-        enable_console_speaker
+        enable_speaker
         enable_simple_cache
         common_constructor :root_directory, :options, default: [{}] do
           self.root_directory = root_directory.to_pathname
@@ -61,11 +61,11 @@ module Avm
         protected
 
         def apply_to_root_directory(template, subpath)
-          if template.is_a?(::EacRubyUtils::Templates::Directory)
+          if template.is_a?(::EacTemplates::Directory)
             template.children.each do |child|
               apply_to_root_directory(child, subpath.join(child.basename))
             end
-          elsif template.is_a?(::EacRubyUtils::Templates::File)
+          elsif template.is_a?(::EacTemplates::File)
             template.apply_to_file(template_variables, root_directory.join(subpath))
           else
             raise "Unknown template object: #{template}"

data/lib/avm/ruby/rubocop.rb

@@ -7,7 +7,7 @@ module Avm
   module Ruby
     class Rubocop
       require_sub __FILE__
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
       common_constructor :base_path, :rubocop_args
       set_callback :initialize, :after do

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

@@ -2,7 +2,7 @@
 
 require 'avm/files/formatter'
 require 'eac_cli/core_ext'
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 
 module Avm
   module Tools
@@ -29,7 +29,7 @@ module Avm
           end
 
           def git
-            @git ||= ::EacLauncher::Git::Base.new('.')
+            @git ||= ::Avm::Launcher::Git::Base.new('.')
           end
 
           def git_dirty_files

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

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/require_sub'
-require 'eac_launcher/git/base'
-::EacRubyUtils.require_sub(__FILE__)
+require 'avm/core_ext'
+require 'avm/launcher/git/base'
 
 module Avm
   module Tools
@@ -24,7 +23,12 @@ module Avm
         end
 
         def git
-          @git ||= ::EacLauncher::Git::Base.by_root(repository_path)
+          @git ||= ::Avm::Launcher::Git::Base.by_root(repository_path)
+        end
+
+        # @return [[EacGit::Local]]
+        def git_repo
+          git.eac_git
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/speaker'
 require 'eac_ruby_utils/simple_cache'
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 require 'filesize'
 require 'avm/git/commit'
 
@@ -76,7 +76,7 @@ module Avm
           end
 
           def git_uncached
-            ::EacLauncher::Git::Base.new(runner_context.call(:repository_path))
+            ::Avm::Launcher::Git::Base.new(runner_context.call(:repository_path))
           end
 
           def commit_uncached

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/base'
+require 'avm/apps/config'
+require 'avm/launcher/git/base'
 require 'avm/git/commit'
 
 module Avm
@@ -56,7 +57,7 @@ module Avm
           end
 
           def git_uncached
-            ::EacLauncher::Git::Base.new(git_repository_path)
+            ::Avm::Launcher::Git::Base.new(git_repository_path)
           end
 
           def git_repository_path
@@ -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,42 +8,46 @@ module Avm
     class Runner
       class Git
         class Issue
-          runner_with :help do
+          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 '-y', '--yes', 'Does not ask for user confirmation.'
             bool_opt '--complete', 'Run complete task.'
+            bool_opt '--deliver', 'Run "deliver" task.'
+            bool_opt '--validate', 'Validate for "complete" task.'
           end
 
           def run
-            banner
-            return unless validate
-
+            run_validate if parsed.validate?
+            run_deliver if parsed.deliver?
             run_complete if parsed.complete?
             success('Done!')
           end
 
-          def banner
-            complete.start_banner
+          def help_extra_text
+            "Validations:\n#{doc_validations_list}"
           end
 
-          def validate
+          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?
+            return complete.run if confirm?('Confirm issue completion?')
 
             uncomplete_message('Issue was not completed')
           end
 
-          def doc
-            DOC.gsub('%%VALIDATIONS%%', doc_validations_list)
+          def run_deliver
+            deliver.start_banner
+            return deliver.run if confirm?('Confirm issue delivery?')
+
+            uncomplete_message('Issue was not delivered')
           end
 
           private
@@ -52,8 +56,8 @@ module Avm
             ::Avm::Git::Issue::Complete.new(git_complete_issue_options)
           end
 
-          def confirm?
-            parsed.yes? || request_input('Confirm issue completion?', bool: true)
+          def deliver_uncached
+            ::Avm::Git::Issue::Deliver.new(runner_context.call(:git_repo))
           end
 
           def skip_validations