eac_tools 0.74.1 → 0.75.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e400757a0f601581fffabdee1ad0d4cc32be1142486cf96cdb7cdc8777f4325
-  data.tar.gz: ffb4a99e49b7a85e99e9728272a1a351f6363178a4a65347c15d82674570df06
+  metadata.gz: 9b32e2ddb9a344d559d413f4378f6b36eb3cce7beced1ab281ed573365ee6d2d
+  data.tar.gz: 2ce78762e6badd9f6648967c9a6aff6449c602f569196e3e5ac4583c978f886f
 SHA512:
-  metadata.gz: c34349be4ffad51598e9122d33a0680ccc10891bb6d59a3c28e4263bd5616161b3de96684263be6ad063211f75d1d5f035982af6427a6169cd452f7c2b019306
-  data.tar.gz: 629b9802cc151904f42c32182756f489986bb4f46a6c4b1c0859582362f41833d332787381fc674efca66aac88c27323d1223a28748adaec9c8c144650f5f2f3
+  metadata.gz: 614276e69971c23581dfc5b3f15e19d4be6a6d7efc34f6ef8b9df25613b1bed2beb858c9cffaf50beca7d82dd7bbda4c9cdef964fe72384cf4a3d9a30a7b1ffb
+  data.tar.gz: bb468b4326063c05f2e95af2a511240e502e2344d298e034fb9eb4d1c11164fe94da17148aff8b09d51078f023c322044655084b17f614faa97620cf003d6e3b

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.74.1)
+    eac_tools (0.75.1)
       avm (~> 0.79)
       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.5, >= 0.5.1)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.2)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.10, >= 0.10.3)
-      avm-eac_rails_base1 (~> 0.9, >= 0.9.2)
+      avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
       avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
+      avm-eac_ruby_base1 (~> 0.31, >= 0.31.1)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.3)
@@ -56,9 +56,9 @@ PATH
 PATH
   remote: sub/avm-eac_postgresql_base0
   specs:
-    avm-eac_postgresql_base0 (0.5.1)
-      avm (~> 0.71)
-      eac_ruby_utils (~> 0.115)
+    avm-eac_postgresql_base0 (0.5.2)
+      avm (~> 0.79)
+      eac_ruby_utils (~> 0.119, >= 0.119.1)
 
 PATH
   remote: sub/avm-eac_python_base0
@@ -77,9 +77,9 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.9.2)
+    avm-eac_rails_base1 (0.9.3)
       avm (~> 0.79)
-      avm-eac_ruby_base1 (~> 0.30, >= 0.30.3)
+      avm-eac_ruby_base1 (~> 0.31, >= 0.31.1)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       eac_ruby_utils (~> 0.119, >= 0.119.1)
 
@@ -106,12 +106,12 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.30.3)
-      aranha-parsers (~> 0.18)
-      avm (~> 0.71)
+    avm-eac_ruby_base1 (0.31.1)
+      aranha-parsers (~> 0.21)
+      avm (~> 0.79)
       avm-eac_generic_base0 (~> 0.12)
-      eac_envs-http (~> 0.3, >= 0.3.2)
-      eac_ruby_utils (~> 0.116)
+      eac_envs-http (~> 0.4)
+      eac_ruby_utils (~> 0.119, >= 0.119.1)
 
 PATH
   remote: sub/avm-eac_ubuntu_base0
@@ -304,12 +304,12 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_ruby_gem_support (0.5.1)
-      eac_ruby_utils (~> 0.74)
-      rspec (~> 3.9)
-      rubocop (~> 0.80.1)
-      rubocop-rails (~> 2.4.2)
-      rubocop-rspec (~> 1.38.1)
+    eac_ruby_gem_support (0.6.0)
+      eac_ruby_utils (~> 0.119)
+      rspec (~> 3.12)
+      rubocop (~> 0.83.0)
+      rubocop-rails (>= 2.5.2)
+      rubocop-rspec (>= 1.41.0)
     faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -331,7 +331,6 @@ GEM
     htmlbeautifier (1.4.2)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.6)
     minitar (0.9)
     minitest (5.18.1)
     multipart-post (2.3.0)
@@ -347,7 +346,7 @@ GEM
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     racc (1.7.1)
     rack (3.0.8)
     rainbow (3.1.1)
@@ -363,29 +362,29 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.4.2)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-rails (2.6.0)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    rubocop-rspec (1.38.1)
+      rubocop (>= 0.82.0)
+    rubocop-rspec (1.41.0)
       rubocop (>= 0.68.1)
     ruby-filemagic (0.7.3)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.8.0)
     zeitwerk (2.6.8)
     zlib (2.1.1)
 
@@ -419,7 +418,7 @@ DEPENDENCIES
   eac_git!
   eac_rest!
   eac_ruby_base0!
-  eac_ruby_gem_support (~> 0.5.1)
+  eac_ruby_gem_support (~> 0.6.0)
   eac_ruby_utils!
   eac_templates!
   eac_tools!

data/lib/eac_tools/version.rb

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

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

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.71'
-  s.add_dependency 'eac_ruby_utils', '~> 0.115'
+  s.add_dependency 'avm', '~> 0.79'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -7,13 +7,13 @@ module Avm
   module EacPostgresqlBase0
     class Instance
       module Commands
-        DUMP_EXCLUDE_PATTERN = '^(CREATE|COMMENT ON) EXTENSION'
+        DUMP_EXCLUDE_PATTERNS = ['(CREATE|COMMENT ON) EXTENSION',
+                                 'SET default_table_access_method'].freeze
 
         # @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)
+          DUMP_EXCLUDE_PATTERNS
+            .inject(pg_dump_command) { |a, e| a.pipe(exclude_pattern_command(e)) }
         end
 
         # @return [EacRubyUtils::Envs::Command]
@@ -64,8 +64,14 @@ module Avm
         private
 
         # @return [EacRubyUtils::Envs::Command]
-        def remove_extensions_ddl
-          env.command('grep', '--invert-match', '--extended-regexp', DUMP_EXCLUDE_PATTERN)
+        def exclude_pattern_command(pattern)
+          env.command('sed', '--regexp-extended', "s/(^|\\n)#{pattern}[^;]*;//gm")
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def pg_dump_command
+          env.command('pg_dump', '--no-privileges', '--no-owner', *common_command_args)
+             .envvar('PGPASSWORD', password)
         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.5.1'
+    VERSION = '0.5.2'
   end
 end

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

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,template}/**/*']
 
   s.add_dependency 'avm', '~> 0.79'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.31', '>= 0.31.1'
   s.add_dependency 'avm-eac_webapp_base0', '~> 0.18', '>= 0.18.2'
   s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
 

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/instances/processes/daemon.rb

@@ -12,7 +12,7 @@ module Avm
 
           # @return [Boolean]
           def available?
-            instance.the_gem.gemfile_lock_gem_version(gem_name).present?
+            instance.application.local_source.gemfile_lock_gem_version(gem_name).present?
           end
 
           def disable

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.9.2'
+    VERSION = '0.9.3'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.18'
-  s.add_dependency 'avm', '~> 0.71'
+  s.add_dependency 'aranha-parsers', '~> 0.21'
+  s.add_dependency 'avm', '~> 0.79'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  s.add_dependency 'eac_envs-http', '~> 0.3', '>= 0.3.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.116'
+  s.add_dependency 'eac_envs-http', '~> 0.4'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.6.0'
 end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/namespace_replacer.rb

@@ -8,7 +8,7 @@ module Avm
 
         def concat_regex(regexes)
           r = regexes.first
-          regexes[1..-1].each do |x|
+          regexes[1..].each do |x|
             r = ::Regexp.new(r.source + x.source)
           end
           r

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundle.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'shellwords'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      module Runners
+        class Bundle
+          runner_with :help do
+            desc 'Runs "bundle ...".'
+            pos_arg :'bundle-args', repeat: true, optional: true
+          end
+
+          def run
+            bundle_command.system!
+          end
+
+          def bundle_command
+            runner_context.call(:source).bundle(*bundle_args)
+          end
+
+          delegate :bundle_args, to: :parsed
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb

@@ -48,7 +48,9 @@ module Avm
         def update_gemspec
           gemspec.dependency(gem_name).version_specs = requirements_list
           gemspec.write(source.gemspec_path)
-          source.bundle('exec', 'rubocop', source.gemspec_path).system!
+          ::Avm::EacRubyBase1::Rubocop.new(
+            source.path, ['-a', '--ignore-parent-exclusion', source.gemspec_path]
+          ).run
         end
       end
     end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.30.3'
+    VERSION = '0.31.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.74.1
+  version: 0.75.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-08 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -101,7 +101,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_python_base0
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +161,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
@@ -212,20 +212,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.31'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.31'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -326,14 +326,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 description: 
 email: 
 executables: []
@@ -720,6 +720,7 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/bundle_update.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/namespace_replacer.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundle.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_local.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock.rb