diff --git a/app/models/repository/git_remote.rb b/app/models/repository/git_remote.rb index 7d4f84e..9fb01e6 100644 --- a/app/models/repository/git_remote.rb +++ b/app/models/repository/git_remote.rb @@ -2,7 +2,9 @@ require 'pathname' require 'fileutils' # require 'open3' -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 @@ -100,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? diff --git a/init.rb b/init.rb index 8906267..7593e44 100644 --- a/init.rb +++ b/init.rb @@ -1,6 +1,8 @@ require 'redmine' -require_dependency "redmine_git_remote/repositories_helper_patch" +Rails.configuration.to_prepare do + require_dependency "redmine_git_remote/repositories_helper_patch" +end Redmine::Scm::Base.add "GitRemote" Redmine::Plugin.register :redmine_git_remote do @@ -8,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",