avm-tools 0.114.2 → 0.116.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e2a7df849fd040b8e6fddad4e1c8507139926f0b587ceab796c1416fb9af873
-  data.tar.gz: 70eb055f94b37d37e05510563a654350137d0358283ad7d33a4d895110f1f2cc
+  metadata.gz: 9a2ba57966d3d9df50f672ea915acbf2d245c9a84665c57ea1618693c5e1e6b0
+  data.tar.gz: d3ab208447bf90b3eacac1bc9b9e824ab1d2b5c94caeec32aa8d6c2505257b8a
 SHA512:
-  metadata.gz: 90be4e12df6cda16ffc88680a42a6d3dd118e96f97840cfb4a49b4418b76df1826485065ca069e3105d942136ed9273f03e9e15b340c4913abfeacae01ce1eba
-  data.tar.gz: 262a63d17a298911bef85e025b678779e8d7795e2376349128999fc50442275a0303bde419921e2799a3f8a9923366d3996c655ea032d909ca555f6b7d6892a5
+  metadata.gz: 56714834b02e5f8d58091f4599dc0334d91c8953f62ca4112a0b2ae116a9be48d92e077702a9263f027157773b8b5fda3989ff82609d2e689053352e70dc9d86
+  data.tar.gz: 3acfd216f55ac712a087e4e5363f253a2633367d8f7f0f78107a0cb3e521dd9cdfb86eb058f1af2a8e8d78a388ed1897521bd5553c150589363d6347c64c3850

data/lib/avm/tools/runner/git/deploy.rb

@@ -86,7 +86,7 @@ module Avm
 
           def target_url
             parsed.target_url.if_present { |v| return v }
-            instance.if_present { |v| return v.read_entry('fs.url') }
+            instance.if_present { |v| return v.read_entry(::Avm::Instances::EntryKeys::FS_URL) }
             nil
           end
 

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.114.2'
+    VERSION = '0.116.1'
   end
 end

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

@@ -37,7 +37,7 @@ module Avm
           end
 
           def auto_database_password
-            database_auto_common('password')
+            database_auto_common('password') || id
           end
 
           def auto_database_port
@@ -45,7 +45,7 @@ module Avm
           end
 
           def auto_database_username
-            database_auto_common('username')
+            database_auto_common('username') || id
           end
 
           def auto_database_system

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -43,11 +43,14 @@ module Avm
 
       {
         '' => %w[data_fs_path fs_path host_id name source_instance_id],
+        admin: %w[username password api_key],
         database: %w[id hostname limit name password port system timeout username extra],
         docker: %w[registry],
+        fs: %w[url],
         mailer: {
           '' => %w[id from reply_to],
-          smtp: %w[address port domain username password authentication starttls_auto]
+          smtp: %w[address port domain username password authentication openssl_verify_mode
+                   starttls_auto tls]
         },
         ssh: %w[hostname port url username],
         web: %w[authority hostname path port scheme url userinfo]

data/sub/avm/lib/avm/self/instance.rb

@@ -3,7 +3,6 @@
 require 'avm/instances/base'
 require 'avm/self/docker_image'
 require 'avm/self/instance/entry_keys'
-require 'avm/eac_ubuntu_base0/docker_image'
 
 module Avm
   module Self

data/sub/avm/lib/avm/sources/base/instance.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/instances/application'
+require 'avm/instances/base'
+
+module Avm
+  module Sources
+    class Base
+      module Instance
+        DEFAULT_INSTANCE_SUFFIX = 'dev'
+
+        def instance_suffix
+          DEFAULT_INSTANCE_SUFFIX
+        end
+
+        private
+
+        def application_uncached
+          ::Avm::Instances::Application.new(path.basename)
+        end
+
+        def instance_uncached
+          ::Avm::Instances::Base.new(application, DEFAULT_INSTANCE_SUFFIX)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.15.0'
+  VERSION = '0.18.0'
 end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build/file.rb

@@ -17,7 +17,7 @@ module Avm
           end
 
           def source_path
-            build.project.root.join(subpath)
+            build.project.path.join(subpath)
           end
 
           def target_path

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/build.rb

@@ -25,7 +25,7 @@ module Avm
         end
 
         def default_target_directory
-          project.root.join('build')
+          project.path.join('build')
         end
 
         def target_directory
@@ -36,7 +36,7 @@ module Avm
 
         def source_files_uncached
           r = []
-          project.root.children.each do |child|
+          project.path.children.each do |child|
             next unless SOURCE_EXTNAMES.include?(child.extname)
 
             r << ::Avm::EacAsciidoctorBase0::Sources::Build::File.new(self, child.basename)

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runner/build.rb

@@ -29,7 +29,7 @@ module Avm
           end
 
           def default_target_directory
-            runner_context.call(:project).root.join('build')
+            runner_context.call(:project).path.join('build')
           end
 
           def open

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runner.rb

@@ -15,8 +15,8 @@ module Avm
         end
 
         def project_banner
-          infov 'Project', project.name
-          infov 'Path', project.root
+          infov 'Project', project.application.name
+          infov 'Path', project.path
         end
 
         private

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/assert.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPostgresqlBase0
+    class Instance
+      class Assert
+        common_constructor :instance
+        delegate :name, :password, :user, to: :instance
+
+        def perform
+          create_user unless user_exist?
+          change_password unless password_ok?
+          create_database unless database_exist?
+          change_owner unless user_owner?
+        end
+
+        def change_owner
+          root_execute("ALTER DaTABASE \"#{name}\" OWNER TO \"#{user}\"")
+        end
+
+        def change_password
+          root_execute("ALTER USER \"#{user}\" WITH PASSWORD '#{password}'")
+        end
+
+        def create_user
+          root_execute("CREATE USER \"#{user}\" WITH PASSWORD '#{password}'")
+        end
+
+        def current_owner
+          root_query(<<~SQL
+            SELECT pg_catalog.pg_get_userbyid(datdba)
+            FROM pg_catalog.pg_database
+            WHERE datname = '#{name}'
+          SQL
+                    )
+        end
+
+        def database_exist?
+          root_boolean_query("FROM pg_database WHERE datname='#{name}'")
+        end
+
+        def password_ok?
+          instance.psql_command_command('SELECT 1', false)
+                  .execute!(exit_outputs: { 512 => 'login_failed' }).strip == '1'
+        end
+
+        def user_exist?
+          root_boolean_query("FROM pg_roles WHERE rolname='#{user}'")
+        end
+
+        def user_owner?
+          user == current_owner
+        end
+
+        def create_database
+          root_execute("CREATE DATABASE \"#{name}\" WITH OWNER \"#{user}\"")
+        end
+
+        private
+
+        def root_boolean_query(sql_after_projection)
+          root_query("SELECT 1 #{sql_after_projection}") == '1'
+        end
+
+        def root_execute(sql)
+          instance.root_psql_command(sql).execute!
+        end
+
+        def root_query(sql)
+          root_execute(sql).strip
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance.rb

@@ -1,13 +1,21 @@
 # frozen_string_literal: true
 
 require 'avm/eac_postgresql_base0/instance/data_unit'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacPostgresqlBase0
     class Instance
-      def initialize(env, connection_params)
-        @env = env
-        @connection_params = connection_params.with_indifferent_access
+      require_sub __FILE__
+
+      MAINTENANCE_DATABASE = 'postgres'
+
+      common_constructor :env, :connection_params do
+        self.connection_params = connection_params.with_indifferent_access
+      end
+
+      def assert
+        ::Avm::EacPostgresqlBase0::Instance::Assert.new(self).perform
       end
 
       def data_unit
@@ -23,20 +31,23 @@ module Avm
         dump_command.append(['@ESC_|', 'gzip', '-9', '-c'])
       end
 
-      def psql_command
-        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args)
+      def psql_command(database = true)
+        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args(database))
       end
 
-      def psql_command_command(sql)
-        psql_command.append(['--quiet', '--tuples-only', '--command', sql])
+      def psql_command_command(sql, database = true)
+        psql_command(database).append(['--quiet', '--tuples-only', '--command', sql])
       end
 
-      private
-
-      attr_reader :env, :connection_params
+      def root_psql_command(sql = nil)
+        args = ['sudo', '-u', 'postgres', 'psql']
+        args += ['--quiet', '--tuples-only', '--command', sql] if sql.present?
+        env.command(*args)
+      end
 
-      def common_command_args
-        ['--host', host, '--username', user, '--port', port, name]
+      def common_command_args(database = true)
+        ['--host', host, '--username', user, '--port', port,
+         (database ? name : MAINTENANCE_DATABASE)]
       end
 
       def host

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.1', '>= 0.1.3'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.2'
   s.add_dependency 'eac_ruby_utils', '~> 0.80', '>= 0.80.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/deploy.rb

@@ -18,7 +18,7 @@ module Avm
 
       def assert_database
         infom 'Asserting database...'
-        instance.rake('db:create').system!
+        instance.pg.assert
       end
 
       def bundle_install

data/sub/avm-eac_rails_base0/lib/avm/eac_rails_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.1.3'
+    VERSION = '0.3.0'
   end
 end

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.2', '>= 0.2.1'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.3'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '>= 0.9.9'
   s.add_dependency 'eac_ruby_utils', '~> 0.68'
 

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/tasks_scheduler/systemd_unit.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/systemd_unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class TasksScheduler
+        class SystemdUnit
+          DEFAULT_RESTART = 'on-failure'
+
+          runner_with :help do
+            desc 'Configure Systemd unit for instace\'s tasks scheduler daemon (Reference: ' \
+              'https://www.freedesktop.org/software/systemd/man/systemd.service.html).'
+            bool_opt '-e', '--exec-run', 'Run daemon with "run" instead of "start"/"stop".'
+            arg_opt '-r', '--restart', 'Value for systemd.service, Restart=.',
+                    default: DEFAULT_RESTART
+          end
+
+          delegate :restart, to: :parsed
+
+          def run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          private
+
+          def systemd_unit_uncached
+            ::Avm::EacRailsBase1::SystemdUnit.new(runner_context.call(:instance),
+                                                  restart: parsed.restart,
+                                                  exec_run: parsed.exec_run?)
+          end
+
+          def result_uncached
+            systemd_unit.run
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/runner/tasks_scheduler.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class TasksScheduler
+        require_sub __FILE__
+
+        runner_with :help, :subcommands do
+          subcommands
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/service.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class SystemdUnit
+      module Service
+        def service_content
+          template.child('tasks_scheduler.service').apply(variables_source)
+        end
+
+        def service_exec_lines
+          service_exec_operations
+            .map { |k, v| "#{k}=#{tasks_scheduler_command_path} #{v}" }
+            .join("\n")
+        end
+
+        def service_path
+          ::Pathname.new('/etc/systemd/system').join(unit_name)
+        end
+
+        def service_link_path
+          ::Pathname.new('/etc/systemd/system/multi-user.target.wants').join(unit_name)
+        end
+
+        def verify_service
+          sudo_system!('systemd-analyze', 'verify', service_path)
+        end
+
+        private
+
+        def enable_service
+          systemctl('enable', unit_name)
+        end
+
+        def link_service
+          sudo_execute!('rm', '-f', service_link_path)
+          sudo_execute!('ln', '-s', service_path, service_link_path)
+        end
+
+        def reload_systemd
+          systemctl('daemon-reload')
+        end
+
+        # @return [Hash<String, String>]
+        def service_exec_operations
+          if exec_run?
+            { 'ExecStart' => 'run' }
+          else
+            { 'ExecStart' => 'start', 'ExecStop' => 'stop' }
+          end
+        end
+
+        def start_service
+          systemctl('start', unit_name)
+        end
+
+        def systemctl(*args)
+          sudo_system!('systemctl', *args)
+        end
+
+        def write_service
+          infom 'Writing service\'s unit file...'
+          platform_instance.file_sudo_write(service_path, service_content)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class SystemdUnit
+      module TasksSchedulerCommand
+        def tasks_scheduler_command_content
+          template.child('tasks_scheduler_command.sh').apply(variables_source)
+        end
+
+        def tasks_scheduler_command_path
+          "/opt/aux/#{instance.id}/tasks_scheduler.sh"
+        end
+
+        private
+
+        def write_tasks_scheduler_command
+          infom 'Writing tasks scheduler\'s command...'
+          sudo_execute!('mkdir', '-p', ::File.dirname(tasks_scheduler_command_path))
+          platform_instance.file_sudo_write(tasks_scheduler_command_path,
+                                            tasks_scheduler_command_content)
+          sudo_execute!('chmod', '+x', tasks_scheduler_command_path)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'avm/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRailsBase1
+    class SystemdUnit
+      JOBS = %w[write_tasks_scheduler_command write_service link_service verify_service
+                reload_systemd enable_service start_service].freeze
+
+      include ::Avm::Jobs::Base
+      require_sub __FILE__, include_modules: true
+      delegate :platform_instance, to: :instance
+
+      enable_listable
+      lists.add_symbol :option, :exec_run, :restart
+
+      def description
+        "#{instance.id} Tasks Scheduler"
+      end
+
+      def exec_run?
+        options[OPTION_EXEC_RUN]
+      end
+
+      def option_list
+        self.class.lists.option
+      end
+
+      def restart
+        options[OPTION_RESTART]
+      end
+
+      def unit_name
+        "#{instance.id}_tasks_scheduler.service"
+      end
+
+      def user
+        instance.ssh_username
+      end
+
+      private
+
+      def sudo_execute!(*args)
+        platform_instance.host_env.command(['sudo'] + args).execute!
+      end
+
+      def sudo_system!(*args)
+        command_args = ['sudo'] + args
+        infom "Running \"#{::Shellwords.join(command_args)}\"..."
+        platform_instance.host_env.command(command_args).system!
+      end
+    end
+  end
+end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.1.4'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler.service

@@ -0,0 +1,12 @@
+[Unit]
+Description='%%description%%'
+After=postgresql.service
+
+[Service]
+Type=forking
+%%service_exec_lines%%
+Restart=%%restart%%
+User=%%user%%
+
+[Install]
+WantedBy=multi-user.target

data/sub/avm-eac_rails_base1/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+source "$HOME/.rvm/scripts/rvm"
+( cd '%%fs_path%%'; bundle exec tasks_scheduler "$@" )

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.1'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.2'
   s.add_dependency 'curb', '~> 0.9.10'
   s.add_dependency 'eac_fs', '~> 0.4'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/deploy/config/install.sh.template

@@ -18,9 +18,9 @@ export git_repositories_hierarchical_organisation=false
 export smtp_server='%%MAILER.SMTP.ADDRESS%%'
 export smtp_port='%%MAILER.SMTP.PORT%%'
 export smtp_domain='%%MAILER.SMTP.DOMAIN%%'
-export smtp_tls='%%MAILER_SMTP_TLS%%'
-export smtp_enable_starttls_auto='%%MAILER_SMTP_STARTTLS_AUTO%%'
-export smtp_openssl_verify_mode='%%MAILER_SMTP_OPENSSL_VERIFY_MODE%%'
+export smtp_tls='%%MAILER.SMTP.TLS%%'
+export smtp_enable_starttls_auto='%%MAILER.SMTP.STARTTLS_AUTO%%'
+export smtp_openssl_verify_mode='%%MAILER.SMTP.OPENSSL_VERIFY_MODE%%'
 export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
 export smtp_username='%%MAILER.SMTP.USERNAME%%'
 export smtp_password='%%MAILER.SMTP.PASSWORD%%'

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/instances/base.rb

@@ -10,6 +10,12 @@ module Avm
         def docker_image_class
           ::Avm::EacUbuntuBase0::DockerImage
         end
+
+        def file_sudo_write(path, content)
+          ::EacRubyUtils::Envs.local.command('echo', content).pipe(
+            host_env.command('sudo', 'tee', path)
+          ).execute!
+        end
       end
     end
   end

data/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacUbuntuBase0
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end