avm-tools 0.71.0 → 0.75.0

data/lib/avm/git/commit/deploy.rb

@@ -2,90 +2,37 @@
 
 require 'addressable'
 require 'eac_ruby_utils/core_ext'
+require 'avm/files/appendable'
+require 'avm/files/deploy'
 require 'avm/patches/object/template'
 
 module Avm
   module Git
     class Commit
       class Deploy
-        require_sub __FILE__, include_modules: true
+        include ::Avm::Files::Appendable
         enable_simple_cache
 
-        attr_reader :build_dir, :commit, :target_env, :target_path, :variables_source
+        attr_reader :build_dir, :commit, :target_env, :target_path
 
         def initialize(commit, target_env, target_path)
           @commit = commit
           @target_env = target_env
           @target_path = target_path
-          @variables_source = nil
-        end
-
-        def variables_source_set(source)
-          @variables_source = source
-          self
         end
 
         def run
-          on_build_dir do
-            copy_git_content
-            copy_appended_content
-            mkdir_target
-            clear_content
-            send_untar_package
-            set_target_permission
-          end
+          fd = ::Avm::Files::Deploy.new(target_env, target_path)
+          fd.append_tar_output_command(git_archive_command)
+          fd.appended.push(*appended)
+          fd.run
         end
 
         private
 
-        def on_build_dir
-          @build_dir = ::Dir.mktmpdir
-          yield
-        ensure
-          ::FileUtils.rm_rf(@build_dir)
-        end
-
-        def copy_git_content
-          git_archive_command.pipe(untar_git_archive_command).execute!
-        end
-
-        def mkdir_target
-          target_env.command('mkdir', '-p', target_path).execute!
-        end
-
-        def clear_content
-          target_env.command(
-            'find', target_path, '-mindepth', '1', '-maxdepth', '1', '-exec', 'rm', '-rf', '{}', ';'
-          ).execute!
-        end
-
-        def send_untar_package
-          tar_build_command.pipe(untar_build_command).execute!
-        end
-
-        def set_target_permission
-          target_env.command('chmod', '755', target_path).execute!
-        end
-
         def git_archive_command
           commit.git.command('archive', '--format=tar', commit.sha1)
         end
-
-        def untar_git_archive_command
-          source_env.command('tar', '-xf', '-', '-C', build_dir)
-        end
-
-        def tar_build_command
-          source_env.command('tar', '-czO', '-C', build_dir, '.')
-        end
-
-        def untar_build_command
-          target_env.command('tar', '-xzf', '-', '-C', target_path)
-        end
-
-        def source_env
-          ::EacRubyUtils::Envs.local
-        end
       end
     end
   end

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/instances/runner.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Instances
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class << self
+        def instance_class
+          ::Avm.const_get(stereotype_name).const_get('Instance')
+        end
+
+        def stereotype_module
+          ::Avm.const_get(stereotype_name)
+        end
+
+        def stereotype_name
+          name.demodulize
+        end
+      end
+
+      runner_with
+      description = "Utilities for #{stereotype_name} instances."
+      runner_definition do
+        desc description
+        pos_arg 'instance-id'
+        subcommands
+      end
+
+      delegate :instance_class, :stereotype_module, :stereotype_name, to: :class
+
+      private
+
+      def instance_uncached
+        self.class.instance_class.by_id(options.fetch('<instance-id>'))
+      end
+    end
+  end
+end

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

@@ -4,8 +4,6 @@ require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
 
 module Avm
-  module Stereotypes
-    module Postgresql
-    end
+  module Postgresql
   end
 end

data/lib/avm/postgresql/instance.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'avm/postgresql/instance/data_unit'
+
+module Avm
+  module Postgresql
+    class Instance
+      def initialize(env, connection_params)
+        @env = env
+        @connection_params = connection_params.with_indifferent_access
+      end
+
+      def data_unit
+        ::Avm::Postgresql::Instance::DataUnit.new(self)
+      end
+
+      def dump_command
+        env.command('pg_dump', '--no-privileges', '--clean', '--no-owner', *common_command_args)
+           .envvar('PGPASSWORD', password)
+      end
+
+      def dump_gzip_command
+        dump_command.append(['@ESC_|', 'gzip', '-9', '-c'])
+      end
+
+      def psql_command
+        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args)
+      end
+
+      def psql_command_command(sql)
+        psql_command.append(['--quiet', '--tuples-only', '--command', sql])
+      end
+
+      private
+
+      attr_reader :env, :connection_params
+
+      def common_command_args
+        ['--host', host, '--username', user, '--port', port, name]
+      end
+
+      def host
+        connection_params[:host] || '127.0.0.1'
+      end
+
+      def port
+        connection_params[:port] || '5432'
+      end
+
+      def user
+        connection_params.fetch(:user)
+      end
+
+      def password
+        connection_params.fetch(:password)
+      end
+
+      def name
+        connection_params.fetch(:name)
+      end
+    end
+  end
+end