avm-tools 0.98.0 → 0.102.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a8cd450cfc4285226ff31b7a2183ae8cb87c3cb3b688548251bd5b92c25f9c3
-  data.tar.gz: 4865bc83bfa9a0f04c76fce01c546d3c8df123f63647d4fdbcd6ebfc9389aaed
+  metadata.gz: af55442cdb7aacd8752fa1cf1b548fe867d7bdd74dfc9e9abd72d754de22772c
+  data.tar.gz: c9fd2f59d75013325820f1d7ff8c8d54a35c09851a1032ccd31ff95427304a5d
 SHA512:
-  metadata.gz: 8bfbd03718cedd613906c9c550db8d1ac5ff05a4e904bce261d13382bbb20f10d7e5ab72de57f396499f5616356a7419b2fca3a65ed7fa7a3d8f7d6e0ff48841
-  data.tar.gz: 97fbf67954eca6d3e64d8165c6c523a092a3b50442d506858ea412a7c1849285b7d90364679773a91927b6298d1b01fad73bbcb5edadb73bf1cf2a59608c3033
+  metadata.gz: c19e110f9557287b2b84b18385370111d1ba5bb1e99636f2425ab2c6a5729599f7d9bdba985fde3e4b4f7e4aece5614c3e443a4e61150370d9c1f2ac08bf411e
+  data.tar.gz: 87dfc0c5042d2c0deba256ad7e7869bf4b547f48c1376f9e25114834e739b6e3d6be7c49cc03d3975128fd27de2b586f933f0f8fd67edffdd5350824f49208eb

data/lib/avm/app_src.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require 'avm/apps/sources/configuration'
-require 'eac_launcher/paths/real'
+require 'avm/launcher/paths/real'
+require 'avm/projects/stereotype/job_comparator'
 require 'eac_ruby_utils/core_ext'
 require 'avm/projects/stereotypes'
 require 'i18n'
@@ -20,14 +21,14 @@ module Avm
       configuration.if_present(&:locale) || ::I18n.default_locale
     end
 
-    # Backward compatibility with [EacLauncher::Paths::Logical].
-    # @return [EacLauncher::Paths::Real].
+    # Backward compatibility with [Avm::Launcher::Paths::Logical].
+    # @return [Avm::Launcher::Paths::Real].
     def real
-      ::EacLauncher::Paths::Real.new(path.to_path)
+      ::Avm::Launcher::Paths::Real.new(path.to_path)
     end
 
     def run_job(job, job_args = [])
-      stereotypes.each { |stereotype| run_stereotype_job(stereotype, job, job_args) }
+      stereotypes_jobs(job, job_args).each(&:run)
     end
 
     private
@@ -37,14 +38,14 @@ module Avm
       ::Avm::Apps::Sources::Configuration.find_in_path(path)
     end
 
-    def run_stereotype_job(stereotype, job, job_args)
+    def stereotypes_jobs(job, job_args)
       job_class_method = "#{job}_class"
-      if stereotype.send(job_class_method).present?
-        puts stereotype.label + ": #{job} class found. Running..."
-        stereotype.send(job_class_method).new(self, *job_args).run
-      else
-        puts stereotype.label + ": #{job} class not found"
+      r = []
+      stereotypes.each do |stereotype|
+        r << stereotype.send(job_class_method).new(self, *job_args) if
+          stereotype.send(job_class_method).present?
       end
+      r.sort { |a, b| ::Avm::Projects::Stereotype::JobComparator.new(a, b).result }
     end
 
     def stereotypes_uncached

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
+require 'avm/core_ext'
 require 'avm/files/rotate'
-require 'eac_ruby_utils/core_ext'
 require 'minitar'
 
 module Avm
   module Data
     class Package
       class Dump
-        enable_console_speaker
+        enable_speaker
         enable_listable
 
         DEFAULT_EXPIRE_TIME = 1.day

data/lib/avm/data/package/load.rb

@@ -7,7 +7,7 @@ module Avm
   module Data
     class Package
       class Load
-        enable_console_speaker
+        enable_speaker
 
         attr_reader :package, :data_file_path
 

data/lib/avm/data/unit.rb

@@ -9,7 +9,7 @@ module Avm
       include ::ActiveSupport::Callbacks
 
       define_callbacks :dump, :load
-      enable_console_speaker
+      enable_speaker
 
       %w[dump load].each do |action|
         method_name = "#{action}_command"

data/lib/avm/docker/container.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
+require 'avm/core_ext'
 require 'avm/executables'
 
 module Avm
   module Docker
     class Container
-      enable_console_speaker
+      enable_speaker
       common_constructor :instance
 
       def remove

data/lib/avm/docker/image.rb

@@ -3,10 +3,11 @@
 require 'eac_ruby_utils/core_ext'
 require 'avm/executables'
 require 'avm/patches/object/template'
+require 'eac_docker/images/templatized'
 
 module Avm
   module Docker
-    class Image
+    class Image < ::EacDocker::Images::Templatized
       attr_reader :registry
       attr_accessor :snapshot
       attr_accessor :version
@@ -18,10 +19,9 @@ module Avm
       end
 
       def build(extra_args = [])
-        on_build_dir do
-          template.apply(self, build_dir)
-          run_docker_build(extra_args)
-        end
+        nyi "Extra args: #{extra_args}" if extra_args.any?
+
+        provide
       end
 
       def generator_version
@@ -32,9 +32,10 @@ module Avm
         ::Avm::Executables.docker.command.append(['push', tag]).system!
       end
 
-      def read_entry(path, _options = {})
+      def read_entry(path, options = {})
         method = path.gsub('.', '_')
         return send(method) if respond_to?(path, true)
+        return instance.read_entry(path, options) if respond_to?(:instance)
 
         raise "Method \"#{method}\" not found for entry \"#{path}\""
       end
@@ -66,23 +67,6 @@ module Avm
         r += '-snapshot' if snapshot
         r
       end
-
-      private
-
-      attr_reader :build_dir
-
-      def run_docker_build(extra_args)
-        ::Avm::Executables.docker.command.append(
-          ['build', '-t', tag] + extra_args + [build_dir]
-        ).system!
-      end
-
-      def on_build_dir
-        @build_dir = ::Dir.mktmpdir
-        yield
-      ensure
-        ::FileUtils.rm_rf(@build_dir)
-      end
     end
   end
 end

data/lib/avm/docker/runner.rb

@@ -6,7 +6,7 @@ require 'avm/docker/registry'
 module Avm
   module Docker
     class Runner
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
 
       runner_with :help do
@@ -43,42 +43,68 @@ module Avm
         infov 'Registry name', registry
         infov 'Version?', version?
         infov 'Snapshot?', snapshot?
-        infov 'Image name', instance.docker_image.tag
+        infov 'Image name', docker_image.tag
         infov 'Build arguments', build_args
         infov 'Entrypoint arguments', entrypoint_args
       end
 
       def build
-        instance.docker_image.build(build_args)
+        docker_image.build(build_args)
+        success 'Docker image builded'
       end
 
       def build_args
         parsed.build_arg
       end
 
+      def docker_container
+        instance.docker_container
+      end
+
+      def docker_image
+        instance.docker_image
+      end
+
       def entrypoint_args
         parsed.entrypoint_arg
       end
 
       def push
-        instance.docker_image.push if parsed.push?
+        docker_image.push if parsed.push?
       end
 
       def container_run
         return unless parsed.run?
 
-        instance.docker_container.run(
+        docker_container.run(
           entrypoint_args: entrypoint_args,
           clear: parsed.clear?
         )
       end
 
       def registry_uncached
-        parsed.registry_name.if_present(::Avm::Docker::Registry.default) do |v|
-          ::Avm::Docker::Registry.new(v)
+        registry_from_option || registry_from_instance || registry_from_default ||
+          fatal_error('No registry defined')
+      end
+
+      def registry_from_option
+        parsed.registry_name.if_present { |v| ::Avm::Docker::Registry.new(v) }
+      end
+
+      def registry_from_instance
+        if if_respond(:use_default_registry?, true)
+          instance.docker_registry_optional.if_present { |v| ::Avm::Docker::Registry.new(v) }
+        else
+          ::Avm::Docker::Registry.new(instance.docker_registry)
         end
       end
 
+      def registry_from_default
+        return nil unless if_respond(:use_default_registry?, true)
+
+        ::Avm::Docker::Registry.default
+      end
+
       def snapshot?
         !parsed.no_snapshot?
       end

data/lib/avm/eac_rails_base1/runner/bundle.rb

@@ -8,8 +8,7 @@ module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
       class Bundle
-        runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
-        runner_definition do
+        runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle, :help do
           desc 'Runs "bundle ...".'
           pos_arg :'bundle-args', repeat: true, optional: true
         end

data/lib/avm/eac_redmine_base0/core_update.rb

@@ -8,7 +8,7 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module EacRedmineBase0
     class CoreUpdate
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
       common_constructor :instance, :version, :url
 

data/lib/avm/eac_redmine_base0/docker_image.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/core_ext'
+require 'avm/instances/docker_image'
+
+module Avm
+  module EacRedmineBase0
+    class DockerImage < ::Avm::Instances::DockerImage
+      enable_simple_cache
+
+      REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
+
+      def avm_fs_cache_object_id
+        instance.id
+      end
+
+      def redmine_user
+        'redmine'
+      end
+
+      def redmine_user_home
+        "/home/#{redmine_user}"
+      end
+
+      def redmine_path
+        "#{redmine_user_home}/redmine_app"
+      end
+
+      def start_path
+        '/start.sh'
+      end
+
+      private
+
+      def git_repo_uncached
+        ::EacGit::Local.new(instance.source_instance.fs_path)
+      end
+
+      def redmine_source_git_id
+        git_repo.rev_parse('HEAD')
+      end
+
+      def redmine_source_path_uncached
+        r = provide_dir.join(REDMINE_SOURCE_HOST_SUBPATH)
+        ::FileUtils.rm_rf(r.to_path)
+        r.mkpath
+        git_repo.commit(redmine_source_git_id).archive_to_dir(r).system!
+        REDMINE_SOURCE_HOST_SUBPATH
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instance.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/data_unit'
-require 'avm/eac_ubuntu_base0/docker_image'
+require 'avm/eac_redmine_base0/docker_image'
 require 'avm/eac_webapp_base0/instance'
 require 'avm/eac_rails_base1/instance'
 
@@ -11,7 +11,7 @@ module Avm
       FILES_UNITS = { files: 'files' }.freeze
 
       def docker_image_class
-        ::Avm::EacUbuntuBase0::DockerImage
+        ::Avm::EacRedmineBase0::DockerImage
       end
 
       def docker_run_arguments

data/lib/avm/eac_webapp_base0/deploy.rb

@@ -5,7 +5,7 @@ require 'avm/apps/jobs/base'
 require 'avm/git'
 require 'avm/patches/object/template'
 require 'eac_ruby_utils/core_ext'
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 require 'net/http'
 
 module Avm

data/lib/avm/eac_webapp_base0/deploy/git_info.rb

@@ -42,7 +42,7 @@ module Avm
         end
 
         def git_uncached
-          ::EacLauncher::Git::Base.new(git_repository_path)
+          ::Avm::Launcher::Git::Base.new(git_repository_path)
         end
 
         def instance_branch

data/lib/avm/eac_webapp_base0/runner/data/load.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/numeric/time'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/speaker'
 require 'eac_ruby_utils/simple_cache'
 
 module Avm

data/lib/avm/eac_writings_base0/project_build.rb

@@ -9,7 +9,7 @@ module Avm
   module EacWritingsBase0
     class ProjectBuild
       require_sub __FILE__, include_modules: true
-      enable_console_speaker
+      enable_speaker
 
       CONTENT_VAR = '%%%CONTENT%%%'
 

data/lib/avm/files/appendable/templatized_directory.rb

@@ -17,7 +17,7 @@ module Avm
         def write_on(target_dir)
           raise 'Variables source not set' if appender.variables_source.blank?
 
-          ::EacRubyUtils::Templates::Directory.new(source_path).apply(
+          ::EacTemplates::Directory.new(source_path).apply(
             appender.variables_source,
             target_dir
           )

data/lib/avm/files/formatter.rb

@@ -9,7 +9,7 @@ module Avm
       include ::EacRubyUtils::Fs::Traversable
       require_sub __FILE__
       enable_simple_cache
-      enable_console_speaker
+      enable_speaker
       enable_listable
       lists.add_symbol :option, :apply, :recursive, :verbose
       common_constructor :source_paths, :options, default: [{}] do

data/lib/avm/git/auto_commit/rules/manual.rb

@@ -8,7 +8,7 @@ module Avm
       module Rules
         class Manual < ::Avm::Git::AutoCommit::Rules::Base
           class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
-            enable_console_speaker
+            enable_speaker
 
             COMMIT_FORMAT = '%h - %s (%cr)'
             SKIP_OPTION = 's'
@@ -17,7 +17,7 @@ module Avm
               return nil unless file.commits.any?
 
               commits_banner
-              request_input('Which commit?', list: commits_by_position).if_present do |v|
+              input('Which commit?', list: commits_by_position).if_present do |v|
                 new_commit_info.fixup(v)
               end
             end

data/lib/avm/git/commit/file.rb

@@ -12,7 +12,7 @@ module Avm
 
         attr_reader :git, :diff_tree
 
-        # git: [EacLauncher::Git::Base]
+        # git: [Avm::Launcher::Git::Base]
         # diff_tree_tree: a line of command "git diff-tree --no-commit-id -r --full-index"'s output
         def initialize(git, diff_tree_line)
           @git = git