avm-tools 0.99.0 → 0.102.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ca31a9492b30e0e2f3a549262ae2e25bc42ff70ebbdf8581141b7aae3cb336f
-  data.tar.gz: '0590c35f7ee979814a50275ab7138dcb30ee98b93cb9f5a9ae38270d62d95e5e'
+  metadata.gz: 6182ce43a4fee65202cfec5b9134751ac9b15fb6df367b1393331263264339ef
+  data.tar.gz: 5ecb6def157bb85b53115f4bfe3fcda93f290c0a720a16969577d0606de9b1f9
 SHA512:
-  metadata.gz: 1b507793500b03c94adbde17d019c7be366cf9f056c3656da04d84f1cc8387352d607570ba1197e369b9a1943de83553920883d5f659bdc03e14a3df0fee0c43
-  data.tar.gz: 65cc8c6f9831fbea86ea2e98892a539cb9d1c4d2acfe20b0eea45794560ef84ffc8995b1c7ab685446eda2202565571e46fea692ecf28cf1e79b74bf66a3a4b0
+  metadata.gz: bd57b81fdfb81500e6426f17c7e981d141547a174e13d6e109a11b16db0987773bf6ab82269d025da663cb6872464ff883d2367a9809f9a5cb878472c09ac380
+  data.tar.gz: 17af742c5cf348bb9efec3551000f3ce5f0cd79010d2522b2239c61dc4b294dd9e0806e322a6c81a00401171ef87c5710da5ed9757ec0710a7d0f2c2fa60244b

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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/self/instance'
+require 'eac_docker/registry'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Docker
-    class Registry
+    class Registry < ::EacDocker::Registry
       class << self
         def default
           @default ||= new(::Avm::Self.instance.read_entry(
@@ -13,16 +14,6 @@ module Avm
                            ))
         end
       end
-
-      common_constructor :name
-
-      def to_s
-        name
-      end
-
-      def sub(suffix)
-        self.class.new("#{name}#{suffix}")
-      end
     end
   end
 end

data/lib/avm/docker/runner.rb

@@ -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/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/git/auto_commit/rules/manual.rb

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/git/base'
+require 'avm/launcher/git/base'
 require 'eac_cli/speaker'
 require 'eac_ruby_utils/options_consumer'
 require 'eac_ruby_utils/require_sub'
@@ -12,7 +12,7 @@ module Avm
     module Issue
       class Complete
         include ::EacRubyUtils::SimpleCache
-        include ::EacCli::Speaker
+        enable_speaker
 
         attr_reader :skip_validations
 
@@ -21,7 +21,7 @@ module Avm
           dir, @skip_validations = consumer.consume_all(:dir, :skip_validations)
           validate_skip_validations
           consumer.validate
-          @git = ::EacLauncher::Git::Base.new(dir)
+          @git = ::Avm::Launcher::Git::Base.new(dir)
         end
 
         def start_banner

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

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

data/lib/avm/git/subrepo_check/show_result.rb

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

data/lib/avm/git/subrepo_checks.rb

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

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

@@ -33,6 +33,7 @@ module Avm
 
         def docker_image_uncached
           r = docker_image_class.new(docker_image_options.fetch(:registry))
+          r.instance = self if r.respond_to?(:instance)
           r.version = docker_image_options[:version] if docker_image_options.key?(:version)
           r.snapshot = docker_image_options[:snapshot] if docker_image_options.key?(:snapshot)
           r