avm-eac_redmine_base0 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3ffa482fea028f8f13669be8893fd3f883237601476c5ad785536ed5b55f9a5
-  data.tar.gz: 126d7281e2b85b18ca5adc47df04907e369f5a9085f19aad82c34b738dc68b86
+  metadata.gz: 5097d7b22433940fb8250d0e4b5e4a35bfa108442b3389433e69d16971cd4ed8
+  data.tar.gz: 719c3940e5ecec285cc0fc2dab888ad5e1fe65f8ce16f5fc4f568d417e657e37
 SHA512:
-  metadata.gz: ac03c79773405131e38a3c2ba23e9bba3baad9559ec59a2f8fdf0b183f893b6230d1bf7ea42aab3207f05a415c94eefbc52e9984e730c5760b48386253dd49d3
-  data.tar.gz: 7e2165a61d9b8626d1e2d488879e9b626ad1f0f15fcefdce7ebefc2c3a56ae6d25e3c9eb57d5e9455ad0f85f2852e5b1e1046d52892066a2963ea4dd05dc0e6b
+  metadata.gz: 98763b89ab2fcbf1aa03516907a24299c1e93259ffaea03f23cac103e816c5590c3ab990e196861a74fffc3c1e098c7a6ddc8bc5f0ecf6970984944f5a6b8659
+  data.tar.gz: c351e33d75239c43a9d6defeb5961bfd63fe9f85ec311cb9f18cfe33b842fe07ac9ab0194967eb22698f0ba6459f096cf6aa0c6d8de592046bda253f3d42e307

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

@@ -13,37 +13,28 @@ module Avm
         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/*/**
-                                                  /themes/*/**].freeze
+                                                  /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
-
-        memoize def git_repo
-          ::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]
-        memoize def source_package
-          ::EacFs::CachedDownload.new(url, fs_cache)
-        end
-
         def validate_empty_dir
           if source_path.children.empty?
             infom 'No content left in source directory'
@@ -119,6 +87,8 @@ module Avm
         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.28.0'
+    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.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Put here the authors
@@ -181,6 +181,10 @@ files:
 - 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