eac_tools 0.75.2 → 0.76.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2737e40d7375352c3fb09bd0fcfc745906f8427668e2f177a80857f1bab7d38a
-  data.tar.gz: c01891031e2b448dcc9ace257025494c45478841a3a95782ce8707c896a4582f
+  metadata.gz: 26c4dec02b4e9099e1e2d672dad279f190f1a1500f5a205b21602ca4597915cf
+  data.tar.gz: 94629dc17596d2861990e246dc81e4b8e516c263eb1934a89626e6da4d041e06
 SHA512:
-  metadata.gz: 5b4def0b984b7cdb226780d1f4bf195ffc49bf35806254d8d586de94cf1911312934c426ef9bf9ae8e10d0ea23d39b1401472486a73c7c84961dac01ed9c6cc9
-  data.tar.gz: 58df3ac9441b4b19a843dbd589a60f997b85c97ab5ac3074ea5504e7de9d1d10eb65a83e3083ea4867dd69b0338911ac7ad9119f4f2fd76459088c618ea7d4ec
+  metadata.gz: 116efefb9e97caa1faba7e278cbf33a1aade6be6cd660b991bf98b855c7d4444eedcd76d44d87ecfb12ec6f7292a21d2f14c9c0fce21c802ce1c5ddb16508fc7
+  data.tar.gz: b130eed3248da5569b94920e540a5bac73dd1f5855ffaf4d9a63b15d3183c2dee37ddc1e6623ed729498c5adebe6bb5a78d612b3419696747804f99a0cd71b87

data/Gemfile

@@ -4,11 +4,11 @@ source 'https://rubygems.org'
 
 gemspec
 
-::Dir["#{::File.join(__dir__, 'sub')}/*"].each do |dir|
-  next unless ::File.exist?(::File.join(dir, "#{::File.basename(dir)}.gemspec"))
+Dir["#{File.join(__dir__, 'sub')}/*"].each do |dir|
+  next unless File.exist?(File.join(dir, "#{File.basename(dir)}.gemspec"))
 
-  gem ::File.basename(dir), path: dir, require: false
+  gem File.basename(dir), path: dir, require: false
 end
 
-local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
-eval_gemfile local_gemfile if ::File.exist?(local_gemfile)
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.75.2)
+    eac_tools (0.76.0)
       avm (~> 0.79)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
@@ -11,14 +11,14 @@ PATH
       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.3)
-      avm-eac_redmine_base0 (~> 0.20, >= 0.20.1)
+      avm-eac_redmine_base0 (~> 0.21)
       avm-eac_redmine_plugin_base0 (~> 0.4)
       avm-eac_ruby_base1 (~> 0.31, >= 0.31.2)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.4)
       avm-tools (~> 0.154)
-      eac_ruby_utils (~> 0.119, >= 0.119.1)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -86,15 +86,15 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.20.1)
-      avm (~> 0.68)
+    avm-eac_redmine_base0 (0.21.0)
+      avm (~> 0.79)
       avm-eac_generic_base0 (~> 0.12)
-      avm-eac_rails_base1 (~> 0.8, >= 0.8.4)
-      avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.2)
+      avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
+      avm-eac_ubuntu_base0 (~> 0.5)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.16)
-      eac_rest (~> 0.9)
-      eac_ruby_utils (~> 0.112)
+      eac_rest (~> 0.10)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -263,9 +263,9 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.119.1)
+    eac_ruby_utils (0.119.2)
       activesupport (>= 4, < 7)
-      addressable (~> 2.8, >= 2.8.4)
+      addressable (~> 2.8, >= 2.8.5)
       bundler
       filesize (~> 0.2)
       net-ssh (~> 4.2)
@@ -297,6 +297,7 @@ GEM
       ofx-parser (~> 1.1)
     asciidoctor (2.0.20)
     ast (2.4.2)
+    base64 (0.1.1)
     clipboard (1.3.6)
     colorize (0.8.1)
     concurrent-ruby (1.2.2)
@@ -304,13 +305,14 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_ruby_gem_support (0.6.0)
-      eac_ruby_utils (~> 0.119)
+    eac_ruby_gem_support (0.8.0)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
       rspec (~> 3.12)
-      rubocop (~> 0.83.0)
-      rubocop-rails (>= 2.5.2)
-      rubocop-rspec (>= 1.41.0)
-    faraday (2.7.10)
+      rubocop (~> 1.56.3)
+      rubocop-rails
+      rubocop-rspec
+    faraday (2.7.11)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -331,8 +333,10 @@ GEM
     htmlbeautifier (1.4.2)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
     minitar (0.9)
-    minitest (5.19.0)
+    minitest (5.20.0)
     multipart-post (2.3.0)
     net-ssh (4.2.0)
     nokogiri (1.15.4-x86_64-linux)
@@ -342,7 +346,7 @@ GEM
     os (1.1.4)
     parallel (1.23.0)
     parseconfig (1.1.2)
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -351,6 +355,7 @@ GEM
     rack (3.0.8)
     rainbow (3.1.1)
     rchardet (1.8.0)
+    regexp_parser (2.8.2)
     rexml (3.2.6)
     rouge (3.30.0)
     rspec (3.12.0)
@@ -366,26 +371,39 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (0.83.0)
+    rubocop (1.56.4)
+      base64 (~> 0.1.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rails (2.6.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.19.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.24.0)
+      rubocop (~> 1.33)
+    rubocop-rails (2.21.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.82.0)
-    rubocop-rspec (1.41.0)
-      rubocop (>= 0.68.1)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rspec (2.24.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     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.8.0)
-    zeitwerk (2.6.11)
+    unicode-display_width (2.5.0)
+    zeitwerk (2.6.12)
     zlib (2.1.1)
 
 PLATFORMS
@@ -418,7 +436,7 @@ DEPENDENCIES
   eac_git!
   eac_rest!
   eac_ruby_base0!
-  eac_ruby_gem_support (~> 0.6.0)
+  eac_ruby_gem_support (~> 0.8.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.75.2'
+  VERSION = '0.76.0'
 end

data/sub/avm-eac_redmine_base0/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
-eval_gemfile local_gemfile if ::File.exist?(local_gemfile)
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

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

@@ -12,14 +12,16 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.68'
+  s.required_ruby_version = '>= 2.7.0'
+
+  s.add_dependency 'avm', '~> 0.79'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
-  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 'avm-eac_rails_base1', '~> 0.9', '>= 0.9.3'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.16'
-  s.add_dependency 'eac_rest', '~> 0.9'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_rest', '~> 0.10'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.2'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.8.0'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/install.rb

@@ -8,6 +8,15 @@ module Avm
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
         module Install
+          INSTALL_EXTRA_KEY = 'install.extra'
+          DEFAULT_INSTALL_EXTRA = ''
+
+          # @return [String]
+          def auto_install_extra
+            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, INSTALL_EXTRA_KEY) ||
+              DEFAULT_INSTALL_EXTRA
+          end
+
           def run_installer
             ::EacRubyUtils::Ruby.on_clean_environment do
               installer_command.system!

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -58,7 +58,7 @@ module Avm
         end
 
         def skip_database
-          ENV['SKIP_DATABASE']
+          ENV.fetch('SKIP_DATABASE', nil)
         end
 
         def start_path

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/rest_api/entity_base.rb

@@ -21,8 +21,8 @@ module Avm
 
             response.body_data
           rescue ::JSON::ParserError
-            raise "\"#{response.url}\" returned invalid JSON: \"#{response.body_str}\"" \
-              " (Status: #{response.status})"
+            raise "\"#{response.url}\" returned invalid JSON: \"#{response.body_str}\" " \
+                  "(Status: #{response.status})"
           end
 
           def fetch_data(url_suffix)

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/core_update.rb

@@ -96,7 +96,7 @@ module Avm
           if source_path.children.empty?
             infom 'No content left in source directory'
           else
-            fatal_error 'Found entries in source directory: ' +
+            fatal_error 'Found entries in source directory: ' + # rubocop:disable Style/StringConcatenation
                         source_path.children.map { |c| c.basename.to_path }.join(', ')
           end
         end

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

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

data/sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/apache_host_spec.rb

@@ -3,11 +3,11 @@
 require 'avm/eac_redmine_base0/instances/apache_host'
 require 'avm/eac_redmine_base0/instances/base'
 
-RSpec.describe ::Avm::EacRedmineBase0::Instances::ApacheHost do
+RSpec.describe Avm::EacRedmineBase0::Instances::ApacheHost do
   describe '#no_ssl_site_content' do
-    let(:instance) { ::Avm::EacRedmineBase0::Instances::Base.by_id('stub-app_0') }
+    let(:instance) { Avm::EacRedmineBase0::Instances::Base.by_id('stub-app_0') }
     let(:apache_host) { described_class.new(instance) }
-    let(:fixtures_dir) { ::Pathname.new('apache_host_spec_files').expand_path(__dir__) }
+    let(:fixtures_dir) { Pathname.new('apache_host_spec_files').expand_path(__dir__) }
     let(:expected_content) { fixtures_dir.join('apache_host_spec_no_ssl_content.conf').read }
 
     before do

data/sub/avm-eac_redmine_base0/spec/lib/avm/eac_redmine_base0/instances/base/gitolite_spec.rb

@@ -2,7 +2,7 @@
 
 require 'avm/eac_redmine_base0/instances/base'
 
-RSpec.describe ::Avm::EacRedmineBase0::Instances::Base do
+RSpec.describe Avm::EacRedmineBase0::Instances::Base, '#gitolite' do
   include_examples 'entries_values', __FILE__, {
     'app_0' => {
       'gitolite.username' => 'git',

data/sub/avm-eac_redmine_base0/spec/rubocop_spec.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-::EacRubyUtils::Rspec.default_setup.describe_rubocop
+EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/avm-eac_redmine_base0/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/rspec/default_setup'
-::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
-::EacRubyUtils::Rspec.default_setup.stub_eac_config_node
+EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))
+EacRubyUtils::Rspec.default_setup.stub_eac_config_node

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

@@ -40,3 +40,6 @@ export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
 export smtp_username='%%MAILER.SMTP.USERNAME%%'
 export smtp_password='%%MAILER.SMTP.PASSWORD%%'
 export mail_from='%%MAILER.FROM%%'
+
+# Extra
+%%INSTALL.EXTRA%%

data/sub/eac_ruby_utils/eac_ruby_utils.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*', 'MIT-LICENSE', 'README.rdoc']
 
   s.add_dependency 'activesupport', '>= 4', '< 7'
-  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.4'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.5'
   s.add_dependency 'bundler'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'net-ssh', '~> 4.2'

data/sub/eac_ruby_utils/lib/eac_ruby_utils/module_ancestors_variable.rb

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/patches/module/require_sub'
 
 module EacRubyUtils
-  class ModuleAncestorsVariable
+  module ModuleAncestorsVariable
     require_sub __FILE__
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.119.1'
+  VERSION = '0.119.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.75.2
+  version: 0.76.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -178,20 +178,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -309,7 +303,7 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -319,21 +313,21 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
 description: 
 email: 
 executables: []
@@ -2155,7 +2149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="