avm-tools 0.74.0 → 0.76.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4460b770d82c88ec42b81c1fa27af44d87957e92dcb46c32721a72ce64f3dc7
-  data.tar.gz: 4f79e81ef512e596af26e0fd18c13582518778233042ee05a1d846f6afd405a6
+  metadata.gz: cd41b3c790de4a2264c78b5daa5afbd469de6ba2e74b616f096619d0a7bc5460
+  data.tar.gz: 0a1890b253e90debb2951fe90193fef541df4c4d0701dcf82712696377b1adbe
 SHA512:
-  metadata.gz: c2520c8c2b7a9805ddd0a856b1ed8c9ec019d71abd6023bdb69bc4e5ab27ba7c3cfc4e7eb3b02c9051b9dca97e2196e51455843344d305fce1a466ba89bce7d7
-  data.tar.gz: 707b05197a270bd6442994390347713770505105ad1aeb32e6220f96571e184c78dd4ded315d9a993cbe45d0bd28a3e6b09dc708bd3fa39af291fb0df5f6b94f
+  metadata.gz: 2ebb73966071bb959e16f10f37b784971f65b3f2cfede241fe4b02c127f24d057bbaedec098e900b8b69edf55e5951637f905a07d5a242d0b7bfd7b51907a3be
+  data.tar.gz: 510d2e7625a10c523269684a6e269212a5d8b027d671dc38e337be9c1015d9c69d4ba8f78049ee13090a9e6c733fabfd6b5d40541b6ddbd1e86cd8b4e524ba7c

data/lib/avm/eac_rails_base0/instance.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/instance'
-require 'avm/rails/instance'
+require 'avm/eac_rails_base1/instance'
 
 module Avm
   module EacRailsBase0
-    class Instance < ::Avm::EacWebappBase0::Instance
-      include ::Avm::Rails::Instance
-
+    class Instance < ::Avm::EacRailsBase1::Instance
       FILES_UNITS = { uploads: 'public/uploads' }.freeze
     end
   end

data/lib/avm/{rails/runners.rb → eac_rails_base1.rb}

@@ -3,9 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Rails
-    module Runners
-      require_sub __FILE__
-    end
+  module EacRailsBase1
+    require_sub __FILE__
   end
 end

data/lib/avm/{rails → eac_rails_base1}/instance.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/instance'
+require 'eac_ruby_gems_utils/gem'
+
 module Avm
-  module Rails
-    module Instance
+  module EacRailsBase1
+    class Instance < ::Avm::EacWebappBase0::Instance
+      DEFAULT_RAILS_ENVIRONMENT = 'production'
+
       def bundle(*args)
-        the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', 'production')
+        the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', DEFAULT_RAILS_ENVIRONMENT)
       end
 
       def rake(*args)

data/lib/avm/eac_rails_base1/runner.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+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
+          desc 'Runs "bundle ...".'
+          pos_arg :'bundle-args', repeat: true, optional: true
+        end
+
+        def run
+          bundle_run
+        end
+
+        def bundle_args
+          parsed.bundle_args.reject { |arg| arg == '--' }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/runner_with/bundle'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class CodeRunner
+        runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
+        runner_definition do
+          desc 'Runs a Ruby code with "rails runner".'
+          pos_arg :code
+        end
+
+        def run
+          infov 'Environment', runner_context.call(:instance).host_env
+          bundle_run
+        end
+
+        def bundle_args
+          %w[exec rails runner] + [parsed.code]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instance'
+require 'eac_cli/runner'
+
+module Avm
+  module EacRailsBase1
+    module RunnerWith
+      module Bundle
+        DEFAULT_RAILS_ENVIRONMENT_CONSTANT = 'DEFAULT_RAILS_ENVIRONMENT'
+
+        common_concern do
+          include ::EacCli::Runner
+
+          runner_definition do
+            arg_opt '-e', '--environment', 'Specifies the environment for the runner to operate' \
+              ' (test/development/production). Default: "development".'
+          end
+        end
+
+        module ClassMethods
+          def default_rails_environment
+            const_get(DEFAULT_RAILS_ENVIRONMENT_CONSTANT)
+          rescue ::NameError
+            ::Avm::EacRailsBase1::Instance::DEFAULT_RAILS_ENVIRONMENT
+          end
+        end
+
+        def bundle_command
+          rails_instance.bundle(*bundle_args).envvar('RAILS_ENV', rails_environment)
+        end
+
+        def bundle_run
+          infov 'Bundle arguments', ::Shellwords.join(bundle_args)
+          infov 'Rails environment', rails_environment
+          bundle_command.system!
+        end
+
+        def default_rails_environment
+          self.class.default_rails_environment
+        end
+
+        def rails_instance
+          if respond_to?(:runner_context)
+            runner_context.call(:instance)
+          else
+            context(:instance)
+          end
+        end
+
+        def rails_environment
+          parsed.environment.presence || default_rails_environment
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/instance.rb

@@ -3,13 +3,11 @@
 require 'avm/eac_redmine_base0/data_unit'
 require 'avm/eac_ubuntu_base0/docker_image'
 require 'avm/eac_webapp_base0/instance'
-require 'avm/rails/instance'
+require 'avm/eac_rails_base1/instance'
 
 module Avm
   module EacRedmineBase0
-    class Instance < ::Avm::EacWebappBase0::Instance
-      include ::Avm::Rails::Instance
-
+    class Instance < ::Avm::EacRailsBase1::Instance
       FILES_UNITS = { files: 'files' }.freeze
 
       def docker_image_class

data/lib/avm/{stereotypes/eac_ubuntu_base0.rb → eac_ubuntu_base0.rb}

@@ -4,8 +4,6 @@ require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
-  module Stereotypes
-    module EacUbuntuBase0
-    end
+  module EacUbuntuBase0
   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/instance.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/instances/base'
-require 'avm/stereotypes/postgresql/instance_with'
+require 'avm/postgresql/instance_with'
 require 'avm/data/instance/files_unit'
 require 'avm/data/instance/package'
 require 'avm/eac_webapp_base0/deploy/file_unit'
@@ -9,7 +9,7 @@ require 'avm/eac_webapp_base0/deploy/file_unit'
 module Avm
   module EacWebappBase0
     class Instance < ::Avm::Instances::Base
-      include ::Avm::Stereotypes::Postgresql::InstanceWith
+      include ::Avm::Postgresql::InstanceWith
 
       def stereotype_name
         self.class.name.desconstantize.demodulize

data/lib/avm/eac_webapp_base0/runner.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'avm/instances/runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class Runner < ::Avm::Instances::Runner
+      require_sub __FILE__
+    end
+  end
+end