avm-tools 0.74.1 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b1ee08028ac161c73a2069542d961e11585fd4eee8673307cb5f3912e0c215
-  data.tar.gz: 438fccaf469c7843762e381a853514ff60fb466bc202e628188eb8a512982129
+  metadata.gz: 3345f4afdd4f7bb8cb968848675bc6b1d5c91e5833b17e90c43a01eae82a95c3
+  data.tar.gz: 5e032e2b459e3c1fe3bf5c42e054d89491736c8e181b17a988a079068728b526
 SHA512:
-  metadata.gz: adfbd30ba8bac66dbb87a165d1839a1163b0679f582e326ae888fc6f773d9eeaa67d8b7047d9a0f2ec16cf98dd815ddccf2097c2003743a9fee5b7a49e67a769
-  data.tar.gz: deca6800842fd5dcebc5748ea4b4fa0909ff3e6bb7c927c5506d01b6f14af7588d2527f0c8c6636c11783b866dadbb65d8c59715198648eac7a9964ae2fec4a4
+  metadata.gz: eccb5df2cf88efda09388fdcbf6a363ad32d49772980b57a58865d5b322c49848cfbaacbd572d4c7c9f9fa2af486ee5efb32b6632b91ead052546e76aa3be51d
+  data.tar.gz: a28d9a27d6c22363d021dad5c1bee61cff8785139c9f69cf131762a6702f988d478ae15880845eb6294941b99e0e391496f4298e99864455543ebad80f8e8866

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

@@ -8,7 +8,7 @@ require 'shellwords'
 module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
-      class Bundle < ::EacRubyUtils::Console::DocoptRunner
+      class Bundle
         runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
         runner_definition do
           desc 'Runs "bundle ...".'
@@ -20,7 +20,7 @@ module Avm
         end
 
         def bundle_args
-          options.fetch('<bundle-args>').reject { |arg| arg == '--' }
+          parsed.bundle_args.reject { |arg| arg == '--' }
         end
       end
     end

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

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/console/docopt_runner'
 module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
-      class CodeRunner < ::EacRubyUtils::Console::DocoptRunner
+      class CodeRunner
         runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
         runner_definition do
           desc 'Runs a Ruby code with "rails runner".'
@@ -15,12 +15,12 @@ module Avm
         end
 
         def run
-          infov 'Environment', context(:instance).host_env
+          infov 'Environment', runner_context.call(:instance).host_env
           bundle_run
         end
 
         def bundle_args
-          %w[exec rails runner] + [options.fetch('<code>')]
+          %w[exec rails runner] + [parsed.code]
         end
       end
     end

data/lib/avm/eac_webapp_base0/deploy.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require 'active_support/callbacks'
-require 'delegate'
-require 'eac_ruby_utils/core_ext'
-require 'eac_launcher/git/base'
 require 'avm/git'
 require 'avm/patches/object/template'
+require 'eac_ruby_utils/core_ext'
+require 'eac_launcher/git/base'
 require 'net/http'
 
 module Avm
@@ -18,34 +17,20 @@ module Avm
 
       enable_console_speaker
       enable_simple_cache
+      common_constructor :instance, :options, default: [{}]
 
-      JOBS = %w[git_deploy setup_files_units assert_instance_branch request_test].freeze
+      JOBS = %w[create_build_dir build_content append_instance_content write_on_target
+                setup_files_units assert_instance_branch request_test].freeze
       define_callbacks(*JOBS)
 
-      attr_reader :instance, :options
-
-      def initialize(instance, options = {})
-        @instance = instance
-        @options = options
-      end
-
-      def build_git_commit
-        ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
-          instance.host_env,
-          instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
-        ).variables_source_set(instance)
-      end
-
       def run
         start_banner
-        JOBS.each do |job|
-          run_callbacks job do
-            send(job)
-          end
-        end
+        run_jobs
         ::Avm::Result.success('Deployed')
       rescue ::Avm::Result::Error => e
         e.to_result
+      ensure
+        remove_build_dir
       end
 
       def start_banner
@@ -57,15 +42,6 @@ module Avm
         infov 'Appended directories', appended_directories
       end
 
-      def git_deploy
-        infom 'Deploying source code and appended content...'
-        build_git_commit
-          .append_directory(template.path)
-          .append_directories(appended_directories)
-          .append_file_content(VERSION_TARGET_PATH, version)
-          .run
-      end
-
       def setup_files_units
         instance.class.const_get('FILES_UNITS').each do |data_key, fs_path_subpath|
           FileUnit.new(self, data_key, fs_path_subpath).run
@@ -85,17 +61,18 @@ module Avm
         fatal_error "Request to #{uri} failed" unless response.code.to_i == 200
       end
 
-      def git_uncached
-        ::EacLauncher::Git::Base.new(git_repository_path)
+      def variables_source
+        instance
       end
 
-      def git_fetch_uncached
-        infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
-        git.fetch(git_remote_name)
-      end
+      private
 
-      def git_repository_path
-        instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+      def run_jobs
+        JOBS.each do |job|
+          run_callbacks job do
+            send(job)
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avm/files/appender'
+require 'avm/files/deploy'
+require 'eac_ruby_utils/envs'
+require 'eac_ruby_utils/fs/temp'
+
+module Avm
+  module EacWebappBase0
+    class Deploy
+      module Build
+        private
+
+        attr_accessor :build_dir
+
+        def append_instance_content
+          ::Avm::Files::Appender
+            .new
+            .variables_source_set(variables_source)
+            .append_templatized_directory(template.path)
+            .append_templatized_directories(appended_directories)
+            .append_file_content(version_target_path, version)
+            .write_appended_on(build_dir)
+        end
+
+        def build_dir_env
+          ::EacRubyUtils::Envs.local
+        end
+
+        def create_build_dir
+          self.build_dir = ::EacRubyUtils::Fs::Temp.directory
+        end
+
+        def remove_build_dir
+          build_dir&.remove
+        end
+
+        def build_content
+          infom 'Writing Git source code...'
+          ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
+            build_dir_env,
+            build_dir
+          ).variables_source_set(variables_source).run
+        end
+      end
+    end
+  end
+end

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

@@ -12,6 +12,11 @@ module Avm
           raise ::Avm::Result::Error, "No commit SHA1 found for \"#{git_reference_found}\""
         end
 
+        def git_fetch_uncached
+          infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
+          git.fetch(git_remote_name)
+        end
+
         def git_reference
           options[:reference] || DEFAULT_REFERENCE
         end
@@ -32,6 +37,14 @@ module Avm
           ::Avm::Git::DEFAULT_REMOTE_NAME
         end
 
+        def git_repository_path
+          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+        end
+
+        def git_uncached
+          ::EacLauncher::Git::Base.new(git_repository_path)
+        end
+
         def instance_branch
           remote_branch(instance.id)
         end

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

@@ -14,6 +14,10 @@ module Avm
           git_remote_hashs.select { |_name, sha1| sha1 == commit_sha1 }.keys
                           .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
         end
+
+        def version_target_path
+          VERSION_TARGET_PATH
+        end
       end
     end
   end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class Deploy
+      module WriteOnTarget
+        def write_on_target
+          ::Avm::Files::Deploy.new(
+            instance.host_env,
+            instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+          ).append_plain_directory(build_dir).run
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/runner'
 require 'avm/path_string'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/console/speaker'

data/lib/avm/eac_writings_base0/apache_host.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/apache_host'
+
+module Avm
+  module EacWritingsBase0
+    class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
+      def document_root
+        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+      end
+
+      def extra_content
+        ''
+      end
+    end
+  end
+end

data/lib/avm/eac_writings_base0/deploy.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_writings_base0/project'
+require 'avm/eac_writings_base0/project_build'
+
+module Avm
+  module EacWritingsBase0
+    class Deploy < ::Avm::EacWebappBase0::Deploy
+      def build_content
+        ::Avm::EacWritingsBase0::ProjectBuild.new(project, output_file:
+            build_dir.join(pdf_path))
+      end
+
+      def title
+        instance.id.humanize
+      end
+
+      def pdf_path
+        "#{instance.id.underscore}.pdf"
+      end
+
+      def variables_source
+        self
+      end
+
+      private
+
+      def project_uncached
+        ::Avm::EacWritingsBase0::Project.new(
+          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+        )
+      end
+    end
+  end
+end

data/lib/avm/eac_writings_base0/instance.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instance'
+
+module Avm
+  module EacWritingsBase0
+    class Instance < ::Avm::EacWebappBase0::Instance
+      FILES_UNITS = {}.freeze
+    end
+  end
+end

data/lib/avm/files/appendable.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Files
+    module Appendable
+      require_sub __FILE__
+
+      attr_reader :variables_source
+
+      def appended
+        @appended ||= []
+      end
+
+      def append_templatized_directories(directories)
+        directories.each { |directory| append_templatized_directory(directory) }
+        self
+      end
+
+      def append_plain_directory(directory)
+        appended << ::Avm::Files::Appendable::PlainDirectory.new(self, directory)
+        self
+      end
+
+      def append_tar_output_command(tar_command)
+        appended << ::Avm::Files::Appendable::TarOutputCommand.new(self, tar_command)
+        self
+      end
+
+      def append_templatized_directory(directory)
+        appended << ::Avm::Files::Appendable::TemplatizedDirectory.new(self, directory)
+        self
+      end
+
+      def append_file_content(target_path, content)
+        appended << ::Avm::Files::Appendable::FileContent
+                    .new(self, target_path, content)
+        self
+      end
+
+      def variables_source_set(source)
+        @variables_source = source
+        self
+      end
+
+      def write_appended_on(target_dir)
+        target_dir = target_dir.to_pathname
+        raise "\"#{target_dir}\" is not a directory" unless target_dir.directory?
+
+        appended.each { |append| append.write_on(target_dir) }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/files/appendable/resource_base'
+
+module Avm
+  module Files
+    module Appendable
+      class FileContent < ::Avm::Files::Appendable::ResourceBase
+        attr_reader :target_path, :content
+
+        def initialize(deploy, target_path, content)
+          super(deploy)
+          @target_path = target_path
+          @content = content
+        end
+
+        def write_on(target_dir)
+          target_dir.join(target_path).write(content)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/files/appendable/resource_base'
+
+module Avm
+  module Files
+    module Appendable
+      class PlainDirectory < ::Avm::Files::Appendable::ResourceBase
+        attr_reader :source_path
+
+        def initialize(appender, source_path)
+          super(appender)
+          @source_path = source_path.to_pathname
+        end
+
+        def write_on(target_dir)
+          raise "\"#{source_path}\" is not a directory" unless source_path.directory?
+
+          ::FileUtils.cp_r("#{source_path}/.", target_dir.to_path)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Files
+    module Appendable
+      class ResourceBase
+        common_constructor :appender
+      end
+    end
+  end
+end