Merge pull request #2017 from duksis/backup_restore

bugfix: backup data retrieved with the same type keys as saved

lib/tasks/gitlab/backup.rake

@@ -82,7 +82,7 @@ namespace :gitlab do
       end
 
       settings = YAML.load_file("backup_information.yml")
-      ENV["VERSION"] = "#{settings["db_version"]}" if settings["db_version"].to_i > 0
+      ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0
 
       # restoring mismatching backups can lead to unexpected problems
       if settings[:gitlab_version] != %x{git rev-parse HEAD}.gsub(/\n/,"")

spec/tasks/gitlab/backup_rake_spec.rb

+require 'spec_helper'
+require 'rake'
+
+describe 'gitlab:app namespace rake task' do
+  before :all do
+    Rake.application.rake_require "tasks/gitlab/backup"
+    # empty task as env is already loaded
+    Rake::Task.define_task :environment
+  end
+
+  describe 'backup_restore' do
+    before do
+      # avoid writing task output to spec progress
+      $stdout.stub :write
+    end
+
+    let :run_rake_task do
+      Rake::Task["gitlab:app:backup_restore"].reenable
+      Rake.application.invoke_task "gitlab:app:backup_restore"
+    end
+
+    context 'gitlab version' do
+      before do
+        Dir.stub :glob => []
+        Dir.stub :chdir
+        File.stub :exists? => true
+        Kernel.stub :system => true
+      end
+
+      let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") }
+
+      it 'should fail on mismach' do
+        YAML.stub :load_file => {:gitlab_version => gitlab_version.reverse}
+        expect { run_rake_task }.to raise_error SystemExit
+      end
+
+      it 'should invoke restoration on mach' do
+        YAML.stub :load_file => {:gitlab_version => gitlab_version}
+        Rake::Task["gitlab:app:db_restore"].should_receive :invoke
+        Rake::Task["gitlab:app:repo_restore"].should_receive :invoke
+        expect { run_rake_task }.to_not raise_error SystemExit
+      end
+    end
+
+  end # backup_restore task
+end # gitlab:app namespace