eac_tools 0.62.0 → 0.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6015e5a017d606e064cf4b1672653826b286f9677550ef552af41178d4815ea
-  data.tar.gz: 210b3d6290d05b251ba3ab7706475f488f1509142007ebd5f4928af0d22fa4ff
+  metadata.gz: 34c1534552adb0067a16227d3ed1088b61edcc7a7696e64e4f4cf93d6b14e445
+  data.tar.gz: a29798e301ac321eab2959b93856c2d76bc54577af236c7210fc127fc42d5df7
 SHA512:
-  metadata.gz: e6f47cb1544b15c17c3bcf6b4f989886616bf84b9df34b47b6efbbb2ab954bc33c2db5cc2a8ecf58398370f775453212325de74cfd127d7ee417499cc8594788
-  data.tar.gz: 6cd049e9d7d17c35b136f25c70ce638e7a5e4375230c948b39afc1ca3238751337320b3abead82684b327e561a787ef9e3054784d4056842c5387c4ffc16d97e
+  metadata.gz: e6ad6ea56a99b6e12570f34c1400e21e93d300b88f3339d57881196dbdad10a14389434d2615364b69d200aad9c13e393d1f7fabf643572130c5d71c3908ebc2
+  data.tar.gz: a63d5fc42089b05134fe217d3f242866812a47efaffac71e231c624e898c74724de4f2f42cc251a33c1d9b92a061b14e5d51a4e46add3a810a4bbadbc4223786

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.62.0)
+    eac_tools (0.62.1)
       avm (~> 0.68)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
       avm-eac_php_base0 (~> 0.4, >= 0.4.2)
-      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.4)
+      avm-eac_postgresql_base0 (~> 0.3)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
-      avm-eac_rails_base0 (~> 0.10, >= 0.10.1)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
-      avm-eac_redmine_base0 (~> 0.20)
+      avm-eac_rails_base0 (~> 0.10, >= 0.10.2)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
+      avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
-      avm-eac_webapp_base0 (~> 0.15)
+      avm-eac_webapp_base0 (~> 0.15, >= 0.15.1)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.2)
       avm-tools (~> 0.145, >= 0.145.1)
@@ -67,8 +67,8 @@ PATH
 PATH
   remote: sub/avm-eac_postgresql_base0
   specs:
-    avm-eac_postgresql_base0 (0.2.4)
-      avm (~> 0.66, >= 0.66.1)
+    avm-eac_postgresql_base0 (0.3.0)
+      avm (~> 0.68)
       eac_ruby_utils (~> 0.112)
 
 PATH
@@ -81,26 +81,26 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.10.1)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
+    avm-eac_rails_base0 (0.10.2)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
       eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.8.3)
-      avm (~> 0.67)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.1)
-      avm-eac_webapp_base0 (~> 0.15)
+    avm-eac_rails_base1 (0.8.4)
+      avm (~> 0.68)
+      avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
+      avm-eac_webapp_base0 (~> 0.15, >= 0.15.1)
       eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.20.0)
+    avm-eac_redmine_base0 (0.20.1)
       avm (~> 0.68)
       avm-eac_generic_base0 (~> 0.12)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.3)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.16)
@@ -134,12 +134,12 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.15.0)
-      avm (~> 0.67)
+    avm-eac_webapp_base0 (0.15.1)
+      avm (~> 0.68)
       avm-eac_generic_base0 (~> 0.12)
-      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.4)
-      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
-      avm-files (~> 0.6)
+      avm-eac_postgresql_base0 (~> 0.3)
+      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
+      avm-files (~> 0.6, >= 0.6.2)
       eac_ruby_utils (~> 0.112)
 
 PATH

data/lib/eac_tools/version.rb

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

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

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.66', '>= 0.66.1'
+  s.add_dependency 'avm', '~> 0.68'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'avm/eac_postgresql_base0/instance/data_unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPostgresqlBase0
+    class Instance
+      module Commands
+        DUMP_EXCLUDE_PATTERN = '^(CREATE|COMMENT ON) EXTENSION'
+
+        # @return [EacRubyUtils::Envs::Command]
+        def dump_command
+          env.command('pg_dump', '--no-privileges', '--no-owner', *common_command_args)
+             .envvar('PGPASSWORD', password)
+             .pipe(remove_extensions_ddl)
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def dump_gzip_command
+          dump_command.pipe(gzip_compress_command)
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def gzip_compress_command
+          env.command('gzip', '-9', '-c')
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def gzip_decompress_command
+          env.command('gzip', '-d')
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def load_gzip_command
+          gzip_decompress_command.pipe(psql_command)
+        end
+
+        # @return [String]
+        def password_command_argument
+          "@ESC_PGPASSWORD=#{password}"
+        end
+
+        def psql_command(database = true)
+          env.command(password_command_argument, 'psql', '--variable', 'ON_ERROR_STOP=t',
+                      *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
+
+        private
+
+        # @return [EacRubyUtils::Envs::Command]
+        def remove_extensions_ddl
+          env.command('grep', '--invert-match', '--extended-regexp', DUMP_EXCLUDE_PATTERN)
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,10 @@ module Avm
     class Instance
       class DataUnit < ::Avm::Instances::Data::Unit
         EXTENSION = '.pgdump.gz'
-        TABLES_SQL = 'select tablename from pg_tables where schemaname = \'public\''
+        SCHEMA_VAR = '%%SCHEMA%%'
+        TABLE_PARTS_SEPARATOR = '/'
+        TABLES_SQL = "select schemaname || '#{TABLE_PARTS_SEPARATOR}' || tablename from " \
+          "pg_tables where schemaname = '#{SCHEMA_VAR}'"
 
         before_load :clear_database
 
@@ -21,6 +24,12 @@ module Avm
 
         private
 
+        # @param table_list [Array<String>]
+        # @return [String]
+        def drop_tables_sql(table_list)
+          'drop table ' + table_list.map(&:to_s).join(', ') + ' cascade'
+        end
+
         def clear_database
           info 'Clearing database (Dropping all tables)...'
           ts = tables
@@ -28,16 +37,30 @@ module Avm
             info 'Database has no tables'
           else
             info "Removing #{ts.count} table(s)..."
-            run_sql('drop table if exists ' + ts.map { |t| "\"#{t}\"" }.join(', ') + ' cascade')
+            run_sql(drop_tables_sql(ts))
           end
         end
 
+        # @param parts [Array<String>, Strings]
+        # @return [String]
+        def join_table_parts(parts)
+          parts = parts.to_s.split(TABLE_PARTS_SEPARATOR) unless parts.is_a?(::Enumerable)
+          parts.map { |p| "\"#{p}\"" }.join('.')
+        end
+
         def run_sql(sql)
           instance.psql_command_command(sql).execute!
         end
 
+        # @return [Array<String>]
         def tables
-          run_sql(TABLES_SQL).each_line.map(&:strip).reject(&:blank?)
+          run_sql(tables_sql).each_line.map(&:strip).reject(&:blank?)
+                             .map { |line| join_table_parts(line) }
+        end
+
+        # @return [String]
+        def tables_sql
+          TABLES_SQL.gsub(SCHEMA_VAR, instance.schema)
         end
       end
     end

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

@@ -6,8 +6,11 @@ require 'eac_ruby_utils/core_ext'
 module Avm
   module EacPostgresqlBase0
     class Instance
-      require_sub __FILE__
+      require_sub __FILE__, include_modules: true
 
+      DEFAULT_HOSTNAME = '127.0.0.1'
+      DEFAULT_PORT = 5432
+      DEFAULT_SCHEMA = 'public'
       MAINTENANCE_DATABASE = 'postgres'
 
       common_constructor :env, :connection_params do
@@ -22,61 +25,12 @@ module Avm
         ::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
-
-      # @return [EacRubyUtils::Envs::Command]
-      def dump_gzip_command
-        dump_command.pipe(gzip_compress_command)
-      end
-
-      # @return [EacRubyUtils::Envs::Command]
-      def gzip_compress_command
-        env.command('gzip', '-9', '-c')
-      end
-
-      # @return [EacRubyUtils::Envs::Command]
-      def gzip_decompress_command
-        env.command('gzip', '-d')
-      end
-
-      # @return [EacRubyUtils::Envs::Command]
-      def load_gzip_command
-        gzip_decompress_command.pipe(psql_command)
-      end
-
-      # @return [String]
-      def password_command_argument
-        "@ESC_PGPASSWORD=#{password}"
-      end
-
-      def psql_command(database = true)
-        env.command(password_command_argument, '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'
+        connection_params[:host] || DEFAULT_HOSTNAME
       end
 
       def port
-        connection_params[:port] || '5432'
+        connection_params[:port] || DEFAULT_PORT
       end
 
       def user
@@ -90,6 +44,10 @@ module Avm
       def name
         connection_params.fetch(:name)
       end
+
+      def schema
+        connection_params[:schema] || DEFAULT_SCHEMA
+      end
     end
   end
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.2.4'
+    VERSION = '0.3.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.8', '>= 0.8.3'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.4'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.10.1'
+    VERSION = '0.10.2'
   end
 end

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

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.67'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.1'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15'
+  s.add_dependency 'avm', '~> 0.68'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.2'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.15', '>= 0.15.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.8.3'
+    VERSION = '0.8.4'
   end
 end

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

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'avm', '~> 0.68'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.3'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.4'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.16'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.20.0'
+    VERSION = '0.20.1'
   end
 end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.67'
+  s.add_dependency 'avm', '~> 0.68'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.4'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
-  s.add_dependency 'avm-files', '~> 0.6'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.3'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.2'
+  s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.15.0'
+    VERSION = '0.15.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.62.0
+  version: 0.62.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -98,20 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: avm-eac_python_base0
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +135,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -151,7 +145,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +155,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,7 +165,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +173,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,6 +183,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +227,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,6 +237,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_wordpress_base0
   requirement: !ruby/object:Gem::Requirement
@@ -537,6 +543,7 @@ files:
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/assert.rb
+- sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/commands.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance/data_unit.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance_with.rb
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/version.rb