eac_tools 0.45.1 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c529e1c368fe44c68e5bbaafd5258fab08baefca7852a4c5bd2285825352374e
-  data.tar.gz: 464f786052703260b2d4b7364fd3edbeae7403020036108f1faeb6a49df0e426
+  metadata.gz: 42d2af3ec5802d3d4deaef86b0e225332d92bb079767121a8601d0d7a9765418
+  data.tar.gz: 062b466f4a749f6094769ede0583d1bd574f73ae05ffa30e0aeaa8a167e6ea2b
 SHA512:
-  metadata.gz: 14972773fe50b2bcb87738798c0608d78557a3c60d1c57bfb36d4590fe024b91a121b360b7f8cd8cbe058d827c90886a62b133127a4d744e2609924fb92ce792
-  data.tar.gz: 98e35772f9f6152c3e7f69b7667bf195e3280fd4ffb7ba1bf25be23968473b3403ecbdbbc37c11c05483cba11e9b43fc8be8099159117b324fdbc83ee5ab114f
+  metadata.gz: ae897ed254a4902dd543c1644015ee6f4ed269bd401949594cd8c5bfc764d9abce299cdbe4a9c6a04de72ec8f0870c93e617d36b39e7c83b202058970dd5f94b
+  data.tar.gz: 349afc035604be730dec4bc4a1ebf9ef670dc15c27364f2abe4a752d853c8a2f4a689493f087f86598434d886900d0d81cb26409970dba895f8e7028c92d7869

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.45.1)
-      avm (~> 0.56)
+    eac_tools (0.46.0)
+      avm (~> 0.57)
       avm-eac_asciidoctor_base0 (~> 0.12)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.3)
       avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
-      avm-eac_rails_base1 (~> 0.7)
-      avm-eac_redmine_base0 (~> 0.16)
-      avm-eac_redmine_plugin_base0 (~> 0.3)
+      avm-eac_rails_base1 (~> 0.7, >= 0.7.1)
+      avm-eac_redmine_base0 (~> 0.17)
+      avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
-      avm-eac_webapp_base0 (~> 0.12, >= 0.12.2)
+      avm-eac_webapp_base0 (~> 0.12, >= 0.12.3)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
       avm-tools (~> 0.142, >= 0.142.6)
       eac_ruby_utils (~> 0.107, >= 0.107.1)
@@ -62,6 +62,13 @@ PATH
       avm-eac_generic_base0 (~> 0.7)
       eac_ruby_utils (~> 0.106)
 
+PATH
+  remote: sub/avm-eac_postgresql_base0
+  specs:
+    avm-eac_postgresql_base0 (0.2.1)
+      avm (~> 0.56, >= 0.56.1)
+      eac_ruby_utils (~> 0.107, >= 0.107.1)
+
 PATH
   remote: sub/avm-eac_python_base0
   specs:
@@ -79,31 +86,31 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.7.0)
-      avm (~> 0.45)
-      avm-eac_ruby_base1 (~> 0.21)
-      avm-eac_webapp_base0 (~> 0.9)
-      eac_ruby_utils (~> 0.104)
+    avm-eac_rails_base1 (0.7.1)
+      avm (~> 0.57)
+      avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
+      avm-eac_webapp_base0 (~> 0.12, >= 0.12.3)
+      eac_ruby_utils (~> 0.107, >= 0.107.1)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.16.0)
-      avm (~> 0.44)
-      avm-eac_generic_base0 (~> 0.5)
-      avm-eac_rails_base1 (~> 0.6)
+    avm-eac_redmine_base0 (0.17.0)
+      avm (~> 0.57)
+      avm-eac_generic_base0 (~> 0.8)
+      avm-eac_rails_base1 (~> 0.7, >= 0.7.1)
       avm-eac_ubuntu_base0 (~> 0.3)
       curb (~> 0.9, >= 0.9.11)
-      eac_fs (~> 0.12, >= 0.12.3)
+      eac_fs (~> 0.15)
       eac_rest (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.104)
+      eac_ruby_utils (~> 0.107, >= 0.107.1)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
   specs:
-    avm-eac_redmine_plugin_base0 (0.3.0)
-      avm-eac_ruby_base1 (~> 0.11)
-      eac_ruby_utils (~> 0.95, >= 0.95.1)
+    avm-eac_redmine_plugin_base0 (0.4.0)
+      avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
+      eac_ruby_utils (~> 0.107, >= 0.107.1)
 
 PATH
   remote: sub/avm-eac_ruby_base1
@@ -116,13 +123,13 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.12.2)
-      avm (~> 0.54)
+    avm-eac_webapp_base0 (0.12.3)
+      avm (~> 0.57)
       avm-eac_generic_base0 (~> 0.8)
-      avm-eac_postgresql_base0 (~> 0.2)
+      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.1)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.6)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
+      eac_ruby_utils (~> 0.107, >= 0.107.1)
 
 PATH
   remote: sub/avm-eac_wordpress_base0
@@ -173,13 +180,13 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.56.0)
+    avm (0.57.0)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      eac_cli (~> 0.29)
+      eac_cli (~> 0.30)
       eac_config (~> 0.12)
       eac_docker (~> 0.5)
       eac_fs (~> 0.15)
-      eac_git (~> 0.13)
+      eac_git (~> 0.14)
       eac_ruby_utils (~> 0.107, >= 0.107.1)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
@@ -255,9 +262,6 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     asciidoctor (2.0.18)
     ast (2.4.2)
-    avm-eac_postgresql_base0 (0.2.0)
-      avm (~> 0.12, >= 0.12.1)
-      eac_ruby_utils (~> 0.82)
     avm-eac_ubuntu_base0 (0.3.0)
       avm (~> 0.7)
       eac_ruby_utils (~> 0.77, >= 0.77.1)
@@ -383,6 +387,7 @@ DEPENDENCIES
   avm-eac_generic_base0!
   avm-eac_latex_base0!
   avm-eac_php_base0!
+  avm-eac_postgresql_base0!
   avm-eac_python_base0!
   avm-eac_rails_base0!
   avm-eac_rails_base1!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.45.1'
+  VERSION = '0.46.0'
 end

data/sub/avm/avm.gemspec

@@ -13,11 +13,11 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
-  s.add_dependency 'eac_cli', '~> 0.29'
+  s.add_dependency 'eac_cli', '~> 0.30'
   s.add_dependency 'eac_config', '~> 0.12'
   s.add_dependency 'eac_docker', '~> 0.5'
   s.add_dependency 'eac_fs', '~> 0.15'
-  s.add_dependency 'eac_git', '~> 0.13'
+  s.add_dependency 'eac_git', '~> 0.14'
   s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'

data/sub/avm/lib/avm/data/callbacks.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'active_support/callbacks'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Data
+    module Callbacks
+      common_concern do
+        include ::ActiveSupport::Callbacks
+
+        %i[dump load].each do |action|
+          define_callbacks action
+
+          %i[before after].each do |callback|
+            method_name = "#{callback}_#{action}"
+            singleton_class.class_eval do
+              define_method method_name do |callback_method = nil, &block|
+                if callback_method
+                  set_callback action, callback, callback_method
+                else
+                  set_callback action, callback, &block
+                end
+                self
+              end
+            end
+
+            define_method method_name do |callback_method = nil, &block|
+              singleton_class.send(method_name, callback_method, &block)
+              self
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/data/package.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'avm/data/package/dump'
-require 'avm/data/package/load'
+require 'avm/data/callbacks'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Data
     class Package
-      attr_reader :units
+      require_sub __FILE__
+      include ::Avm::Data::Callbacks
 
       def initialize(options)
-        @units = {}
         options = options.to_options_consumer
         units = options.consume(:units)
         options.validate
@@ -19,7 +19,7 @@ module Avm
       end
 
       def add_unit(identifier, unit)
-        @units[identifier.to_sym] = unit
+        units[identifier.to_sym] = unit
       end
 
       def dump(data_path, options = {})
@@ -31,11 +31,19 @@ module Avm
       end
 
       def dump_units_to_directory(directory)
-        @units.each { |identifier, unit| unit.dump_to_directory(directory, identifier) }
+        run_callbacks :dump do
+          units.each { |identifier, unit| unit.dump_to_directory(directory, identifier) }
+        end
       end
 
       def load_units_from_directory(directory)
-        @units.each { |identifier, unit| unit.load_from_directory(directory, identifier) }
+        run_callbacks :load do
+          units.each { |identifier, unit| unit.load_from_directory(directory, identifier) }
+        end
+      end
+
+      def units
+        @units ||= {}
       end
     end
   end

data/sub/avm/lib/avm/data/unit.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
+require 'avm/data/callbacks'
 require 'eac_ruby_utils/core_ext'
-require 'active_support/callbacks'
 
 module Avm
   module Data
     class Unit
-      include ::ActiveSupport::Callbacks
+      include ::Avm::Data::Callbacks
 
-      define_callbacks :dump, :load
       enable_speaker
 
       %w[dump load].each do |action|
@@ -20,26 +19,6 @@ module Avm
             fail "\\"#{method_name}\\" is a abstract method. Override in #{singleton_class}."
           end
         CODE
-
-        # Callbacks
-        %w[before after].each do |callback|
-          method = "#{callback}_#{action}"
-          class_eval <<~CODE, __FILE__, __LINE__ + 1
-            def self.#{method}(callback_method = nil, &block)
-              if callback_method
-                set_callback :#{action}, :#{callback}, callback_method
-              else
-                set_callback :#{action}, :#{callback}, &block
-              end
-              self
-            end
-
-            def #{method}(callback_method = nil, &block)
-              singleton_class.#{method}(callback_method, &block)
-              self
-            end
-          CODE
-        end
       end
 
       def extension

data/sub/avm/lib/avm/entries/uri_builder.rb

@@ -46,8 +46,10 @@ module Avm
         field_get(translate_field(avm_field))
       end
 
+      # @return [String, nil]
       def field_get(name)
-        data[name.to_sym].if_present(&:to_s)
+        v = data[name.to_sym]
+        v.nil? ? nil : v.to_s
       end
 
       def field_set(field, value)

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

@@ -15,7 +15,7 @@ module Avm
               .if_present do |v|
               ::File.join(
                 v,
-                "#{id}#{::Avm::Data::Instance::Package::Dump::DEFAULT_FILE_EXTENSION}"
+                "#{id}#{::Avm::Instances::Data::Package::Dump::DEFAULT_FILE_EXTENSION}"
               )
             end
           end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'avm/instances/data/unit'
+
+module Avm
+  module Instances
+    module Data
+      class FilesUnit < ::Avm::Instances::Data::Unit
+        EXTENSION = '.tar.gz'
+
+        enable_listable
+        lists.add_symbol :option, :sudo_user
+
+        common_constructor :instance, :fs_path_subpath, :options, default: [{}],
+                                                                  super_args: -> { [instance] } do
+          self.fs_path_subpath = fs_path_subpath.to_pathname
+          self.options = self.class.lists.option.hash_keys_validate!(options)
+        end
+
+        before_load :clear_files
+
+        # @return [Pathname]
+        def files_path
+          fs_path_subpath
+            .expand_path(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH))
+        end
+
+        def dump_command
+          instance_command('tar', '-czf', '-', '-C', files_path, '.')
+        end
+
+        def load_command
+          instance_command('tar', '-xzf', '-', '-C', files_path)
+        end
+
+        def clear_files
+          infom "Removing all files under #{files_path}..."
+          instance_command('mkdir', '-p', files_path).execute!
+          instance_command('find', files_path, '-mindepth', 1, '-delete').execute!
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def instance_command(*args)
+          args = ['sudo', '-Hu', sudo_user] + args if sudo_user.present?
+          instance.host_env.command(*args)
+        end
+
+        # @return [String, nil]
+        def sudo_user
+          options[OPTION_SUDO_USER]
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/{data/instance → instances/data}/package.rb

@@ -3,8 +3,8 @@
 require 'avm/data/package'
 
 module Avm
-  module Data
-    module Instance
+  module Instances
+    module Data
       class Package < ::Avm::Data::Package
         attr_reader :instance
 

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/data/unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    module Data
+      class Unit < ::Avm::Data::Unit
+        common_constructor :instance
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Instances
+    module Data
+      require_sub __FILE__
+    end
+  end
+end

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

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

data/sub/avm/spec/lib/avm/instances/base_spec.rb

@@ -22,7 +22,9 @@ RSpec.describe ::Avm::Instances::Base do
       ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'myhost.com',
       ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'myuser',
       ::Avm::Instances::EntryKeys::INSTALL_GROUPNAME => 'myuser',
-      ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com'
+      ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com',
+      ::Avm::Instances::EntryKeys::WEB_URL => 'https://app0.net',
+      ::Avm::Instances::EntryKeys::WEB_PATH => ''
     },
     'app_2' => {
       ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => '127.0.0.1',

data/sub/avm/spec/lib/avm/instances/base_spec_files/config.yml

@@ -2,6 +2,8 @@
 app_0:
   install:
     id: app_1
+  web:
+    url: https://app0.net
 app_1:
   install:
     id: app_2

data/sub/avm-eac_postgresql_base0/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_postgresql_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_postgresql_base0'
+  s.version     = Avm::EacPostgresqlBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'avm', '~> 0.56', '>= 0.56.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+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/data_unit.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'avm/instances/data/unit'
+
+module Avm
+  module EacPostgresqlBase0
+    class Instance
+      class DataUnit < ::Avm::Instances::Data::Unit
+        EXTENSION = '.pgdump.gz'
+
+        before_load :clear_database
+
+        def dump_command
+          instance.dump_gzip_command
+        end
+
+        def load_command
+          instance.psql_command.prepend(['gzip', '-d', '@ESC_|'])
+        end
+
+        private
+
+        def clear_database
+          info 'Clearing database (Dropping all tables)...'
+          run_sql(drop_all_tables_sql).if_present { |v| run_sql(v) }
+        end
+
+        def drop_all_tables_sql
+          "select 'drop table \"' || tablename || '\" cascade;' from pg_tables " \
+            "where schemaname = 'public';"
+        end
+
+        def run_sql(sql)
+          instance.psql_command_command(sql).execute!
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'avm/eac_postgresql_base0/instance/data_unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPostgresqlBase0
+    class Instance
+      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
+        ::Avm::EacPostgresqlBase0::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(database = true)
+        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args(database))
+      end
+
+      def psql_command_command(sql, database = true)
+        psql_command(database).append(['--quiet', '--tuples-only', '--command', sql])
+      end
+
+      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(database = true)
+        ['--host', host, '--username', user, '--port', port,
+         (database ? name : MAINTENANCE_DATABASE)]
+      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