eac_tools 0.55.5 → 0.55.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3253c050b8f81f650cfd1ec944cc11f7af824f4510cd3675780abd8dcce14a3d
-  data.tar.gz: a56630daf972f0a82ecadb8b714bdcd0cde14e0d8c9e705d7a795b0e922c7267
+  metadata.gz: 3b4986d5d4f203b2446bf15351a22b29701c9f3f467afee4e2e5fd557a7b15f3
+  data.tar.gz: 3f277827e7f8880fce8c95a1d5bd21529763e786e8c6edf4e070b04762a531f0
 SHA512:
-  metadata.gz: 4f2f8c718124fb9bb75cac9cc7b80b8d6bee231feb584cb48679a04a36fa43b165388826905178d98c4480a3159329936e278ae4498c3f1cf77d35b8f3cd6c64
-  data.tar.gz: a0610099510bfeb32c86dcec8024441c13a91cdcab4609dd86b24d94fb2df6e0ae9d07d7d8cb6100ba8151543218b0dd3a3f6f8f098c9c8fd1f15825fc337306
+  metadata.gz: 5d6de889f5814a26b52abb0c77135d7eb173333fc9c35fc2a1d5a043cefc6624018fc2fe7897cc4eba0fb94e219b02538623c9e8689d32c0e735b8d99e1587c5
+  data.tar.gz: 27a49cabf562f3ca549f171a3c3b29d4587dcf16a94887f95980f135bc63dd7222c6f75e9a8d3b568bcba08e022b067a3f9867919d30a5b3ec54f7737f24246d

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.55.5)
-      avm (~> 0.64, >= 0.64.1)
+    eac_tools (0.55.7)
+      avm (~> 0.65)
       avm-eac_asciidoctor_base0 (~> 0.15)
       avm-eac_generic_base0 (~> 0.11)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.4, >= 0.4.1)
       avm-eac_postgresql_base0 (~> 0.2, >= 0.2.3)
       avm-eac_python_base0 (~> 0.2, >= 0.2.1)
-      avm-eac_rails_base0 (~> 0.9)
-      avm-eac_rails_base1 (~> 0.8)
-      avm-eac_redmine_base0 (~> 0.18, >= 0.18.1)
+      avm-eac_rails_base0 (~> 0.9, >= 0.9.1)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
+      avm-eac_redmine_base0 (~> 0.18, >= 0.18.2)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.29, >= 0.29.2)
+      avm-eac_ruby_base1 (~> 0.30)
       avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
       avm-eac_wordpress_base0 (~> 0.3)
-      avm-git (~> 0.13)
+      avm-git (~> 0.13, >= 0.13.1)
       avm-tools (~> 0.145, >= 0.145.1)
       eac_ruby_utils (~> 0.112)
 
@@ -84,30 +84,30 @@ PATH
 PATH
   remote: sub/avm-eac_rails_base0
   specs:
-    avm-eac_rails_base0 (0.9.0)
-      avm-eac_rails_base1 (~> 0.8)
-      eac_ruby_utils (~> 0.109)
+    avm-eac_rails_base0 (0.9.1)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_rails_base1
   specs:
-    avm-eac_rails_base1 (0.8.0)
-      avm (~> 0.57)
-      avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
-      avm-eac_webapp_base0 (~> 0.13)
-      eac_ruby_utils (~> 0.109)
+    avm-eac_rails_base1 (0.8.1)
+      avm (~> 0.65)
+      avm-eac_ruby_base1 (~> 0.30)
+      avm-eac_webapp_base0 (~> 0.13, >= 0.13.1)
+      eac_ruby_utils (~> 0.112)
 
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.18.1)
-      avm (~> 0.64, >= 0.64.1)
+    avm-eac_redmine_base0 (0.18.2)
+      avm (~> 0.65)
       avm-eac_generic_base0 (~> 0.11)
-      avm-eac_rails_base1 (~> 0.8)
+      avm-eac_rails_base1 (~> 0.8, >= 0.8.1)
       avm-eac_ubuntu_base0 (~> 0.4, >= 0.4.1)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.16)
-      eac_rest (~> 0.7, >= 0.7.2)
+      eac_rest (~> 0.7, >= 0.7.3)
       eac_ruby_utils (~> 0.112)
 
 PATH
@@ -120,10 +120,10 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.29.2)
-      aranha-parsers (~> 0.16)
-      avm (~> 0.63)
-      avm-eac_generic_base0 (~> 0.10)
+    avm-eac_ruby_base1 (0.30.0)
+      aranha-parsers (~> 0.17)
+      avm (~> 0.65)
+      avm-eac_generic_base0 (~> 0.11)
       eac_ruby_utils (~> 0.112)
 
 PATH
@@ -166,12 +166,12 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.13.0)
-      avm (~> 0.64)
+    avm-git (0.13.1)
+      avm (~> 0.64, >= 0.64.2)
       avm-files (~> 0.6)
       eac_git (~> 0.14, >= 0.14.1)
       eac_ruby_utils (~> 0.112)
-      git (~> 1.17, >= 1.17.2)
+      git (~> 1.18)
 
 PATH
   remote: sub/avm-tools
@@ -194,7 +194,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.64.1)
+    avm (0.65.0)
       aranha-parsers (~> 0.17)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_config (~> 0.12)
@@ -283,17 +283,15 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_envs-http (0.1.0)
+    eac_envs-http (0.2.0)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
       faraday (~> 2.7, >= 2.7.4)
       faraday-multipart (~> 1.0, >= 1.0.4)
-    eac_rest (0.7.2)
-      eac_envs-http (~> 0.1)
+    eac_rest (0.7.3)
+      eac_envs-http (~> 0.2)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
-      faraday (~> 2.7, >= 2.7.4)
-      faraday-multipart (~> 1.0, >= 1.0.4)
     eac_ruby_gem_support (0.5.1)
       eac_ruby_utils (~> 0.74)
       rspec (~> 3.9)
@@ -355,7 +353,7 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.4)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)

data/lib/eac_tools/version.rb

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

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

@@ -7,8 +7,9 @@ module Avm
     class Base
       module AutoValues
         module Database
+          LOCAL_ADDRESS = '127.0.0.1'
           DEFAULT_EXTRA = ''
-          DEFAULT_HOSTNAME = '127.0.0.1'
+          DEFAULT_HOSTNAME = LOCAL_ADDRESS
           DEFAULT_LIMIT = 5
           DEFAULT_PORTS = {
             'postgresql' => 5432,
@@ -19,8 +20,16 @@ module Avm
           DEFAULT_SYSTEM = 'postgresql'
           DEFAULT_TIMEOUT = 5000
 
-          def auto_database_extra
-            database_auto_common('hostname') || DEFAULT_EXTRA
+          %w[extra hostname limit system timeout].each do |attr|
+            define_method "auto_database_#{attr}" do
+              database_auto_common(attr) || self.class.const_get("default_#{attr}".upcase)
+            end
+          end
+
+          %w[username password].each do |attr|
+            define_method "auto_database_#{attr}" do
+              database_auto_common(attr) || id
+            end
           end
 
           def auto_database_name
@@ -28,34 +37,10 @@ module Avm
                                   ::Avm::Instances::EntryKeys::DATABASE_NAME) || id
           end
 
-          def auto_database_hostname
-            database_auto_common('hostname') || DEFAULT_HOSTNAME
-          end
-
-          def auto_database_limit
-            database_auto_common('limit') || DEFAULT_LIMIT
-          end
-
-          def auto_database_password
-            database_auto_common('password') || id
-          end
-
           def auto_database_port
             database_auto_common('port') || database_port_by_system
           end
 
-          def auto_database_username
-            database_auto_common('username') || id
-          end
-
-          def auto_database_system
-            database_auto_common('system') || DEFAULT_SYSTEM
-          end
-
-          def auto_database_timeout
-            database_auto_common('timeout') || DEFAULT_TIMEOUT
-          end
-
           private
 
           def database_auto_common(suffix)

data/sub/avm/lib/avm/launcher/paths/logical.rb

@@ -2,13 +2,13 @@
 
 require 'avm/launcher/paths/real'
 require 'avm/launcher/stereotype'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Launcher
     module Paths
       class Logical
-        include ::Comparable
-        include ::EacRubyUtils::SimpleCache
+        enable_simple_cache
 
         class << self
           def from_h(context, hash)
@@ -17,18 +17,11 @@ module Avm
           end
         end
 
-        attr_reader :context, :real, :logical, :parent_path
-
-        def initialize(context, parent_path, real, logical)
-          @context = context
-          @parent_path = parent_path
-          @real = ::Avm::Launcher::Paths::Real.new(real)
-          @logical = logical
+        common_constructor :context, :parent_path, :real, :logical do
+          self.real = ::Avm::Launcher::Paths::Real.new(real)
         end
 
-        def <=>(other)
-          [logical, real] <=> [other.logical, other.real]
-        end
+        compare_by :logical, :real
 
         def to_s
           logical

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

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

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

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.9.0'
+    VERSION = '0.9.1'
   end
 end

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

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.57'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.3'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.109'
+  s.add_dependency 'avm', '~> 0.65'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.13', '>= 0.13.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_rails_base1/instances/runners'
+require 'avm/eac_ruby_base1/instances/mixin'
 require 'avm/eac_ruby_base1/sources/base'
 require 'avm/eac_webapp_base0/instances/base'
 
@@ -8,6 +9,8 @@ module Avm
   module EacRailsBase1
     module Instances
       class Base < ::Avm::EacWebappBase0::Instances::Base
+        include ::Avm::EacRubyBase1::Instances::Mixin
+
         DEFAULT_RAILS_ENVIRONMENT = 'production'
 
         def bundle(*args)

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.8.0'
+    VERSION = '0.8.1'
   end
 end

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

@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.64', '>= 0.64.1'
+  s.add_dependency 'avm', '~> 0.65'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.11'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.8'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.8', '>= 0.8.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.16'
-  s.add_dependency 'eac_rest', '~> 0.7', '>= 0.7.2'
+  s.add_dependency 'eac_rest', '~> 0.7', '>= 0.7.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -8,8 +8,8 @@ module Avm
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
         module Database
-          DATABASE_INTERNAL_HOSTNAME = 'localhost'
-          DEFAULT_POSTGRESQL_VERSION = '12'
+          DATABASE_INTERNAL_HOSTNAME = ::Avm::Instances::Base::AutoValues::Database::LOCAL_ADDRESS
+          DEFAULT_POSTGRESQL_VERSION = ''
 
           common_concern do
             uri_components_entries_values 'postgresql', %w[version]

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

@@ -6,14 +6,17 @@ require 'avm/eac_redmine_base0/instances/docker_image'
 require 'avm/eac_redmine_base0/instances/runners'
 require 'avm/eac_redmine_base0/instances/rest_api'
 require 'avm/eac_rails_base1/instances/base'
+require 'avm/eac_ruby_base1/instances/mixin'
 
 module Avm
   module EacRedmineBase0
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
-        require_sub __FILE__, include_modules: true
+        require_sub __FILE__, include_modules: true, require_dependency: true
         enable_simple_cache
 
+        include ::Avm::EacRubyBase1::Instances::Mixin
+
         def docker_image_class
           ::Avm::EacRedmineBase0::Instances::DockerImage
         end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'avm/eac_redmine_base0/instances/deploy'
 require 'avm/eac_ubuntu_base0/instances/base'
 require 'avm/instances/docker_image'
 require 'eac_templates/core_ext'
@@ -63,6 +64,14 @@ module Avm
           ::Addressable::URI.parse(instance.web_url).path.present?
         end
 
+        def write_in_provide_dir
+          super
+
+          ::Avm::EacRedmineBase0::Instances::Deploy.template.child('config')
+            .child('install.sh.template')
+            .apply_to_file(variables_source, provide_dir.join('install_settings.sh'))
+        end
+
         private
 
         def eac_ubuntu_base0_instance

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/eac_redmine_base0/instances/deploy'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.18.1'
+    VERSION = '0.18.2'
   end
 end

data/sub/avm-eac_redmine_base0/locale/en.yml

@@ -1,5 +1,6 @@
 en:
   avm:
     eac_redmine_base0:
-      core_update:
-        git_commit_message: "Core: update to '%{version}'."
+      sources:
+        core_update:
+          git_commit_message: "Core: update to '%{version}'."

data/sub/avm-eac_redmine_base0/locale/pt-BR.yml

@@ -1,5 +1,6 @@
 pt-BR:
   avm:
     eac_redmine_base0:
-      core_update:
-        git_commit_message: "Core: atualiza para '%{version}'."
+      sources:
+        core_update:
+          git_commit_message: "Core: atualiza para '%{version}'."

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

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'aranha-parsers', '~> 0.16'
-  s.add_dependency 'avm', '~> 0.63'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.10'
+  s.add_dependency 'aranha-parsers', '~> 0.17'
+  s.add_dependency 'avm', '~> 0.65'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.11'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/instances/mixin.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Instances
+      module Mixin
+        DEFAULT_RUBY_VERSION = '2.7.7'
+        RUBY_VERSION_KEY = 'ruby.version'
+
+        def auto_ruby_version
+          inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, RUBY_VERSION_KEY) ||
+            DEFAULT_RUBY_VERSION
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Instances
+      require_sub __FILE__
+    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.29.2'
+    VERSION = '0.30.0'
   end
 end

data/sub/avm-git/avm-git.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.64'
+  s.add_dependency 'avm', '~> 0.64', '>= 0.64.2'
   s.add_dependency 'avm-files', '~> 0.6'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
-  s.add_dependency 'git', '~> 1.17', '>= 1.17.2'
+  s.add_dependency 'git', '~> 1.18'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-git/lib/avm/git/launcher/publish_base.rb

@@ -15,6 +15,8 @@ module Avm
         CHECKERS = %w[remote_url remote_fetch publish_remote_no_exist remote_equal remote_following
                       local_following].freeze
 
+        DEFAULT_REMOTE_REF = 'master'
+
         REMOTE_UNAVAILABLE_MESSAGES = ['could not resolve host', 'connection timed out',
                                        'no route to host'].map(&:downcase).freeze
 
@@ -108,7 +110,7 @@ module Avm
 
         def remote_sha_uncached
           remote_fetch
-          b = sgit.git.branches["#{remote_name}/master"]
+          b = sgit.git.branches["#{remote_name}/#{remote_ref}"]
           b ? b.gcommit.sha : nil
         end
 
@@ -119,6 +121,11 @@ module Avm
         def remote_name
           ::Avm::Git::Launcher::WarpBase::TARGET_REMOTE
         end
+
+        # @return [String]
+        def remote_ref
+          DEFAULT_REMOTE_REF
+        end
       end
     end
   end

data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subrepo/publish.rb

@@ -7,6 +7,23 @@ module Avm
     module LauncherStereotypes
       class GitSubrepo
         class Publish < ::Avm::Git::Launcher::PublishBase
+          # @return [Pathname]
+          def config_path
+            instance.parent.warped.to_pathname.join(
+              "./#{instance.to_parent_path}",
+              ::Avm::Git::LauncherStereotypes::GitSubrepo::CONFIG_SUBPATH
+            )
+          end
+
+          # @return [EacGit::Local::Subrepo::Config]
+          def config
+            ::EacGit::Local::Subrepo::Config.from_file(config_path)
+          end
+
+          # @return [String]
+          def remote_ref
+            config.remote_branch || super
+          end
         end
       end
     end

data/sub/avm-git/lib/avm/git/launcher_stereotypes/git_subrepo.rb

@@ -11,9 +11,11 @@ module Avm
         require_sub __FILE__
         include Avm::Launcher::Stereotype
 
+        CONFIG_SUBPATH = '.gitrepo'
+
         class << self
           def match?(path)
-            File.exist?(path.real.subpath('.gitrepo')) && subrepo_url(path.real) != 'none'
+            File.exist?(path.real.subpath(CONFIG_SUBPATH)) && subrepo_url(path.real) != 'none'
           end
 
           def color
@@ -21,7 +23,7 @@ module Avm
           end
 
           def subrepo_url(path)
-            File.read(path.subpath('.gitrepo')).each_line do |l|
+            File.read(path.subpath(CONFIG_SUBPATH)).each_line do |l|
               m = /remote\s*=\s(.+)/.match(l)
               return m[1] if m
             end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.13.0'
+    VERSION = '0.13.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.55.5
+  version: 0.55.7
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.64.1
+        version: '0.65'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.64.1
+        version: '0.65'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +133,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -146,6 +143,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -160,6 +163,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_base0
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +175,7 @@ dependencies:
         version: '0.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -179,7 +185,7 @@ dependencies:
         version: '0.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -200,20 +206,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -255,6 +255,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -262,6 +265,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
@@ -625,7 +631,6 @@ files:
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_http_virtualhost.conf.template
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/apache_https_virtualhost.conf.template
-- sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/install_settings.sh.template
 - sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/start.sh.template
 - sub/avm-eac_redmine_plugin_base0/Gemfile
 - sub/avm-eac_redmine_plugin_base0/avm-eac_redmine_plugin_base0.gemspec
@@ -659,6 +664,8 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base/file_resource_name.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/instances.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/instances/mixin.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem/build.rb
@@ -1112,7 +1119,6 @@ files:
 - sub/avm/lib/avm/instances/base/auto_values/data.rb
 - sub/avm/lib/avm/instances/base/auto_values/database.rb
 - sub/avm/lib/avm/instances/base/auto_values/mailer.rb
-- sub/avm/lib/avm/instances/base/auto_values/ruby.rb
 - sub/avm/lib/avm/instances/base/auto_values/source.rb
 - sub/avm/lib/avm/instances/base/dockerizable.rb
 - sub/avm/lib/avm/instances/base/entry_keys.rb

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

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Instances
-    class Base
-      module AutoValues
-        module Ruby
-          def auto_ruby_version
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, 'ruby.version')
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/docker_image/install_settings.sh.template

@@ -1,33 +0,0 @@
-# Database
-export postgresql_internal='%%database_internal%%'
-export postgresql_host='%%DATABASE.HOSTNAME%%'
-export postgresql_port='%%DATABASE.PORT%%'
-export postgresql_user='%%DATABASE.USERNAME%%'
-export postgresql_password='%%DATABASE.PASSWORD%%'
-export postgresql_database='%%DATABASE.NAME%%'
-export postgresql_extra_settings='%%DATABASE.EXTRA%%'
-
-# Git Hosting
-export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
-export git_repositories_hierarchical_organisation=false
-
-# Web
-if [ '%%WEB.SCHEME%%' == 'https' ]; then
-  export address_https='true'
-else
-  export address_https='false'
-fi
-export address_host='%%WEB.AUTHORITY%%'
-export address_path='%%WEB.PATH%%'
-
-# Mail settings
-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_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
-export smtp_username='%%MAILER.SMTP.USERNAME%%'
-export smtp_password='%%MAILER.SMTP.PASSWORD%%'
-export mail_from='%%MAILER.FROM%%'