From bc7c77d2c2442b48f2b0b9e3b31c3538a6148bba Mon Sep 17 00:00:00 2001 From: Burak Ikiler Date: Wed, 5 Apr 2023 18:58:04 +0300 Subject: [PATCH 1/7] Redmine 5 Compatibility: Autoloder fix.. --- init.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.rb b/init.rb index 8906267..dff83e6 100644 --- a/init.rb +++ b/init.rb @@ -1,5 +1,5 @@ require 'redmine' -require_dependency "redmine_git_remote/repositories_helper_patch" +require File.dirname(__FILE__) + '/lib/redmine_git_remote/repositories_helper_patch' Redmine::Scm::Base.add "GitRemote" From f809b10316b7881ba287887cc77e60981325e96d Mon Sep 17 00:00:00 2001 From: Burak Ikiler Date: Wed, 5 Apr 2023 19:02:18 +0300 Subject: [PATCH 2/7] Redmine 5 Compatibility: Autoloder fix.. --- app/models/repository/git_remote.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/repository/git_remote.rb b/app/models/repository/git_remote.rb index 7d4f84e..d0dc798 100644 --- a/app/models/repository/git_remote.rb +++ b/app/models/repository/git_remote.rb @@ -2,7 +2,7 @@ require 'pathname' require 'fileutils' # require 'open3' -require_dependency 'redmine_git_remote/poor_mans_capture3' +require File.dirname(__FILE__) + '/lib/redmine_git_remote/poor_mans_capture3' class Repository::GitRemote < Repository::Git From 48e6a7164e248ad16b6afaec2a98c0e020d98eb8 Mon Sep 17 00:00:00 2001 From: Burak Ikiler Date: Wed, 5 Apr 2023 19:06:27 +0300 Subject: [PATCH 3/7] Redmine 5 Compatibility: Autoloder fix.. --- app/models/repository/git_remote.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/repository/git_remote.rb b/app/models/repository/git_remote.rb index d0dc798..f3b7e9a 100644 --- a/app/models/repository/git_remote.rb +++ b/app/models/repository/git_remote.rb @@ -2,7 +2,7 @@ require 'pathname' require 'fileutils' # require 'open3' -require File.dirname(__FILE__) + '/lib/redmine_git_remote/poor_mans_capture3' +require File.dirname(__FILE__) + '/../../../lib/redmine_git_remote/poor_mans_capture3' class Repository::GitRemote < Repository::Git From e6c3493a43f8c4dfb6412664227853a7a0df2130 Mon Sep 17 00:00:00 2001 From: Burak Ikiler Date: Wed, 5 Apr 2023 19:14:35 +0300 Subject: [PATCH 4/7] Redmine 5 Compatibility: Autoloder fix with to_prepare. --- app/models/repository/git_remote.rb | 3 ++- init.rb | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/models/repository/git_remote.rb b/app/models/repository/git_remote.rb index f3b7e9a..2608269 100644 --- a/app/models/repository/git_remote.rb +++ b/app/models/repository/git_remote.rb @@ -2,7 +2,8 @@ require 'pathname' require 'fileutils' # require 'open3' -require File.dirname(__FILE__) + '/../../../lib/redmine_git_remote/poor_mans_capture3' +# require File.dirname(__FILE__) + '/../../../lib/redmine_git_remote/poor_mans_capture3' +require_dependency 'redmine_git_remote/poor_mans_capture3' class Repository::GitRemote < Repository::Git diff --git a/init.rb b/init.rb index dff83e6..8461600 100644 --- a/init.rb +++ b/init.rb @@ -1,6 +1,10 @@ require 'redmine' -require File.dirname(__FILE__) + '/lib/redmine_git_remote/repositories_helper_patch' +# require File.dirname(__FILE__) + '/lib/redmine_git_remote/repositories_helper_patch' +Rails.configuration.to_prepare do + require_dependency "redmine_git_remote/repositories_helper_patch" + require_dependency 'redmine_git_remote/poor_mans_capture3' +end Redmine::Scm::Base.add "GitRemote" Redmine::Plugin.register :redmine_git_remote do From 9868a31ea8f81b2b2152df202a4a5d6ef690a02f Mon Sep 17 00:00:00 2001 From: Burak Ikiler Date: Wed, 5 Apr 2023 19:17:20 +0300 Subject: [PATCH 5/7] Redmine 5 Compatibility: Autoloder fix with to_prepare. --- app/models/repository/git_remote.rb | 5 +++-- init.rb | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/repository/git_remote.rb b/app/models/repository/git_remote.rb index 2608269..f82e992 100644 --- a/app/models/repository/git_remote.rb +++ b/app/models/repository/git_remote.rb @@ -2,8 +2,9 @@ require 'pathname' require 'fileutils' # require 'open3' -# require File.dirname(__FILE__) + '/../../../lib/redmine_git_remote/poor_mans_capture3' -require_dependency 'redmine_git_remote/poor_mans_capture3' +Rails.configuration.to_prepare do + require_dependency 'redmine_git_remote/poor_mans_capture3' +end class Repository::GitRemote < Repository::Git diff --git a/init.rb b/init.rb index 8461600..fbb6ca2 100644 --- a/init.rb +++ b/init.rb @@ -1,9 +1,7 @@ require 'redmine' -# require File.dirname(__FILE__) + '/lib/redmine_git_remote/repositories_helper_patch' Rails.configuration.to_prepare do require_dependency "redmine_git_remote/repositories_helper_patch" - require_dependency 'redmine_git_remote/poor_mans_capture3' end Redmine::Scm::Base.add "GitRemote" From 87b067d79f324e2b0c8346fcb378c1180fdaff73 Mon Sep 17 00:00:00 2001 From: Burak Ikiler <123000591+burak-ikiler-ew@users.noreply.github.com> Date: Wed, 22 May 2024 12:13:04 +0300 Subject: [PATCH 6/7] Update init.rb --- init.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.rb b/init.rb index fbb6ca2..7593e44 100644 --- a/init.rb +++ b/init.rb @@ -10,7 +10,7 @@ author 'Alex Dergachev' url 'https://github.com/dergachev/redmine_git_remote' description 'Automatically clone and fetch remote git repositories' - version '0.0.2' + version '0.0.3' settings :default => { 'git_remote_repo_clone_path' => Pathname.new(__FILE__).join("../").realpath.to_s + "/repos", From 718e8bcf0661e3f2439cd31ebfbe76e002579016 Mon Sep 17 00:00:00 2001 From: Burak Ikiler <123000591+burak-ikiler-ew@users.noreply.github.com> Date: Thu, 30 May 2024 13:08:46 +0300 Subject: [PATCH 7/7] refs #64658: Ruby 3.2 compatibility issues. --- app/models/repository/git_remote.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/repository/git_remote.rb b/app/models/repository/git_remote.rb index f82e992..9fb01e6 100644 --- a/app/models/repository/git_remote.rb +++ b/app/models/repository/git_remote.rb @@ -102,7 +102,7 @@ def ensure_possibly_empty_clone_exists return "#{clone_url} is not a valid remote." end - if Dir.exists? clone_path + if Dir.exist? clone_path existing_repo_remote, status = RedmineGitRemote::PoorMansCapture3::capture2("git", "--git-dir", clone_path, "config", "--get", "remote.origin.url") return "Unable to run: git --git-dir #{clone_path} config --get remote.origin.url" unless status.success?