avm-eac_redmine_base0 0.27.1 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09561ad552a1082975fc3b7264d1777ea9ee2772a167365f2d74b9c88e054197'
-  data.tar.gz: 90c71edbf5561f3fa8a0b0ff71808f0bc4e53a59aa68428beba6453e3847d878
+  metadata.gz: 5097d7b22433940fb8250d0e4b5e4a35bfa108442b3389433e69d16971cd4ed8
+  data.tar.gz: 719c3940e5ecec285cc0fc2dab888ad5e1fe65f8ce16f5fc4f568d417e657e37
 SHA512:
-  metadata.gz: 7ee8f005a5219438a4e66f0b61a7f4d3551221f53fb8939e6cadd880906e2d567e7bef7e7e89fc0c48efe91b38cbf834bf163ef0168fb9069c31ea26a05ba42d
-  data.tar.gz: 10ad964cd422bbdc1262351de9d918cec434ee10ff7cec7c054b93ebb96a7fd4caf093d8285b2cd4140fb9a60fb20a2da61e1c542df58469ca615d42a52352c7
+  metadata.gz: 98763b89ab2fcbf1aa03516907a24299c1e93259ffaea03f23cac103e816c5590c3ab990e196861a74fffc3c1e098c7a6ddc8bc5f0ecf6970984944f5a6b8659
+  data.tar.gz: c351e33d75239c43a9d6defeb5961bfd63fe9f85ec311cb9f18cfe33b842fe07ac9ab0194967eb22698f0ba6459f096cf6aa0c6d8de592046bda253f3d42e307

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

@@ -5,11 +5,13 @@ module Avm
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
         module Nodejs
-          DEFAULT_NODEJS_VERSION = '19.8.1'
+          DEFAULT_NODEJS_VERSION = '26.6.0'
           NODEJS_VERSION_KEY = 'nodejs.version'
 
+          # @return [String]
           def auto_install_nodejs_version
-            inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, NODEJS_VERSION_KEY) ||
+            application.local_source.default_nodejs_version.if_present(&:to_s) ||
+              inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, NODEJS_VERSION_KEY) ||
               DEFAULT_NODEJS_VERSION
           end
         end

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

@@ -7,7 +7,7 @@ module Avm
     module Instances
       class Base < ::Avm::EacRailsBase1::Instances::Base
         require_sub __FILE__, include_modules: true
-        enable_simple_cache
+        enable_memoized
 
         include ::Avm::EacRubyBase1::Instances::Mixin
 
@@ -52,7 +52,7 @@ module Avm
         private
 
         # @return [Avm::EacRedmineBase0::Instances::RestApi]
-        def rest_api_uncached
+        memoize def rest_api
           url = root_url
           url.query_values = { key: admin_api_key }
           ::Avm::EacRedmineBase0::Instances::RestApi.new(url)

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

@@ -4,7 +4,7 @@ module Avm
   module EacRedmineBase0
     module Instances
       class DockerImage < ::Avm::Instances::DockerImage
-        enable_simple_cache
+        enable_memoized
 
         APACHE_HOST_DOCKERFILE_SUBPATH = 'apache_host_dockerfile'
         APACHE_PATH_DOCKERFILE_SUBPATH = 'apache_path_dockerfile'
@@ -89,7 +89,7 @@ module Avm
           r
         end
 
-        def git_repo_uncached
+        memoize def git_repo
           ::EacGit::Local.new(instance.source_instance.install_path)
         end
 
@@ -97,7 +97,7 @@ module Avm
           git_repo.rev_parse('HEAD')
         end
 
-        def redmine_source_path_uncached
+        memoize def redmine_source_path
           r = provide_dir.join(REDMINE_SOURCE_HOST_SUBPATH)
           ::FileUtils.rm_rf(r.to_path)
           r.mkpath

data/lib/avm/eac_redmine_base0/instances/rest_api/wiki_page.rb

@@ -5,7 +5,7 @@ module Avm
     module Instances
       class RestApi < ::EacRest::Api
         class WikiPage < ::Avm::EacRedmineBase0::Instances::RestApi::EntityBase
-          enable_simple_cache
+          enable_memoized
 
           DATA_ROOT = 'wiki_page'
 

data/lib/avm/eac_redmine_base0/instances/runners/project/wiki_page/write.rb

@@ -51,12 +51,12 @@ module Avm
               private
 
               # @return [String]
-              def current_content_uncached
+              memoize def current_content
                 runner_context.call(:wiki_page_content)
               end
 
               # @return [String]
-              def new_content_uncached
+              memoize def new_content
                 input_content
               end
             end

data/lib/avm/eac_redmine_base0/instances/runners/project.rb

@@ -12,7 +12,7 @@ module Avm
 
           private
 
-          def project_uncached
+          memoize def project
             runner_context.call(:instance).rest_api.root_entity.project(parsed.id_or_identifier)
           end
         end

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

@@ -11,6 +11,11 @@ module Avm
           INSTALLER_PLUGIN_DEFAULT_SETTINGS_PATH =
             'plugins/redmine_installer/installer/default_settings.sh'
 
+          # @return [Avm::VersionNumber]
+          def default_nodejs_version
+            ::Avm::VersionNumber.new(default_setting_value('nodejs_version'))
+          end
+
           # @return [ActiveSupport::Duration]
           def default_passenger_start_timeout
             default_setting_value('passenger_start_timeout').to_i.seconds

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class Base < ::Avm::EacRailsBase1::Sources::Base
+        module Update
+          # @param changes [Enumerable<Avm::Sources::Change>]
+          def update_self_changes_after_subs
+            super.grep_v(::Avm::EacRubyBase1::Sources::Update::Changes::RubocopFormat)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/sources/core_update/bundle_changes.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class CoreUpdate
+        module BundleChanges
+          GEMFILE_CONFLICTED_GEMS = %w[rubocop rubocop-rails].freeze
+
+          # @return [void]
+          def bundle_changes
+            disable_gemfile_conflicted_gems
+            load_subs_from_gemfile
+            generate_gemfile_lock
+          end
+
+          # @return [void]
+          def disable_gemfile_conflicted_gems
+            GEMFILE_CONFLICTED_GEMS.each do |gem_name|
+              disable_gemfile_gem(gem_name)
+            end
+          end
+
+          # @param gem_name [String]
+          # @return [void]
+          def disable_gemfile_gem(gem_name)
+            source.gemfile_path.write(
+              source.gemfile_path.read.gsub(gemfile_gem_line_pattern(gem_name), '\1# \2')
+            )
+          end
+
+          # @param gem_name [String]
+          # @return [Regexp]
+          def gemfile_gem_line_pattern(gem_name)
+            /^([ \t]*)(gem[ \t]+['"]#{::Regexp.quote(gem_name)}['"].*)$/
+          end
+
+          # @return [void]
+          def generate_gemfile_lock
+            source.bundle_update.system!
+          end
+
+          # @return [void]
+          def load_subs_from_gemfile
+            source.gemfile_path.write(load_subs_from_gemfile_code, mode: 'a')
+          end
+
+          # @return [String]
+          def load_subs_from_gemfile_code
+            <<~'CODE'
+
+              # Subs
+              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
+              end
+            CODE
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/sources/core_update/scm.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class CoreUpdate
+        module Scm
+          enable_memoized
+
+          # @return [void]
+          def git_commit
+            if git_repo.dirty?
+              infom 'Git commiting...'
+              git_repo.command('add', '--', target_path).execute!
+              git_repo.command('commit', '-m', git_commit_message, '--', target_path).execute!
+            else
+              infom 'Nothing to commit'
+            end
+          end
+
+          # @return [String]
+          def git_commit_message
+            i18n_translate(__method__, version: version, __locale: source.locale)
+          end
+
+          # @return [EacGit::Local]
+          memoize def git_repo
+            ::EacGit::Local.new(target_path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/sources/core_update/source_package.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class CoreUpdate
+        module SourcePackage
+          enable_memoized
+
+          # @return [void]
+          def assert_source_package
+            infom 'Asserting source package...'
+            source_package.assert
+            infov 'Package cache path', source_package.path
+            infov 'Package size', source_package.path.size
+          end
+
+          # @return [EacFs::CachedDownload]
+          memoize def source_package
+            ::EacFs::CachedDownload.new(url, fs_cache)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/sources/core_update/tempdir.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class CoreUpdate
+        module Tempdir
+          def on_temp_dir
+            ::EacRubyUtils::Fs::Temp.on_directory do |dir|
+              @tempdir = dir
+              yield
+            end
+          end
+
+          protected
+
+          attr_accessor :tempdir
+        end
+      end
+    end
+  end
+end

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

@@ -5,45 +5,36 @@ module Avm
     module Sources
       class CoreUpdate
         enable_speaker
-        enable_simple_cache
+        enable_memoized
         common_constructor :source, :version, :url
 
         GITIGNORE_ADD = %w[/public/assets/**/* /config/credentials.* /config/credentials/*
-                           /config/install.sh /config/master.key /log/**/*].freeze
-        GITIGNORE_DEL = %w[/Gemfile.lock /plugins/* /public/themes/*].freeze
+                           /config/install.sh /config/*.key /log/**/*].freeze
+        GITIGNORE_DEL = %w[/Gemfile.lock /plugins/* /themes/* !/themes/README].freeze
         TARGET_KEEP = ::Avm::Sources::Base::Configuration::CONFIGURATION_FILENAMES
                         .map { |b| "/#{b}" } + %w[/Gemfile.lock /plugins/*/**
-                                                  /public/themes/*/**].freeze
-        TARGET_REMOVE = %w[alternate classic].map { |t| "/public/themes/#{t}/**" }
+                                                  /themes/*/** /sub/*/**].freeze
+        TARGET_REMOVE = ['/themes/README'].freeze
 
         def run
-          ::EacRubyUtils::Fs::Temp.on_directory do |dir|
-            @tempdir = dir
+          on_temp_dir do
             assert_source_package
             extract_package_to_tempdir
             sync_content
             change_git_ignore
             validate_empty_dir
+            bundle_changes
           end
           git_commit
           success 'Done!'
         end
 
-        def assert_source_package
-          infom 'Asserting source package...'
-          source_package.assert
-          infov 'Package cache path', source_package.path
-          infov 'Package size', source_package.path.size
-        end
-
         def fs_object_id
           [source.path, version].join('_').variableize
         end
 
         private
 
-        attr_reader :tempdir
-
         def change_git_ignore
           file = target_path.join('.gitignore')
           file.write(
@@ -60,34 +51,11 @@ module Avm
           ).execute!
         end
 
-        def git_commit
-          if git_repo.dirty?
-            infom 'Git commiting...'
-            git_repo.command('add', '--', target_path).execute!
-            git_repo.command('commit', '-m', git_commit_message, '--', target_path).execute!
-          else
-            infom 'Nothing to commit'
-          end
-        end
-
-        def git_commit_message
-          i18n_translate(__method__, version: version, __locale: source.locale)
-        end
-
-        def git_repo_uncached
-          ::EacGit::Local.new(target_path)
-        end
-
         def sync_content
           ::Avm::Sync.new(source_path, target_path)
             .add_exclude('/*').add_includes(*target_files_to_remove).move_mode(true).run
         end
 
-        # @return [EacFs::CachedDownload]
-        def source_package_uncached
-          ::EacFs::CachedDownload.new(url, fs_cache)
-        end
-
         def validate_empty_dir
           if source_path.children.empty?
             infom 'No content left in source directory'
@@ -97,7 +65,7 @@ module Avm
           end
         end
 
-        def source_path_uncached
+        memoize def source_path
           ::Pathname.new(tempdir.to_path)
         end
 
@@ -116,9 +84,11 @@ module Avm
           TARGET_KEEP.any? { |target_keep| tpath.fnmatch?(target_keep) }
         end
 
-        def target_path_uncached
+        memoize def target_path
           source.path
         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.27.1'
+    VERSION = '0.29.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.29.0
 platform: ruby
 authors:
 - Put here the authors
@@ -15,20 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.102.4
+        version: '0.103'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.102.4
+        version: '0.103'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -36,6 +30,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,6 +40,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,12 @@ files:
 - 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/base/update.rb
 - lib/avm/eac_redmine_base0/sources/core_update.rb
+- lib/avm/eac_redmine_base0/sources/core_update/bundle_changes.rb
+- lib/avm/eac_redmine_base0/sources/core_update/scm.rb
+- lib/avm/eac_redmine_base0/sources/core_update/source_package.rb
+- lib/avm/eac_redmine_base0/sources/core_update/tempdir.rb
 - lib/avm/eac_redmine_base0/sources/runners/core_update.rb
 - lib/avm/eac_redmine_base0/sources/runners/docker.rb
 - lib/avm/eac_redmine_base0/version.rb