avm-tools 0.69.3 → 0.72.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ba40f1bd12e44664ec4bd6824bc269eb6a5012f51fdb7fdf38f90194f084d8
-  data.tar.gz: 872cf085c7de0dda3da9104b28b8a48ac100473ae902d4596e89295ee808b40b
+  metadata.gz: acf6e22d7179f5a2ad489b5091ef57883c91d94020815952bc3135df2f1cfd7d
+  data.tar.gz: 4f4eb1ef234e44157bc7b66dc44b2903e2c881e3406f31ee6a183eebba3f2ec0
 SHA512:
-  metadata.gz: 3654fc45fe954c2a3caaa7d9d0d6bfc2ad883d0e2f93cb85fe798f0e12785eeb1f2da2c72cc0921e514a48c9942f2a05cf2afc0788faa6e574af3af78195bf22
-  data.tar.gz: f14791c5d6f811644243763d6e2e3d6dfb0c6812dd1d55f2e7d96afc65ac16aea399178cb9fe335a047808e7a34a457741f5eda4598e196237d44e02a4bf133b
+  metadata.gz: c0fbaaa584f10fc580e2f6c1c2635b673b9f481603b00a5851c2894955cc930d748111d3eb15a5e7069d0f35ac93fe6da7e1519e757822e03641eae989bf08f3
+  data.tar.gz: 8040458407704e5d6541556dfc03929ff6cf753e7e1fec83ac835602faac08327fece6b7e684cf58f80ddf1938d8ade8059fd2f6343f78010ca437228947e4e0

data/lib/avm/data/instance/files_unit.rb

@@ -18,7 +18,7 @@ module Avm
         before_load :clear_files
 
         def files_path
-          ::File.join(instance.read_entry(:fs_path), fs_path_subpath)
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH), fs_path_subpath)
         end
 
         def dump_command
@@ -31,6 +31,7 @@ module Avm
 
         def clear_files
           infom "Removing all files under #{files_path}..."
+          instance.host_env.command('mkdir', '-p', files_path).execute!
           instance.host_env.command('find', files_path, '-mindepth', 1, '-delete').execute!
         end
       end

data/lib/avm/eac_rails_base0/apache_host.rb

@@ -6,7 +6,7 @@ module Avm
   module EacRailsBase0
     class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
       def document_root
-        "#{instance.read_entry(:fs_path)}/public"
+        "#{instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)}/public"
       end
 
       def extra_content

data/lib/avm/eac_rails_base0/apache_path.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase0
+    class ApachePath
+      enable_console_speaker
+      enable_simple_cache
+      common_constructor :instance, :options, default: [{}]
+
+      def run
+        write_available_conf
+        enable_conf
+        reload_apache
+        ::Avm::Result.success('Done')
+      end
+
+      def content
+        template.child('default.conf').apply(instance)
+      end
+
+      private
+
+      def apache_uncached
+        ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
+      end
+
+      def enable_conf
+        infom 'Enabling configuration...'
+        conf.enable
+      end
+
+      def reload_apache
+        infom 'Reloading Apache...'
+        apache.service('reload')
+      end
+
+      def conf_uncached
+        apache.conf(instance.id)
+      end
+
+      def write_available_conf
+        infom 'Writing available configuration...'
+        conf.write(content)
+      end
+    end
+  end
+end

data/lib/avm/eac_rails_base0/deploy.rb

@@ -42,7 +42,8 @@ module Avm
       def touch_restart_file
         infom 'Touching restart file...'
         instance.host_env.command(
-          'touch', ::File.join(instance.read_entry(:fs_path), 'tmp', 'restart.txt')
+          'touch', ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH),
+                               'tmp', 'restart.txt')
         ).system!
       end
     end

data/lib/avm/eac_rails_base0/instance.rb

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

data/lib/avm/eac_redmine_base0/deploy.rb

@@ -20,8 +20,8 @@ module Avm
       end
 
       def installer_path
-        ::File.join(instance.read_entry(:fs_path), 'plugins', 'redmine_installer', 'installer',
-                    'run.sh')
+        ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH), 'plugins',
+                    'redmine_installer', 'installer', 'run.sh')
       end
 
       def install_task

data/lib/avm/eac_redmine_base0/instance.rb

@@ -1,24 +1,25 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/data_unit'
-require 'avm/stereotypes/eac_ubuntu_base0/docker_image'
+require 'avm/eac_ubuntu_base0/docker_image'
 require 'avm/eac_webapp_base0/instance'
-require 'avm/stereotypes/rails/instance'
+require 'avm/rails/instance'
 
 module Avm
   module EacRedmineBase0
     class Instance < ::Avm::EacWebappBase0::Instance
-      include ::Avm::Stereotypes::Rails::Instance
+      include ::Avm::Rails::Instance
 
       FILES_UNITS = { files: 'files' }.freeze
 
       def docker_image_class
-        ::Avm::Stereotypes::EacUbuntuBase0::DockerImage
+        ::Avm::EacUbuntuBase0::DockerImage
       end
 
       def docker_run_arguments
         [
-          '--volume', "#{read_entry(:fs_path)}:/home/myuser/eac_redmine_base0",
+          '--volume',
+          "#{read_entry(::Avm::Instances::EntryKeys::FS_PATH)}:/home/myuser/eac_redmine_base0",
           '--publish', "#{read_entry(:ssh_port)}:22",
           '--publish', "#{read_entry(:http_port)}:80",
           '--publish', "#{read_entry(:https_port)}:443"

data/lib/avm/eac_ubuntu_base0/apache.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacUbuntuBase0
+    class Apache
+      require_sub __FILE__
+      common_constructor :host_env
+
+      def etc_root
+        '/etc/apache2'
+      end
+
+      def service(command)
+        host_env.command('sudo', 'service', 'apache2', command)
+      end
+
+      { conf: :conf, site: :sites }.each do |type, directory_prefix|
+        define_method type do |name|
+          ::Avm::EacUbuntuBase0::Apache::Resource.new(self, type, directory_prefix, name)
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ubuntu_base0/apache/resource.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacUbuntuBase0
+    class Apache
+      class Resource
+        common_constructor :apache, :type, :directory_prefix, :name
+
+        def available_path
+          ::File.join(apache.etc_root, "#{directory_prefix}-available", "#{name}.conf")
+        end
+
+        def available?
+          apache.host_env.file(available_path).exist?
+        end
+
+        def disable
+          apache.host_env.command('sudo', "a2dis#{type}", name).execute!
+        end
+
+        def enable
+          apache.host_env.command('sudo', "a2en#{type}", name).execute!
+        end
+
+        def enabled_path
+          ::File.join(apache.etc_root, "#{directory_prefix}-enabled", "#{name}.conf")
+        end
+
+        def enabled?
+          apache.host_env.file(enabled_path).exist?
+        end
+
+        def remove
+          remove_disabled
+          remove_available
+        end
+
+        def remove_available
+          raise 'Remove enabled before' if enabled?
+
+          apache.host_env.command('sudo', 'rm', '-f', available_path).execute! if available?
+        end
+
+        def remove_disabled
+          disable if enabled?
+          apache.host_env.command('sudo', 'rm', '-f', enabled_path).execute! if enabled?
+        end
+
+        def write(content)
+          ::EacRubyUtils::Envs.local.command('echo', content).pipe(
+            apache.host_env.command('sudo', 'tee', available_path)
+          ).execute!
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ubuntu_base0/docker_image.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/docker/image'
+
+module Avm
+  module EacUbuntuBase0
+    class DockerImage < ::Avm::Docker::Image
+      def stereotype_tag
+        'eac_ubuntu_base0'
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/apache_host.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/patches/object/template'
-require 'avm/stereotypes/eac_ubuntu_base0/apache'
+require 'avm/eac_ubuntu_base0/apache'
 require 'avm/patches/object/template'
 
 module Avm
@@ -35,7 +35,7 @@ module Avm
       private
 
       def apache_uncached
-        ::Avm::Stereotypes::EacUbuntuBase0::Apache.new(instance.host_env)
+        ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
       end
 
       def enable_no_ssl_site

data/lib/avm/eac_webapp_base0/deploy.rb

@@ -32,7 +32,7 @@ module Avm
       def build_git_commit
         ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
           instance.host_env,
-          instance.read_entry(:fs_path)
+          instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
         ).variables_source_set(instance)
       end
 
@@ -95,7 +95,7 @@ module Avm
       end
 
       def git_repository_path
-        instance.source_instance.read_entry(:fs_path)
+        instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
       end
     end
   end

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

@@ -27,7 +27,8 @@ module Avm
         end
 
         def target_path
-          ::File.join(instance.read_entry(:fs_path), fs_path_subpath.to_s)
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH),
+                      fs_path_subpath.to_s)
         end
 
         def link_source_target

data/lib/avm/git/auto_commit_path.rb

@@ -6,9 +6,11 @@ module Avm
   module Git
     class AutoCommitPath
       enable_console_speaker
-      common_constructor :git, :path
+      common_constructor :git, :path do
+        self.path = path.to_pathname
+      end
 
-      CLASS_NAME_PATTERNS = [%r{lib/(.+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
+      CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
 
       def run
         banner

data/lib/avm/instances/application.rb

@@ -13,6 +13,10 @@ module Avm
         @id = id.to_s
       end
 
+      def to_s
+        id
+      end
+
       def instance(suffix)
         ::Avm::Instances::Base.new(self, suffix)
       end

data/lib/avm/instances/base.rb

@@ -3,6 +3,7 @@
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
 require 'avm/instances/entries'
+require 'avm/instances/entry_keys'
 ::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
@@ -62,7 +63,7 @@ module Avm
       private
 
       def source_instance_uncached
-        ::Avm::Instances::Base.by_id(read_entry(:source_instance_id))
+        ::Avm::Instances::Base.by_id(read_entry(::Avm::Instances::EntryKeys::SOURCE_INSTANCE_ID))
       end
     end
   end

data/lib/avm/instances/base/auto_values/access.rb

@@ -10,19 +10,20 @@ module Avm
           end
 
           def auto_ssh_hostname
-            inherited_entry_value(:host_id, 'ssh.hostname')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.hostname')
           end
 
           def auto_ssh_port
-            inherited_entry_value(:host_id, 'ssh.port') || 22
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.port') || 22
           end
 
           def auto_ssh_username
-            inherited_entry_value(:host_id, 'ssh.username')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.username')
           end
 
           def auto_ssh_url
-            inherited_entry_value(:host_id, 'ssh.url') || auto_ssh_url_by_parts
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ssh.url') ||
+              auto_ssh_url_by_parts
           end
 
           def auto_ssh_url_by_parts

data/lib/avm/instances/base/auto_values/admin.rb

@@ -6,11 +6,11 @@ module Avm
       module AutoValues
         module Admin
           def auto_admin_email
-            inherited_entry_value(:host_id, 'admin.email')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.email')
           end
 
           def auto_admin_name
-            inherited_entry_value(:host_id, 'admin.name')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'admin.name')
           end
         end
       end

data/lib/avm/instances/base/auto_values/database.rb

@@ -46,7 +46,7 @@ module Avm
           def database_auto_common(suffix)
             database_key = ::Avm::Instances::EntryKeys.const_get("database_#{suffix}".upcase)
             inherited_entry_value(::Avm::Instances::EntryKeys::DATABASE_ID, database_key) ||
-              inherited_entry_value(:host_id, database_key)
+              inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, database_key)
           end
 
           def database_port_by_system

data/lib/avm/instances/base/auto_values/filesystem.rb

@@ -5,12 +5,18 @@ module Avm
     class Base
       module AutoValues
         module Filesystem
+          FS_PATH_KEY = :fs_path
+
           def auto_fs_path
-            inherited_entry_value(:host_id, :fs_path) { |v| v + '/' + id }
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, FS_PATH_KEY) do |v|
+              v + '/' + id
+            end
           end
 
           def auto_data_fs_path
-            inherited_entry_value(:host_id, :data_fs_path) { |v| v + '/' + id }
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, :data_fs_path) do |v|
+              v + '/' + id
+            end
           end
 
           def auto_fs_url

data/lib/avm/instances/base/auto_values/ruby.rb

@@ -6,7 +6,7 @@ module Avm
       module AutoValues
         module Ruby
           def auto_ruby_version
-            inherited_entry_value(:host_id, 'ruby.version')
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'ruby.version')
           end
         end
       end

data/lib/avm/instances/base/auto_values/system.rb

@@ -8,12 +8,12 @@ module Avm
       module AutoValues
         module System
           def auto_system_username
-            inherited_entry_value(:host_id, 'system.username') ||
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.username') ||
               read_entry_optional('ssh.username')
           end
 
           def auto_system_groupname
-            inherited_entry_value(:host_id, 'system.groupname') ||
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID, 'system.groupname') ||
               read_entry_optional('system.username')
           end
         end