eac_tools 0.124.0 → 0.125.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90a05e5c6f66d64913ac12444f338786c1370111908dc2e44fabb36341d59751
-  data.tar.gz: f471db29574f550fe5e45f7490fd124f8acd77cbd26427b86e91ed78b5d27e62
+  metadata.gz: 38d1d457e0332317b49bca8e2c773148b876d1fa84e1ecdef37137cc879504fe
+  data.tar.gz: 196098332ea2ea1e42872fa46b5777892c2d45d3d9cc58bf4a22204f5d9b9548
 SHA512:
-  metadata.gz: 8fc1bd49d5345b48353e43d93c45f8734935d4616483a2baba93428f95946133b6025caa2b0ac8ab0811b215de37428850b2992f69edfc862a22ccab9693a868
-  data.tar.gz: ef724ab0cb14249ac9c51ee61708380ad529dab447551f7b6fc8329c71cbc33434b36af2893e1b2d0017602a462cf973bf68b6f2fd34e1c561f9ab2278d6c386
+  metadata.gz: 493425a7840634c5a7a5b04ec88ed29feaf80db24b361158d01386789a7a5a42a0e9d98835a6442d44217c1b5a0f7215937e1f1d7da36003de27a166d1d6a026
+  data.tar.gz: ad8f88aed572adf20198d33580e58ae4a086f778c3234834536d2d544d9542e86ad77b117f8b072597af06a65aa51d9a8cc3e651bdb3e91c16c435bce0632775

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.124.0)
+    eac_tools (0.125.0)
       avm (~> 0.103)
       avm-eac_asciidoctor_base0 (~> 0.27, >= 0.27.1)
       avm-eac_generic_base0 (~> 0.16, >= 0.16.1)
@@ -13,7 +13,7 @@ PATH
       avm-eac_python_base0 (~> 0.2, >= 0.2.2)
       avm-eac_rails_base0 (~> 0.11, >= 0.11.2)
       avm-eac_rails_base1 (~> 0.12, >= 0.12.1)
-      avm-eac_redmine_base0 (~> 0.28)
+      avm-eac_redmine_base0 (~> 0.29)
       avm-eac_redmine_plugin_base0 (~> 0.6, >= 0.6.1)
       avm-eac_ruby_base0 (~> 0.3, >= 0.3.1)
       avm-eac_ruby_base1 (~> 0.45, >= 0.45.2)
@@ -26,7 +26,7 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.28.0)
+    avm-eac_redmine_base0 (0.29.0)
       avm (~> 0.103)
       avm-eac_generic_base0 (~> 0.16, >= 0.16.1)
       avm-eac_rails_base1 (~> 0.12, >= 0.12.1)
@@ -38,7 +38,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.3.1)
+    activesupport (8.1.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -260,7 +260,7 @@ GEM
     optimist (3.2.1)
     os (1.1.4)
     ostruct (0.6.3)
-    parallel (2.2.0)
+    parallel (2.3.0)
     parseconfig (1.1.2)
     parser (3.3.12.0)
       ast (~> 2.4.1)
@@ -278,7 +278,7 @@ GEM
     random-port (0.8.2)
       tago (~> 0.0)
     rchardet (1.10.2)
-    regexp_parser (2.13.0)
+    regexp_parser (2.13.1)
     rouge (3.30.0)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)

data/eac_tools.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm-eac_python_base0', '~> 0.2', '>= 0.2.2'
   s.add_dependency 'avm-eac_rails_base0', '~> 0.11', '>= 0.11.2'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.12', '>= 0.12.1'
-  s.add_dependency 'avm-eac_redmine_base0', '~> 0.28'
+  s.add_dependency 'avm-eac_redmine_base0', '~> 0.29'
   s.add_dependency 'avm-eac_redmine_plugin_base0', '~> 0.6', '>= 0.6.1'
   s.add_dependency 'avm-eac_ruby_base0', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.45', '>= 0.45.2'

data/lib/eac_tools/version.rb

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

data/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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/sub/avm-eac_redmine_base0/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: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.124.0
+  version: 0.125.0
 platform: ruby
 authors:
 - Put here the authors
@@ -211,14 +211,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.29'
 - !ruby/object:Gem::Dependency
   name: avm-eac_redmine_plugin_base0
   requirement: !ruby/object:Gem::Requirement
@@ -432,6 +432,10 @@ files:
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/base/default_settings.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/base/update.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/core_update.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/core_update/bundle_changes.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/core_update/scm.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/core_update/source_package.rb
+- sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/core_update/tempdir.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/runners/core_update.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/runners/docker.rb
 - sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb