avm-tools 0.70.0 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f29b6293211fb41769c831fee400ab44f3e7b23cce9a80cbe43fe66ff6c793f
-  data.tar.gz: b4ae8baa035b47388bf6266033a3a901911adbbf3841a4c5dc401bbf2e5081b8
+  metadata.gz: af0f11c7a0f00c23780d97a299a822c01a7466d5f229d4c0cbe137d11dbce8c5
+  data.tar.gz: 06d5dfc23be320ea36ccdf30af582effae03309c29377912760a23c832f7fac3
 SHA512:
-  metadata.gz: 12892c4a448f9238bd4e3ec55e1c4f03761a0a29ed5fb0fcf5a65962c314eae74903a4e1412acdeef945b896dc44f6f22bdaf4a3c989b78edd8b2f880efb32fe
-  data.tar.gz: 1f24a30ed4cd5f821ade563da4e1e3595cc3416fec7037ff847a988d8dc49f932a45c15143a3637a155ed5372027e2fd3be66c97bf34f99b53f55e234a2553b5
+  metadata.gz: e4b9ac7532a83c97b55c32d5655c6ae86d83d8b182eabbd9bc1dff629ca297c36c4190dea0c444b3b51dfb3a436368757b47feaa13e16ca40c8421b83966a25e
+  data.tar.gz: f97b797046e7e73c40b15b6c789982c2fcc095d2a01a0cbd37e4db3f483433319e36b3fc40da872625f4de4c0a636983c31ca1e6dfc95c965324b433be2d3c07

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

@@ -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/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/instance.rb

@@ -3,12 +3,12 @@
 require 'avm/eac_redmine_base0/data_unit'
 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
 

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

@@ -10,7 +10,8 @@ module Avm
         extend ::ActiveSupport::Concern
 
         included do
-          %w[Access Admin Data Database Filesystem Ruby Source System Web].each do |class_name|
+          %w[Access Admin Data Database Filesystem Mailer Ruby Source System Web]
+            .each do |class_name|
             include const_get(class_name)
           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

@@ -8,11 +8,15 @@ module Avm
           FS_PATH_KEY = :fs_path
 
           def auto_fs_path
-            inherited_entry_value(:host_id, FS_PATH_KEY) { |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/mailer.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        module Mailer
+          ::Avm::Instances::EntryKeys.all.select { |c| c.to_s.start_with?('mailer.') }
+                                     .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
+                                     .each do |mailer_key|
+            define_method ::Avm::Instances::Entry.auto_value_method_name(mailer_key) do
+              mailer_auto_common(mailer_key)
+            end
+          end
+
+          def auto_mailer_id
+            inherited_entry_value(::Avm::Instances::EntryKeys::HOST_ID,
+                                  ::Avm::Instances::EntryKeys::MAILER_ID) ||
+              read_entry_optional(::Avm::Instances::EntryKeys::HOST_ID)
+          end
+
+          private
+
+          def mailer_auto_common(mailer_key)
+            inherited_entry_value(::Avm::Instances::EntryKeys::MAILER_ID, mailer_key)
+          end
+        end
+      end
+    end
+  end
+end

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

data/lib/avm/instances/entry.rb

@@ -5,6 +5,12 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module Instances
     class Entry
+      class << self
+        def auto_value_method_name(suffix)
+          "auto_#{suffix.to_s.gsub('.', '_')}"
+        end
+      end
+
       common_constructor :parent, :suffix, :options
 
       def auto_value
@@ -12,7 +18,7 @@ module Avm
       end
 
       def auto_value_method
-        "auto_#{suffix.to_s.gsub('.', '_')}"
+        self.class.auto_value_method_name(suffix)
       end
 
       def full_path

data/lib/avm/instances/entry_keys.rb

@@ -3,17 +3,52 @@
 module Avm
   module Instances
     module EntryKeys
-      {
-        database: %w[id hostname name password port system username],
-        web: %w[authority hostname path port scheme url userinfo]
-      }.each do |prefix, suffixes|
-        suffixes.each do |suffix|
-          key = "#{prefix}.#{suffix}"
+      class << self
+        def all
+          all_keys.to_a
+        end
+
+        def keys_consts_set(prefix, suffixes)
+          if suffixes.is_a?(::Hash)
+            keys_consts_set_from_hash(prefix, suffixes)
+          elsif suffixes.is_a?(::Enumerable)
+            keys_consts_set_from_enum(prefix, suffixes)
+          else
+            raise "Unmapped suffixes class: #{suffixes.class}"
+          end
+        end
+
+        def key_const_set(prefix, suffix)
+          key = [prefix, suffix].reject(&:blank?).join('.')
           const_set(key.gsub('.', '_').upcase, key)
+          all_keys << key
+        end
+
+        private
+
+        def all_keys
+          @all_keys ||= ::Set.new
+        end
+
+        def keys_consts_set_from_enum(prefix, suffixes)
+          suffixes.each { |suffix| key_const_set(prefix, suffix) }
+        end
+
+        def keys_consts_set_from_hash(prefix, suffixes)
+          suffixes.each { |k, v| keys_consts_set(prefix.to_s + (k.blank? ? '' : ".#{k}"), v) }
         end
       end
 
-      FS_PATH = 'fs_path'
+      {
+        '' => %w[fs_path host_id source_instance_id],
+        database: %w[id hostname name password port system username],
+        mailer: {
+          '' => %w[id from reply_to],
+          smtp: %w[address port domain username password authentication starttls_auto]
+        },
+        ssh: %w[hostname port url username],
+        web: %w[authority hostname path port scheme url userinfo]
+      }.each { |prefix, suffixes| keys_consts_set(prefix, suffixes) }
     end
   end
 end

data/lib/avm/patches/i18n.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/self'
+require 'avm/self/root'
 require 'i18n'
 
 module Avm

data/lib/avm/patches/object/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/self'
+require 'avm/self/root'
 require 'eac_ruby_utils/patches/object/template'
 
 ::EacRubyUtils::Templates::Searcher.default.included_paths <<

data/lib/avm/rails/instance.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Avm
+  module Rails
+    module Instance
+      def bundle(*args)
+        the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', 'production')
+      end
+
+      def rake(*args)
+        bundle('exec', 'rake', *args)
+      end
+
+      def the_gem
+        @the_gem ||= ::EacRubyGemsUtils::Gem.new(::File.join(read_entry('fs_path')), host_env)
+      end
+    end
+  end
+end

data/lib/avm/self.rb

@@ -16,10 +16,6 @@ module Avm
       def instance
         @instance ||= ::Avm::Self::Instance.by_id('avm-tools_self')
       end
-
-      def root
-        ::Pathname.new('../..').expand_path(__dir__)
-      end
     end
   end
 end

data/lib/avm/self/root.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+module Avm
+  module Self
+    class << self
+      def root
+        ::Pathname.new('../../..').expand_path(__dir__)
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_rails_base0/rails_server.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'shellwords'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class RailsServer
+          runner_with
+
+          runner_definition do
+            desc 'Run the embbeded Rails web server.'
+            arg_opt '-e', '--environment', 'Specifies the environment to run this server under' \
+              ' (development/test/production).'
+          end
+
+          def run
+            infov 'Bundle args', ::Shellwords.join(bundle_args)
+            infov 'Result', command.system
+          end
+
+          protected
+
+          def bundle_args
+            ['exec', 'rails', 'server', '--port',
+             runner_context.call(:instance).read_entry(::Avm::Instances::EntryKeys::WEB_PORT)] +
+              parsed.environment.if_present([]) { |v| ['--environment', v] }
+          end
+
+          def command
+            runner_context.call(:instance).bundle(*bundle_args).chdir_root
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/instance.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Instance < ::EacRubyUtils::Console::DocoptRunner
+        require_sub __FILE__
+        runner_with
+
+        runner_definition do
+          desc 'Utilities for generic instances.'
+          pos_arg :instance_id
+          subcommands
+        end
+
+        private
+
+        def instance_uncached
+          ::Avm::Instances::Base.by_id(options['<instance_id>'])
+        end
+      end
+    end
+  end
+end