avm-eac_redmine_base0 0.24.1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1882b893737df2c7796b9c7c287fd1c145b2ba114c2b17fda629466d3db8b5cf
-  data.tar.gz: 26e9bd638932b149f2419dc12e0047b7b834be07c2926ba8f49e3c30d541c82a
+  metadata.gz: 56ea90ae2ff9a72d87da236d3bcf12bd5bf692b8037894b943c9a500461b1351
+  data.tar.gz: be0bf97bc7fb01e97ff84c441f5a18dbf986c98f911a7d2015889c374625e8cd
 SHA512:
-  metadata.gz: 44d32f37e8d0e4d8b5795cb9cb413549ee92a1af24f9e53bcfeea23fda133672f235817b0e1afc7d95f2f98e68e891fd111b5245e7a6561ca027ff4373fe13d0
-  data.tar.gz: d59244118932445a44ebcbba6a4fc234e46e6e57534fdc0ac500a60ad63380fe25678f0f6fde58270e757a9dd76398f75594634d0436d2e92a1c85259faa97b8
+  metadata.gz: e779281892e241a54d0fdfd53492e8ecf69e14ff395da6625353480306ab99e116d7d610449ab00294b300cd7c49528ca2494a10f3edd936f238257a81ca8619
+  data.tar.gz: 31d7554fd0757cb99b1eb0bfb439ae2fc663b7a370b6e99662222f9aa0ba9bbc181a2d37fe40593bc806754722417d696db9daf652f50796af954d49d6b0ccff

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

@@ -16,6 +16,11 @@ module Avm
           application.local_source.default_ruby_version.if_present(&:to_s) || super
         end
 
+        # @return [Integer]
+        def auto_install_passenger_start_timeout
+          application.local_source.default_passenger_start_timeout.in_seconds
+        end
+
         def docker_image_class
           ::Avm::EacRedmineBase0::Instances::DockerImage
         end

data/lib/avm/eac_redmine_base0/sources/base/default_settings.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class Base < ::Avm::EacRailsBase1::Sources::Base
+        module DefaultSettings
+          common_concern
+
+          DEFAULT_RUBY_VERSION_PARSER = /ruby_version='([^']+)'/.to_parser { |m| m[1] }
+          INSTALLER_PLUGIN_DEFAULT_SETTINGS_PATH =
+            'plugins/redmine_installer/installer/default_settings.sh'
+
+          # @return [ActiveSupport::Duration]
+          def default_passenger_start_timeout
+            default_setting_value('passenger_start_timeout').to_i.seconds
+          end
+
+          # @return [Avm::VersionNumber]
+          def default_ruby_version
+            ::Avm::VersionNumber.new(default_setting_value('ruby_version'))
+          end
+
+          # @param key [String]
+          # @return [String]
+          def default_setting_value(key)
+            default_setting_parser(key)
+              .parse!(path.join(INSTALLER_PLUGIN_DEFAULT_SETTINGS_PATH).read)
+          end
+
+          # @param key [String]
+          # @return [EacRubyUtils::RegexpParser]
+          def default_setting_parser(key)
+            /#{::Regexp.quote(key)}='([^']+)'/.to_parser { |m| m[1] }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/sources/base.rb

@@ -5,21 +5,9 @@ module Avm
     module Sources
       class Base < ::Avm::EacRailsBase1::Sources::Base
         DEFAULT_TEST_COMMANDS = {}.freeze
-        DEFAULT_RUBY_VERSION_PARSER = /ruby_version='([^']+)'/.to_parser { |m| m[1] }
-        INSTALLER_PLUGIN_DEFAULT_SETTINGS_PATH =
-          'plugins/redmine_installer/installer/default_settings.sh'
         REDMINE_LIB_SUBPATH = 'lib/redmine.rb'
         SUBS_INCLUDE_PATHS_DEFAULT = ['plugins/*'].freeze
 
-        # @return [Avm::VersionNumber]
-        def default_ruby_version
-          ::Avm::VersionNumber.new(
-            DEFAULT_RUBY_VERSION_PARSER.parse!(
-              path.join(INSTALLER_PLUGIN_DEFAULT_SETTINGS_PATH).read
-            )
-          )
-        end
-
         # Return a empty hash (No tests).
         #
         # @return [Hash<String, EacRubyUtils::Envs::Command].
@@ -38,6 +26,8 @@ module Avm
         def valid?
           super && redmine_lib_path.exist?
         end
+
+        require_sub __FILE__, include_modules: true
       end
     end
   end

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.24.1'
+    VERSION = '0.25.0'
   end
 end

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

@@ -1,5 +1,6 @@
 # Ruby
 export ruby_version='%%INSTALL.RUBY.VERSION%%'
+export passenger_start_timeout='%%INSTALL.PASSENGER_START_TIMEOUT%%'
 
 # NodeJs
 export nodejs_version='%%INSTALL.NODEJS.VERSION%%'

data/template/avm/eac_redmine_base0/instances/docker_image/start.sh.template

@@ -33,8 +33,9 @@ function postgresql_start() {
 }
 
 function request_http_interface() {
-  title 'Requesting web interface...'
-  wget 'http://localhost%%web.path%%' &> /dev/null
+  local TARGET_URL='http://localhost%%web.path%%'
+  title "Requesting web interface in ${TARGET_URL}..."
+  wget --timeout '%%INSTALL.PASSENGER_START_TIMEOUT%%' "${TARGET_URL}"
 }
 
 function redmine_log() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-10 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -56,20 +56,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -118,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.129'
+        version: '0.130'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.129'
+        version: '0.130'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +129,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -145,7 +139,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 description:
 email:
 executables: []
@@ -175,6 +169,7 @@ files:
 - lib/avm/eac_redmine_base0/instances/runners/project/wiki_page/write.rb
 - lib/avm/eac_redmine_base0/instances/runners/project_rename.rb
 - lib/avm/eac_redmine_base0/sources/base.rb
+- lib/avm/eac_redmine_base0/sources/base/default_settings.rb
 - lib/avm/eac_redmine_base0/sources/core_update.rb
 - lib/avm/eac_redmine_base0/sources/runners/core_update.rb
 - lib/avm/eac_redmine_base0/sources/runners/docker.rb