redmine_with_git 0.7.7 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b311b6981d9bf6600f2a6684d17224cea0397db16c2d085e994766e8978e996
-  data.tar.gz: c915a9aa476c7078d4325b93c610935249b4e5235c0962da9def327028948fcc
+  metadata.gz: 2f9a04b22d5fd7ac0889c9334049403f512292871b3ca73829e414401a8f688f
+  data.tar.gz: 54eaa0769689fce4254692356fc4f16f6ca7d32e9085f8f87c760fd75e759a2b
 SHA512:
-  metadata.gz: 7e986e1adaee7fff2ec9acf202e8e2a8a6d9365f660db6e0daeca6b2477991f8a95688f2bc820f4dee70b0d1184d64a1fc0890542d5a51b9e4f4a16582532562
-  data.tar.gz: a78007226d52b1f11bdefaea5a9346a94f7fe6b311c779b9eb379012ecc43d518ae4a2e7d9cceba96b313916b10d8c1d1b0790b37497d4e968f95149d4f3cbc0
+  metadata.gz: 463c0616cc2c09597d21fac0714915dc65669e629d261cb19881e06dc049026a24a5221f7186a1618c3c49cd97eb41fd9bbc76388392e2e2c023f27cc479ec48
+  data.tar.gz: 364e0fe410f29ef9cc25c543681e9f860a36ec10114b00a1f8b7aac8df695c5da6558c64e7d2a5e1bf2e09dc964d1d245b56631e1a03951882eaf708d4252d39

data/config/initializers/000_dependencies.rb

@@ -20,6 +20,6 @@ Redmine::Plugin.post_register :redmine_with_git do
 
   # Source: https://github.com/esquilo-azul/redmine_installer
   if ::Redmine::Plugin.registered_plugins.keys.include?(:redmine_installer)
-    requires_redmine_plugin(:redmine_installer, version_or_higher: '0.18.0')
+    requires_redmine_plugin(:redmine_installer, version_or_higher: '0.21.0')
   end
 end

data/config/initializers/001_patches.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'redmine_with_git/patches/redmine_git_hosting/gitolite_hook_patch'
+
 apply_patches_version_limit = ::Gem::Version.new('4.0.0')
 redmine_git_hosting_version = ::Gem::Version.new(
   ::Redmine::Plugin.registered_plugins[:redmine_git_hosting].version

data/installer/tasks/redmine_git_hosting.sh

@@ -8,5 +8,5 @@ function task_condition {
 }
 
 function task_dependencies {
-  echo gitolite_setup redmine_gitolite_sudoer redmine_git_hosting_settings apt_ruby
+  echo gitolite_setup redmine_gitolite_sudoer redmine_git_hosting_settings
 }

data/installer/tasks/redmine_git_hosting_ssh_key.sh

@@ -13,6 +13,6 @@ export -f task_condition
 
 function task_fix {
   # https://github.com/libgit2/pygit2/issues/1013#issuecomment-679200156
-  sudo -u "$redmine_user" -H ssh-keygen  -m PEM -t rsa -b 2048 -t rsa -f "$ssh_key" -N ''
+  sudo -u "$redmine_user" -H ssh-keygen -m PEM -t ed25519 -b 2048 -f "$ssh_key" -N ''
 }
 export -f task_fix

data/lib/redmine_with_git/patches/redmine_git_hosting/gitolite_hook_patch.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/patch'
+require 'redmine_git_hosting/gitolite_hook'
+require 'rbconfig'
+
+module RedmineWithGit
+  module Patches
+    module RedmineGitHosting
+      module GitoliteHookPatch
+        def self.included(base)
+          base.prepend(InstanceMethods)
+        end
+
+        module InstanceMethods
+          SHEBANG_PATTERNS = [:ruby].map { |k| [k, /^\#!.+\s+#{::Regexp.quote(k)}\s*$/] }
+                                    .to_h
+
+          def hook_file_has_changed?
+            on_content_replaced { super }
+          end
+
+          def install_hook_file
+            on_content_replaced { super }
+          end
+
+          def on_content_replaced
+            return yield unless replace_shebang?
+
+            ::EacRubyUtils::Fs::Temp.on_file do |temp_path|
+              temp_path.write(source_content_with_shebang_replaced)
+              @temp_source_path = temp_path.to_path
+              yield
+            ensure
+              @temp_source_path = nil
+            end
+          end
+
+          # @return [Boolean]
+          def replace_shebang?
+            shebang_replacement.present?
+          end
+
+          # @return [String]
+          def ruby_shebang
+            bin = ::RbConfig::CONFIG['RUBY_INSTALL_NAME'] || ::RbConfig::CONFIG['ruby_install_name']
+            bin += (::RbConfig::CONFIG['EXEEXT'] || ::RbConfig::CONFIG['exeext'] || '')
+            ::File.join(::RbConfig::CONFIG['bindir'], bin)
+          end
+
+          # @return [Regexp]
+          def shebang_from
+            SHEBANG_PATTERNS.fetch(shebang_replacement)
+          end
+
+          # @return [Symbol, nil]
+          def shebang_replacement
+            SHEBANG_PATTERNS.each do |k, v|
+              return k if v.match?(source_shebang)
+            end
+
+            nil
+          end
+
+          # @return [String]
+          def shebang_to
+            "\#\!#{send("#{shebang_replacement}_shebang")}\n"
+          end
+
+          # @return [String]
+          def source_path
+            @temp_source_path || super
+          end
+
+          # @return [String]
+          def source_shebang
+            ::File.open(source_path, &:readline).strip
+          end
+
+          # @return [String]
+          def source_content_with_shebang_replaced
+            ::File.read(source_path).gsub(shebang_from, shebang_to)
+          end
+        end
+      end
+    end
+  end
+end
+
+::EacRubyUtils.patch(
+  ::RedmineGitHosting::GitoliteHook,
+  ::RedmineWithGit::Patches::RedmineGitHosting::GitoliteHookPatch
+)

data/lib/redmine_with_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedmineWithGit
-  VERSION = '0.7.7'
+  VERSION = '0.7.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.9
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.78'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.78'
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.119'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.119'
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_gem_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 description: 
 email: 
 executables: []
@@ -75,12 +89,11 @@ files:
 - installer/default_settings.sh
 - installer/programs/linux/sudo_file_exists.sh
 - installer/programs/linux/sudo_write.sh
-- installer/programs/redmine/installer/triggers/list/redmine_git_hosting_rescue.sh
 - installer/programs/redmine_git_hosting/ssh_key.sh
 - installer/programs/text/diff_stdin_file.sh
+- installer/programs/triggers/redmine_git_hosting_rescue.sh
 - installer/setup.sh
 - installer/tasks/_before_run.sh
-- installer/tasks/apt_ruby.sh
 - installer/tasks/gitolite.sh
 - installer/tasks/gitolite_rc.sh
 - installer/tasks/gitolite_setup.sh
@@ -116,6 +129,7 @@ files:
 - lib/redmine_with_git/load/git.rb
 - lib/redmine_with_git/patches/redmine_git_hosting/cache/database_patch.rb
 - lib/redmine_with_git/patches/redmine_git_hosting/commands/git/git_patch.rb
+- lib/redmine_with_git/patches/redmine_git_hosting/gitolite_hook_patch.rb
 - lib/redmine_with_git/version.rb
 - lib/tasks/redmine_with_git.rake
 homepage: 

data/installer/tasks/apt_ruby.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -u
-set -e
-
-export RUBY_PACKAGE="ruby"
-
-function task_condition {
-  package_installed apt "$RUBY_PACKAGE"
-}
-
-function task_fix {
-  package_assert apt "$RUBY_PACKAGE"
-}