avm-tools 0.97.0 → 0.101.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f1e0a305ededda2855b91810dc19b61599d5160877ec4ce3ed6f30fef7fba53
-  data.tar.gz: 30b9f99be2526baec4a9f9c47717689a7addbfb554d81f7d8100aafbf4fb9e7b
+  metadata.gz: 5243b812d2aa6e9e61cff80a964aa4b035abd9dd85051f5798fbfc6b1c00486a
+  data.tar.gz: 8c79b0a42a1d863349129e5a2ab8d091f8765abea99815d4f706e64126f843bc
 SHA512:
-  metadata.gz: 01aad2b75c533011cca20448bb5df00608d43124c905844d1f7c3bf9aa3a8f2c23258e3ad630df9c8fe32591f4d7e620253f9e7e2724e8ffebe89dcbc049c992
-  data.tar.gz: e94c3356ab0c629d8ba0c02e091fdb2da88cb9c4441142be581628abe2585e02af117177c255a436e64a1d7010ed0e3ce985ac25d689e17b84ecb473cd329af6
+  metadata.gz: f1c66dd955e5367563ccad9d9ae5e44946c109b9abf519b3bddb04cd5bda6dcb4b74a6bc4745f1ba7fd400111ab5ce41e5172cd3d28765ea44106531ba8d8644
+  data.tar.gz: 2b7c051160d2c1b549a25b6a620a9458c151b85887c1bcffd859ac4099fd72e57a6d2af17309b293883a1da0b431a64b54e8491446e191efed274f18a2f93dfe

data/lib/avm/app_src.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/apps/sources/configuration'
-require 'eac_launcher/paths/real'
+require 'avm/launcher/paths/real'
 require 'eac_ruby_utils/core_ext'
 require 'avm/projects/stereotypes'
 require 'i18n'
@@ -20,10 +20,10 @@ 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 = [])

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

@@ -1,33 +1,25 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'avm/core_ext'
 require 'avm/docker/registry'
 
 module Avm
   module Docker
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      enable_console_speaker
+    class Runner
+      enable_speaker
       enable_simple_cache
 
-      DOC = <<~DOCOPT
-        Manipulate Docker images.
-
-        Usage:
-          __PROGRAM__ [options] [-B <build-arg>...] [-E <run-arg>...]
-          __PROGRAM__ -h | --help
-
-        Options:
-          -h --help     Show this help.
-          -n --registry-name=<registry-name>    Docker registry's name.
-          -p --push     Push the image to Docker registry.
-          -r --run      Run or start a container with builded image.
-          -B --build-arg=<build-arg>  Argument for "docker build".
-          -E --entrypoint-arg=<run-arg>    Argument for entrypoint on "docker run"
-          -c --clear  Remove container if exist before run.
-          -S --no-snapshot    Does not add "-snapshot" to image tag.
-          -V --no-version   Does not add version to image tag.
-      DOCOPT
+      runner_with :help do
+        desc 'Manipulate Docker images.'
+        arg_opt '-n', '--registry-name', 'Docker registry\'s name.'
+        bool_opt '-p', '--push', 'Push the image to Docker registry.'
+        bool_opt '-r', '--run', 'Run or start a container with builded image.'
+        arg_opt '-B', '--build-arg', 'Argument for "docker build".', repeat: true
+        arg_opt '-E', '--entrypoint-arg', 'Argument for entrypoint on "docker run"', repeat: true
+        bool_opt '-c', '--clear', 'Remove container if exist before run.'
+        bool_opt '-S', '--no-snapshot', 'Does not add "-snapshot" to image tag.'
+        bool_opt '-V', '--no-version', 'Does not add version to image tag.'
+      end
 
       def run
         setup
@@ -51,52 +43,78 @@ 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
-        options.fetch('--build-arg')
+        parsed.build_arg
+      end
+
+      def docker_container
+        instance.docker_container
+      end
+
+      def docker_image
+        instance.docker_image
       end
 
       def entrypoint_args
-        options.fetch('--entrypoint-arg')
+        parsed.entrypoint_arg
       end
 
       def push
-        instance.docker_image.push if options.fetch('--push')
+        docker_image.push if parsed.push?
       end
 
       def container_run
-        return unless options.fetch('--run')
+        return unless parsed.run?
 
-        instance.docker_container.run(
+        docker_container.run(
           entrypoint_args: entrypoint_args,
-          clear: options.fetch('--clear')
+          clear: parsed.clear?
         )
       end
 
       def registry_uncached
-        options.fetch('--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?
-        !options.fetch('--no-snapshot')
+        !parsed.no_snapshot?
       end
 
       def version?
-        !options.fetch('--no-version')
+        !parsed.no_version?
       end
 
       def instance
-        context(:instance)
+        runner_context.call(:instance)
       end
     end
   end

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

@@ -2,15 +2,13 @@
 
 require 'avm/eac_rails_base1/runner_with/bundle'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 require 'shellwords'
 
 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_rails_base1/runner/code_runner.rb

@@ -2,7 +2,6 @@
 
 require 'avm/eac_rails_base1/runner_with/bundle'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module EacRailsBase1

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

@@ -3,7 +3,6 @@
 require 'avm/eac_rails_base1/runner_with/bundle'
 require 'avm/instances/entry_keys'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 require 'shellwords'
 
 module Avm

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%%%'