cleanup rake tasks

1 files changed, 21 insertions, 25 deletions

diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake
index 04d240f6b12..06d7cb65d64 100644
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
@@ -2,22 +2,20 @@ require 'active_record/fixtures'
 
 namespace :gitlab do
   namespace :app do
-
-    # Create backup of gitlab system
-    desc "GITLAB | Create a backup of the gitlab system"
+    # Create backup of GitLab system
+    desc "GITLAB | Create a backup of the GitLab system"
     task :backup_create => :environment do
-
       Rake::Task["gitlab:app:db_dump"].invoke
       Rake::Task["gitlab:app:repo_dump"].invoke
 
       Dir.chdir(Gitlab.config.backup_path)
 
       # saving additional informations
-      s = Hash.new
-      s["db_version"]         = "#{ActiveRecord::Migrator.current_version}"
-      s["backup_created_at"]  = "#{Time.now}"
-      s["gitlab_version"]     = %x{git rev-parse HEAD}.gsub(/\n/,"")
-      s["tar_version"]        = %x{tar --version | head -1}.gsub(/\n/,"")
+      s = {}
+      s[:db_version]         = "#{ActiveRecord::Migrator.current_version}"
+      s[:backup_created_at]  = "#{Time.now}"
+      s[:gitlab_version]     = %x{git rev-parse HEAD}.gsub(/\n/,"")
+      s[:tar_version]        = %x{tar --version | head -1}.gsub(/\n/,"")
 
       File.open("#{Gitlab.config.backup_path}/backup_information.yml", "w+") do |file|
         file << s.to_yaml.gsub(/^---\n/,'')
@@ -32,7 +30,7 @@ namespace :gitlab do
       end
 
       # cleanup: remove tmp files
-      print "Deletion of tmp directories..."
+      print "Deleting tmp directories..."
       if Kernel.system("rm -rf repositories/ db/ backup_information.yml")
         puts "[DONE]".green
       else
@@ -52,26 +50,23 @@ namespace :gitlab do
       else
         puts "[SKIPPING]".yellow
       end
-
     end
 
-
-    # Restore backup of gitlab system
+    # Restore backup of GitLab system
     desc "GITLAB | Restore a previously created backup"
     task :backup_restore => :environment do
-
       Dir.chdir(Gitlab.config.backup_path)
 
       # check for existing backups in the backup dir
       file_list = Dir.glob("*_gitlab_backup.tar").each.map { |f| f.split(/_/).first.to_i }
-      puts "no backup found" if file_list.count == 0
+      puts "no backups found" if file_list.count == 0
       if file_list.count > 1 && ENV["BACKUP"].nil?
         puts "Found more than one backup, please specify which one you want to restore:"
         puts "rake gitlab:app:backup_restore BACKUP=timestamp_of_backup"
         exit 1;
       end
 
-      tar_file = ENV["BACKUP"].nil? ? File.join(file_list.first.to_s + "_gitlab_backup.tar") : File.join(ENV["BACKUP"] + "_gitlab_backup.tar")
+      tar_file = ENV["BACKUP"].nil? ? File.join("#{file_list.first}_gitlab_backup.tar") : File.join(ENV["BACKUP"] + "_gitlab_backup.tar")
 
       unless File.exists?(tar_file)
         puts "The specified backup doesn't exist!"
@@ -102,16 +97,14 @@ namespace :gitlab do
       Rake::Task["gitlab:app:repo_restore"].invoke
 
       # cleanup: remove tmp files
-      print "Deletion of tmp directories..."
+      print "Deleting tmp directories..."
       if Kernel.system("rm -rf repositories/ db/ backup_information.yml")
         puts "[DONE]".green
       else
         puts "[FAILED]".red
       end
-
     end
 
-
     ################################################################################
     ################################# invoked tasks ################################
 
@@ -121,7 +114,7 @@ namespace :gitlab do
       backup_path_repo = File.join(Gitlab.config.backup_path, "repositories")
       FileUtils.mkdir_p(backup_path_repo) until Dir.exists?(backup_path_repo)
       puts "Dumping repositories:"
-      project = Project.all.map { |n| [n.path,n.path_to_repo] }
+      project = Project.all.map { |n| [n.path, n.path_to_repo] }
       project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")]
       project.each do |project|
         print "- Dumping repository #{project.first}... "
@@ -136,11 +129,11 @@ namespace :gitlab do
     task :repo_restore => :environment do
       backup_path_repo = File.join(Gitlab.config.backup_path, "repositories")
       puts "Restoring repositories:"
-      project = Project.all.map { |n| [n.path,n.path_to_repo] }
+      project = Project.all.map { |n| [n.path, n.path_to_repo] }
       project << ["gitolite-admin.git", File.join(File.dirname(project.first.second), "gitolite-admin.git")]
       project.each do |project|
         print "- Restoring repository #{project.first}... "
-        FileUtils.rm_rf(project.second) if File.dirname(project.second) # delet old stuff
+        FileUtils.rm_rf(project.second) if File.dirname(project.second) # delete old stuff
         if Kernel.system("cd #{File.dirname(project.second)} > /dev/null 2>&1 && git clone --bare #{backup_path_repo}/#{project.first}.bundle #{project.first}.git > /dev/null 2>&1")
           permission_commands = [
             "sudo chmod -R g+rwX #{Gitlab.config.git_base_path}",
@@ -157,8 +150,9 @@ namespace :gitlab do
     ###################################### DB ######################################
 
     task :db_dump => :environment do
-      backup_path_db   = File.join(Gitlab.config.backup_path, "db")
-      FileUtils.mkdir_p(backup_path_db) until Dir.exists?(backup_path_db)
+      backup_path_db = File.join(Gitlab.config.backup_path, "db")
+      FileUtils.mkdir_p(backup_path_db) unless Dir.exists?(backup_path_db)
+
       puts "Dumping database tables:"
       ActiveRecord::Base.connection.tables.each do |tbl|
         print "- Dumping table #{tbl}... "
@@ -176,9 +170,11 @@ namespace :gitlab do
     end
 
     task :db_restore=> :environment do
-      backup_path_db   = File.join(Gitlab.config.backup_path, "db")
+      backup_path_db = File.join(Gitlab.config.backup_path, "db")
+
       puts "Restoring database tables:"
       Rake::Task["db:reset"].invoke
+
       Dir.glob(File.join(backup_path_db, "*.yml") ).each do |dir|
         fixture_file = File.basename(dir, ".*" )
         print "- Loading fixture #{fixture_file}..."