Skip to content

Commit efa98cd

Browse files
author
root
committed
Minor change in namespace, add logs
1 parent fcac53c commit efa98cd

File tree

3 files changed

+37
-35
lines changed

3 files changed

+37
-35
lines changed

Diff for: ‎lib/redmine_gitolite/gitolite_wrapper/projects_helper.rb

+17-17
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ def handle_repositories_move(git_projects)
1111

1212
project.gitolite_repos.reverse.each do |repository|
1313
repo_list.push(repository.gitolite_repository_name)
14-
do_move_repositories(repository)
14+
perform_repository_move(repository)
1515
end
1616

1717
gitolite_admin_repo_commit("#{@action} : #{project.identifier} | #{repo_list}")
1818
end
1919
end
2020

2121

22-
def do_move_repositories(repository)
22+
def perform_repository_move(repository)
2323
repo_id = repository.redmine_name
2424
repo_name = repository.old_repository_name
2525

@@ -73,28 +73,28 @@ def move_physical_repo(old_path, new_path, new_parent_path)
7373
end
7474

7575
# Now we have multiple options, due to the way gitolite sets up repositories
76-
new_path_exists = RedmineGitolite::GitoliteWrapper.sudo_dir_exists?(new_path)
77-
old_path_exists = RedmineGitolite::GitoliteWrapper.sudo_dir_exists?(old_path)
76+
new_path_exists = GitoliteWrapper.sudo_dir_exists?(new_path)
77+
old_path_exists = GitoliteWrapper.sudo_dir_exists?(old_path)
7878

7979
## CASE 1
8080
if new_path_exists && old_path_exists
8181

82-
if RedmineGitolite::GitoliteWrapper.sudo_repository_empty?(new_path)
82+
if GitoliteWrapper.sudo_repository_empty?(new_path)
8383
logger.warn { "#{@action} : target repository '#{new_path}' already exists and is empty, remove it ..." }
8484
begin
85-
RedmineGitolite::GitoliteWrapper.sudo_rmdir(new_path, true)
86-
rescue RedmineGitolite::GitHosting::GitHostingException => e
85+
GitoliteWrapper.sudo_rmdir(new_path, true)
86+
rescue GitHosting::GitHostingException => e
8787
logger.error { "#{@action} : removing existing target repository failed, exit !" }
8888
return false
8989
end
9090
else
9191
logger.warn { "#{@action} : target repository '#{new_path}' exists and is not empty, considered as already moved, try to remove the old_path if empty" }
9292

93-
if RedmineGitolite::GitoliteWrapper.sudo_repository_empty?(old_path)
93+
if GitoliteWrapper.sudo_repository_empty?(old_path)
9494
begin
95-
RedmineGitolite::GitoliteWrapper.sudo_rmdir(old_path, true)
95+
GitoliteWrapper.sudo_rmdir(old_path, true)
9696
return true
97-
rescue RedmineGitolite::GitHosting::GitHostingException => e
97+
rescue GitHosting::GitHostingException => e
9898
logger.error { "#{@action} : removing source repository directory failed, exit !" }
9999
return false
100100
end
@@ -109,20 +109,20 @@ def move_physical_repo(old_path, new_path, new_parent_path)
109109

110110
logger.debug { "#{@action} : really moving Gitolite repository from '#{old_path}' to '#{new_path}'" }
111111

112-
if !RedmineGitolite::GitoliteWrapper.sudo_dir_exists?(new_parent_path)
112+
if !GitoliteWrapper.sudo_dir_exists?(new_parent_path)
113113
begin
114-
RedmineGitolite::GitoliteWrapper.sudo_mkdir('-p', new_parent_path)
115-
rescue RedmineGitolite::GitHosting::GitHostingException => e
114+
GitoliteWrapper.sudo_mkdir('-p', new_parent_path)
115+
rescue GitHosting::GitHostingException => e
116116
logger.error { "#{@action} : creation of parent path '#{new_parent_path}' failed, exit !" }
117117
return false
118118
end
119119
end
120120

121121
begin
122-
RedmineGitolite::GitoliteWrapper.sudo_move(old_path, new_path)
122+
GitoliteWrapper.sudo_move(old_path, new_path)
123123
logger.info { "#{@action} : done !" }
124124
return true
125-
rescue RedmineGitolite::GitHosting::GitHostingException => e
125+
rescue GitHosting::GitHostingException => e
126126
logger.error { "move_physical_repo(#{old_path}, #{new_path}) failed" }
127127
return false
128128
end
@@ -145,8 +145,8 @@ def clean_path(path_list)
145145
path_list.uniq.sort.reverse.each do |path|
146146
begin
147147
logger.info { "#{@action} : cleaning repository path : '#{path}'" }
148-
RedmineGitolite::GitoliteWrapper.sudo_rmdir(path)
149-
rescue RedmineGitolite::GitHosting::GitHostingException => e
148+
GitoliteWrapper.sudo_rmdir(path)
149+
rescue GitHosting::GitHostingException => e
150150
logger.error { "#{@action} : error while cleaning repository path '#{path}'" }
151151
end
152152
end

Diff for: ‎lib/redmine_gitolite/hooks.rb

+17-17
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ def install_hooks_dir(hook_dir)
126126
logger.info { "Installing hook directory '#{hook_dir}'" }
127127

128128
begin
129-
RedmineGitolite::GitoliteWrapper.sudo_mkdir('-p', hook_dir)
130-
RedmineGitolite::GitoliteWrapper.sudo_chmod('755', hook_dir)
129+
GitoliteWrapper.sudo_mkdir('-p', hook_dir)
130+
GitoliteWrapper.sudo_chmod('755', hook_dir)
131131
return true
132-
rescue => e
132+
rescue GitHosting::GitHostingException => e
133133
logger.error { "Problems installing hook directory '#{hook_dir}'" }
134134
return false
135135
end
@@ -188,7 +188,7 @@ def check_hook_file_installed(hook)
188188

189189
else
190190

191-
content = RedmineGitolite::GitoliteWrapper.sudo_capture('eval', 'cat', @@post_receive_hook_path[hook_name])
191+
content = GitoliteWrapper.sudo_capture('eval', 'cat', @@post_receive_hook_path[hook_name])
192192
digest = Digest::MD5.hexdigest(content)
193193

194194
if hook_digest(hook_data) == digest
@@ -241,12 +241,12 @@ def install_hook_file(hook_data)
241241
logger.info { "Installing hook '#{source_path}' in '#{destination_path}'" }
242242

243243
begin
244-
RedmineGitolite::GitoliteWrapper.sudo_pipe("sh") do
244+
GitoliteWrapper.sudo_pipe("sh") do
245245
[ 'cat', '<<\EOF', '>' + destination_path, "\n" + File.read(source_path) + "EOF" ].join(' ')
246246
end
247-
RedmineGitolite::GitoliteWrapper.sudo_chmod(filemode, destination_path)
247+
GitoliteWrapper.sudo_chmod(filemode, destination_path)
248248
return true
249-
rescue => e
249+
rescue GitHosting::GitHostingException => e
250250
logger.error { "Problems installing hook from '#{source_path}' in '#{destination_path}'" }
251251
return false
252252
end
@@ -266,27 +266,27 @@ def hook_digest(hook_data)
266266

267267
def update_gitolite
268268
begin
269-
RedmineGitolite::GitoliteWrapper.sudo_shell(*@gitolite_command)
269+
GitoliteWrapper.sudo_shell(*@gitolite_command)
270270
return true
271-
rescue => e
271+
rescue GitHosting::GitHostingException => e
272272
return false
273273
end
274274
end
275275

276276

277277
def hook_file_exists?(hook_path)
278278
begin
279-
RedmineGitolite::GitoliteWrapper.sudo_file_exists?(hook_path)
280-
rescue => e
279+
GitoliteWrapper.sudo_file_exists?(hook_path)
280+
rescue GitHosting::GitHostingException => e
281281
return false
282282
end
283283
end
284284

285285

286286
def hook_dir_exists?(hook_dir)
287287
begin
288-
RedmineGitolite::GitoliteWrapper.sudo_dir_exists?(hook_dir)
289-
rescue => e
288+
GitoliteWrapper.sudo_dir_exists?(hook_dir)
289+
rescue GitHosting::GitHostingException => e
290290
return false
291291
end
292292
end
@@ -295,8 +295,8 @@ def hook_dir_exists?(hook_dir)
295295
# Return a hash with global config parameters.
296296
def get_global_hooks_params
297297
begin
298-
hooks_params = RedmineGitolite::GitoliteWrapper.sudo_capture('git', 'config', '-f', '.gitconfig', '--get-regexp', GITOLITE_HOOKS_NAMESPACE).split("\n")
299-
rescue RedmineGitolite::GitHosting::GitHostingException => e
298+
hooks_params = GitoliteWrapper.sudo_capture('git', 'config', '-f', '.gitconfig', '--get-regexp', GITOLITE_HOOKS_NAMESPACE).split("\n")
299+
rescue GitHosting::GitHostingException => e
300300
logger.error { "Problems to retrieve Gitolite hook parameters in Gitolite config" }
301301
hooks_params = []
302302
end
@@ -331,9 +331,9 @@ def set_hook_param(name, value)
331331
logger.info { "Set Git hooks global parameter : #{name} (#{value})" }
332332

333333
begin
334-
RedmineGitolite::GitoliteWrapper.sudo_capture('git', 'config', '--global', gitconfig_prefix(name), value)
334+
GitoliteWrapper.sudo_capture('git', 'config', '--global', gitconfig_prefix(name), value)
335335
return true
336-
rescue RedmineGitolite::GitHosting::GitHostingException => e
336+
rescue GitHosting::GitHostingException => e
337337
logger.error { "Error while setting Git hooks global parameter : #{name} (#{value})" }
338338
return false
339339
end

Diff for: ‎lib/redmine_gitolite/recycle.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def delete_expired_files(repositories_array = [])
5858
end
5959

6060
if result.length > 0
61-
logger.info { "Garbage-collecting #{result.length} expired repositor#{(result.length != 1) ? "ies" : "y"} from Recycle Bin :" }
61+
logger.info { "Removing #{result.length} expired repositor#{(result.length != 1) ? "ies" : "y"} from Recycle Bin :" }
6262

6363
result.each do |dirname|
6464
logger.info { "Deleting '#{dirname}'" }
@@ -69,6 +69,8 @@ def delete_expired_files(repositories_array = [])
6969
end
7070
end
7171

72+
logger.info { "Done !" }
73+
7274
# Optionally remove recycle_bin (but only if empty). Ignore error if non-empty
7375
delete_recycle_bin_dir
7476

0 commit comments

Comments
 (0)