dump 1.0.5 → 1.0.6

data/spec/recipes/dump_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'dump'
 require 'capistrano'
 
 describe 'cap dump' do
@@ -11,21 +12,21 @@ describe 'cap dump' do
   end
 
   def all_dictionary_variables
-    DumpRake::Env::DICTIONARY.each_with_object({}) do |(key, value), filled_env|
+    Dump::Env::DICTIONARY.each_with_object({}) do |(key, value), filled_env|
       filled_env[key] = value.join(' ')
     end
   end
 
   def self.test_passing_environment_variables(place, command, command_strings, options = {})
-    DumpRake::Env.variable_names_for_command(command).each do |variable|
+    Dump::Env.variable_names_for_command(command).each do |variable|
       command_string = command_strings[variable]
-      DumpRake::Env::DICTIONARY[variable].each do |name|
-        it "should pass #{variable} if it is set through environment variable #{name}" do
+      Dump::Env::DICTIONARY[variable].each do |name|
+        it "passes #{variable} if it is set through environment variable #{name}" do
           violated 'command_string not specified' unless command_string
           full_command_string = command_string
           full_command_string = "cd #{@remote_path}; #{command_string}" if place == :remote
           expect(@cap.dump).to receive(:"run_#{place}").with(full_command_string).and_return(options[:return_value] || '')
-          DumpRake::Env.with_env name => options[:value] || 'some data' do
+          Dump::Env.with_env name => options[:value] || 'some data' do
             cap_task = options[:cap_task] || "dump:#{place}:#{command}"
             grab_output{ @cap.find_and_execute_task(cap_task) }
           end
@@ -35,12 +36,11 @@ describe 'cap dump' do
   end
 
   describe :dump_command do
-
-    it 'should return escaped string' do
+    it 'returns escaped string' do
       expect(@cap.dump.dump_command(:hello, :rake => 'rake', 'x x' => 'a b')).to eq('rake -s dump:hello x\\ x\\=a\\ b')
     end
 
-    it 'should return escaped string for complex rake invocation command' do
+    it 'returns escaped string for complex rake invocation command' do
       expect(@cap.dump.dump_command(:hello, :rake => 'bundler exec rake', 'x x' => 'a b')).to eq('bundler exec rake -s dump:hello x\\ x\\=a\\ b')
     end
   end
@@ -53,20 +53,19 @@ describe 'cap dump' do
     [:up, :down].each do |direction|
       describe direction do
         describe 'if method not set' do
-
-          it 'should call got_rsync?' do
+          it 'calls got_rsync?' do
             expect(@cap.dump).to receive(:got_rsync?)
             grab_output{ @cap.dump.do_transfer(direction, 'a.tgz', 'b.tgz') }
           end
 
           describe 'if got_rsync?' do
-            it 'should use rsync' do
+            it 'uses rsync' do
               allow(@cap.dump).to receive(:got_rsync?).and_return(true)
               expect(@cap.dump).to receive(:do_transfer_via).with(:rsync, direction, 'a.tgz', 'b.tgz')
               grab_output{ @cap.dump.do_transfer(direction, 'a.tgz', 'b.tgz') }
             end
 
-            it 'should raise if rsync fails' do
+            it 'raises if rsync fails' do
               allow(@cap.dump).to receive(:got_rsync?).and_return(true)
               expect(@cap.dump).to receive(:do_transfer_via).with(:rsync, direction, 'a.tgz', 'b.tgz').and_raise('problem using rsync')
               expect do
@@ -76,20 +75,20 @@ describe 'cap dump' do
           end
 
           describe 'unless got_rsync?' do
-            it 'should try sftp' do
+            it 'tries sftp' do
               allow(@cap.dump).to receive(:got_rsync?).and_return(false)
               expect(@cap.dump).to receive(:do_transfer_via).with(:sftp, direction, 'a.tgz', 'b.tgz')
               grab_output{ @cap.dump.do_transfer(direction, 'a.tgz', 'b.tgz') }
             end
 
-            it 'should try scp after sftp' do
+            it 'tries scp after sftp' do
               allow(@cap.dump).to receive(:got_rsync?).and_return(false)
               expect(@cap.dump).to receive(:do_transfer_via).with(:sftp, direction, 'a.tgz', 'b.tgz').and_raise('problem using sftp')
               expect(@cap.dump).to receive(:do_transfer_via).with(:scp, direction, 'a.tgz', 'b.tgz')
               grab_output{ @cap.dump.do_transfer(direction, 'a.tgz', 'b.tgz') }
             end
 
-            it 'should not rescue if scp also fails' do
+            it 'does not rescue if scp also fails' do
               allow(@cap.dump).to receive(:got_rsync?).and_return(false)
               expect(@cap.dump).to receive(:do_transfer_via).with(:sftp, direction, 'a.tgz', 'b.tgz').and_raise('problem using sftp')
               expect(@cap.dump).to receive(:do_transfer_via).with(:scp, direction, 'a.tgz', 'b.tgz').and_raise('problem using scp')
@@ -104,13 +103,13 @@ describe 'cap dump' do
   end
 
   describe 'local' do
-    it 'should call local:create' do
+    it 'calls local:create' do
       expect(@cap.dump.local).to receive(:create).and_return('')
       @cap.find_and_execute_task('dump:local')
     end
 
     describe 'versions' do
-      it 'should call local rake task' do
+      it 'calls local rake task' do
         expect(@cap.dump).to receive(:run_local).with('rake -s dump:versions SHOW_SIZE\\=true').and_return('')
         @cap.find_and_execute_task('dump:local:versions')
       end
@@ -121,7 +120,7 @@ describe 'cap dump' do
         :summary => 'rake -s dump:versions SHOW_SIZE\\=true SUMMARY\\=some\\ data',
       })
 
-      it 'should print result of rake task' do
+      it 'prints result of rake task' do
         allow(@cap.dump).to receive(:run_local).and_return(" 123M\t123123.tgz\n")
         expect(grab_output do
           @cap.find_and_execute_task('dump:local:versions')
@@ -130,7 +129,7 @@ describe 'cap dump' do
     end
 
     describe 'cleanup' do
-      it 'should call local rake task' do
+      it 'calls local rake task' do
         expect(@cap.dump).to receive(:run_local).with('rake -s dump:cleanup').and_return('')
         @cap.find_and_execute_task('dump:local:cleanup')
       end
@@ -141,7 +140,7 @@ describe 'cap dump' do
         :leave => 'rake -s dump:cleanup LEAVE\\=some\\ data',
       })
 
-      it 'should print result of rake task' do
+      it 'prints result of rake task' do
         allow(@cap.dump).to receive(:run_local).and_return("123123.tgz\n")
         expect(grab_output do
           @cap.find_and_execute_task('dump:local:cleanup')
@@ -150,24 +149,24 @@ describe 'cap dump' do
     end
 
     describe 'create' do
-      it 'should raise if dump creation fails' do
+      it 'raises if dump creation fails' do
         expect(@cap.dump).to receive(:run_local).with('rake -s dump:create TAGS\\=local').and_return('')
         expect do
           @cap.find_and_execute_task('dump:local:create')
         end.to raise_error('Failed creating dump')
       end
 
-      it 'should call local rake task with tag local' do
+      it 'calls local rake task with tag local' do
         expect(@cap.dump).to receive(:run_local).with('rake -s dump:create TAGS\\=local').and_return('123.tgz')
         grab_output do
           @cap.find_and_execute_task('dump:local:create')
         end
       end
 
-      it 'should call local rake task with additional tag local' do
+      it 'calls local rake task with additional tag local' do
         expect(@cap.dump).to receive(:run_local).with('rake -s dump:create TAGS\\=local,photos').and_return('123.tgz')
         grab_output do
-          DumpRake::Env.with_env :tags => 'photos' do
+          Dump::Env.with_env :tags => 'photos' do
             @cap.find_and_execute_task('dump:local:create')
           end
         end
@@ -180,14 +179,14 @@ describe 'cap dump' do
         :assets => 'rake -s dump:create ASSETS\\=some\\ data TAGS\\=local',
       }, :return_value => '123.tgz')
 
-      it 'should print result of rake task' do
+      it 'prints result of rake task' do
         allow(@cap.dump).to receive(:run_local).and_return("123123.tgz\n")
         expect(grab_output do
           @cap.find_and_execute_task('dump:local:create')
         end[:stdout]).to eq("123123.tgz\n")
       end
 
-      it 'should return stripped result of rake task' do
+      it 'returns stripped result of rake task' do
         allow(@cap.dump).to receive(:run_local).and_return("123123.tgz\n")
         grab_output do
           expect(@cap.find_and_execute_task('dump:local:create')).to eq('123123.tgz')
@@ -196,7 +195,7 @@ describe 'cap dump' do
     end
 
     describe 'restore' do
-      it 'should call local rake task' do
+      it 'calls local rake task' do
         expect(@cap.dump).to receive(:run_local).with('rake -s dump:restore')
         @cap.find_and_execute_task('dump:local:restore')
       end
@@ -212,7 +211,7 @@ describe 'cap dump' do
     end
 
     describe 'upload' do
-      it 'should run rake versions to get avaliable versions' do
+      it 'runs rake versions to get avaliable versions' do
         expect(@cap.dump).to receive(:run_local).with('rake -s dump:versions').and_return('')
         @cap.find_and_execute_task('dump:local:upload')
       end
@@ -224,19 +223,19 @@ describe 'cap dump' do
         :transfer_via => 'rake -s dump:versions', # tranfer_via is used internally
       }, :cap_task => 'dump:local:upload')
 
-      it 'should not upload anything if there are no versions avaliable' do
+      it 'does not upload anything if there are no versions avaliable' do
         allow(@cap.dump).to receive(:run_local).and_return('')
         expect(@cap.dump).not_to receive(:do_transfer)
         @cap.find_and_execute_task('dump:local:upload')
       end
 
-      it 'should transfer latest version dump' do
+      it 'transfers latest version dump' do
         allow(@cap.dump).to receive(:run_local).and_return("100.tgz\n200.tgz\n300.tgz\n")
         expect(@cap.dump).to receive(:do_transfer).with(:up, 'dump/300.tgz', "#{@remote_path}/dump/300.tgz")
         @cap.find_and_execute_task('dump:local:upload')
       end
 
-      it 'should handle extra spaces around file names' do
+      it 'handles extra spaces around file names' do
         allow(@cap.dump).to receive(:run_local).and_return("\r\n\r\n\r  100.tgz   \r\n\r\n\r  200.tgz   \r\n\r\n\r  300.tgz   \r\n\r\n\r  ")
         expect(@cap.dump).to receive(:do_transfer).with(:up, 'dump/300.tgz', "#{@remote_path}/dump/300.tgz")
         @cap.find_and_execute_task('dump:local:upload')
@@ -245,13 +244,13 @@ describe 'cap dump' do
   end
 
   describe 'remote' do
-    it 'should call remote:create' do
+    it 'calls remote:create' do
       expect(@cap.dump.remote).to receive(:create).and_return('')
       @cap.find_and_execute_task('dump:remote')
     end
 
     describe 'versions' do
-      it 'should call remote rake task' do
+      it 'calls remote rake task' do
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production SHOW_SIZE\\=true").and_return('')
         @cap.find_and_execute_task('dump:remote:versions')
       end
@@ -262,14 +261,14 @@ describe 'cap dump' do
         :summary => 'rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production SHOW_SIZE\\=true SUMMARY\\=some\\ data',
       })
 
-      it 'should print result of rake task' do
+      it 'prints result of rake task' do
         allow(@cap.dump).to receive(:run_remote).and_return(" 123M\t123123.tgz\n")
         expect(grab_output do
           @cap.find_and_execute_task('dump:remote:versions')
         end[:stdout]).to eq(" 123M\t123123.tgz\n")
       end
 
-      it 'should use custom rake binary' do
+      it 'uses custom rake binary' do
         expect(@cap.dump).to receive(:fetch_rake).and_return('/custom/rake')
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production SHOW_SIZE\\=true").and_return('')
         @cap.find_and_execute_task('dump:remote:versions')
@@ -277,7 +276,7 @@ describe 'cap dump' do
     end
 
     describe 'cleanup' do
-      it 'should call remote rake task' do
+      it 'calls remote rake task' do
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:cleanup PROGRESS_TTY\\=\\+ RAILS_ENV\\=production").and_return('')
         @cap.find_and_execute_task('dump:remote:cleanup')
       end
@@ -288,14 +287,14 @@ describe 'cap dump' do
         :leave => 'rake -s dump:cleanup LEAVE\\=some\\ data PROGRESS_TTY\\=\\+ RAILS_ENV\\=production',
       })
 
-      it 'should print result of rake task' do
+      it 'prints result of rake task' do
         allow(@cap.dump).to receive(:run_remote).and_return("123123.tgz\n")
         expect(grab_output do
           @cap.find_and_execute_task('dump:remote:cleanup')
         end[:stdout]).to eq("123123.tgz\n")
       end
 
-      it 'should use custom rake binary' do
+      it 'uses custom rake binary' do
         expect(@cap.dump).to receive(:fetch_rake).and_return('/custom/rake')
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:cleanup PROGRESS_TTY\\=\\+ RAILS_ENV\\=production").and_return('')
         @cap.find_and_execute_task('dump:remote:cleanup')
@@ -303,30 +302,30 @@ describe 'cap dump' do
     end
 
     describe 'create' do
-      it 'should raise if dump creation fails' do
+      it 'raises if dump creation fails' do
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:create PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=remote").and_return('')
         expect do
           @cap.find_and_execute_task('dump:remote:create')
         end.to raise_error('Failed creating dump')
       end
 
-      it 'should call remote rake task with default rails_env and tag remote' do
+      it 'calls remote rake task with default rails_env and tag remote' do
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:create PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=remote").and_return('123.tgz')
         grab_output do
           @cap.find_and_execute_task('dump:remote:create')
         end
       end
 
-      it 'should call remote rake task with default rails_env and additional tag remote' do
+      it 'calls remote rake task with default rails_env and additional tag remote' do
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:create PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=remote,photos").and_return('123.tgz')
         grab_output do
-          DumpRake::Env.with_env :tags => 'photos' do
+          Dump::Env.with_env :tags => 'photos' do
             @cap.find_and_execute_task('dump:remote:create')
           end
         end
       end
 
-      it 'should call remote rake task with fetched rails_env and default DESC remote' do
+      it 'calls remote rake task with fetched rails_env and default DESC remote' do
         expect(@cap.dump).to receive(:fetch_rails_env).and_return('dev')
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:create PROGRESS_TTY\\=\\+ RAILS_ENV\\=dev TAGS\\=remote").and_return('123.tgz')
         grab_output do
@@ -341,21 +340,21 @@ describe 'cap dump' do
         :tables => 'rake -s dump:create PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TABLES\\=some\\ data TAGS\\=remote',
       }, :return_value => '123.tgz')
 
-      it 'should print result of rake task' do
+      it 'prints result of rake task' do
         allow(@cap.dump).to receive(:run_remote).and_return("123123.tgz\n")
         expect(grab_output do
           @cap.find_and_execute_task('dump:remote:create')
         end[:stdout]).to eq("123123.tgz\n")
       end
 
-      it 'should return stripped result of rake task' do
+      it 'returns stripped result of rake task' do
         allow(@cap.dump).to receive(:run_remote).and_return("123123.tgz\n")
         grab_output do
           expect(@cap.find_and_execute_task('dump:remote:create')).to eq('123123.tgz')
         end
       end
 
-      it 'should use custom rake binary' do
+      it 'uses custom rake binary' do
         expect(@cap.dump).to receive(:fetch_rake).and_return('/custom/rake')
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:create PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=remote").and_return('123.tgz')
         grab_output do
@@ -365,12 +364,12 @@ describe 'cap dump' do
     end
 
     describe 'restore' do
-      it 'should call remote rake task with default rails_env' do
+      it 'calls remote rake task with default rails_env' do
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:restore PROGRESS_TTY\\=\\+ RAILS_ENV\\=production")
         @cap.find_and_execute_task('dump:remote:restore')
       end
 
-      it 'should call remote rake task with fetched rails_env' do
+      it 'calls remote rake task with fetched rails_env' do
         expect(@cap.dump).to receive(:fetch_rails_env).and_return('dev')
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:restore PROGRESS_TTY\\=\\+ RAILS_ENV\\=dev")
         @cap.find_and_execute_task('dump:remote:restore')
@@ -385,7 +384,7 @@ describe 'cap dump' do
         :restore_assets => 'rake -s dump:restore PROGRESS_TTY\\=\\+ RAILS_ENV\\=production RESTORE_ASSETS\\=some\\ data',
       })
 
-      it 'should use custom rake binary' do
+      it 'uses custom rake binary' do
         expect(@cap.dump).to receive(:fetch_rake).and_return('/custom/rake')
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:restore PROGRESS_TTY\\=\\+ RAILS_ENV\\=production")
         @cap.find_and_execute_task('dump:remote:restore')
@@ -393,15 +392,15 @@ describe 'cap dump' do
     end
 
     describe 'download' do
-      it 'should run rake versions to get avaliable versions' do
+      it 'runs rake versions to get avaliable versions' do
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production").and_return('')
         @cap.find_and_execute_task('dump:remote:download')
       end
 
-      it 'should block sending summary to versions' do
+      it 'blocks sending summary to versions' do
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production").and_return('')
-        DumpRake::Env::DICTIONARY[:summary].each do |name|
-          DumpRake::Env.with_env name => 'true' do
+        Dump::Env::DICTIONARY[:summary].each do |name|
+          Dump::Env.with_env name => 'true' do
             @cap.find_and_execute_task('dump:remote:download')
           end
         end
@@ -414,34 +413,34 @@ describe 'cap dump' do
         :transfer_via => 'rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production', # tranfer_via is used internally
       }, :cap_task => 'dump:remote:download')
 
-      it 'should not download anything if there are no versions avaliable' do
+      it 'does not download anything if there are no versions avaliable' do
         allow(@cap.dump).to receive(:run_remote).and_return('')
         expect(@cap.dump).not_to receive(:do_transfer)
         @cap.find_and_execute_task('dump:remote:download')
       end
 
-      it 'should transfer latest version dump' do
+      it 'transfers latest version dump' do
         allow(@cap.dump).to receive(:run_remote).and_return("100.tgz\n200.tgz\n300.tgz\n")
         expect(@cap.dump).to receive(:do_transfer).with(:down, "#{@remote_path}/dump/300.tgz", 'dump/300.tgz')
         allow(FileUtils).to receive(:mkpath)
         @cap.find_and_execute_task('dump:remote:download')
       end
 
-      it 'should handle extra spaces around file names' do
+      it 'handles extra spaces around file names' do
         allow(@cap.dump).to receive(:run_remote).and_return("\r\n\r\n\r  100.tgz   \r\n\r\n\r  200.tgz   \r\n\r\n\r  300.tgz   \r\n\r\n\r  ")
         expect(@cap.dump).to receive(:do_transfer).with(:down, "#{@remote_path}/dump/300.tgz", 'dump/300.tgz')
         allow(FileUtils).to receive(:mkpath)
         @cap.find_and_execute_task('dump:remote:download')
       end
 
-      it 'should create local dump dir' do
+      it 'creates local dump dir' do
         allow(@cap.dump).to receive(:run_remote).and_return("100.tgz\n200.tgz\n300.tgz\n")
         allow(@cap.dump).to receive(:do_transfer)
         expect(FileUtils).to receive(:mkpath).with('dump')
         @cap.find_and_execute_task('dump:remote:download')
       end
 
-      it 'should run rake versions use custom rake binary' do
+      it 'runs rake versions use custom rake binary' do
         expect(@cap.dump).to receive(:fetch_rake).and_return('/custom/rake')
         expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production").and_return('')
         @cap.find_and_execute_task('dump:remote:download')
@@ -450,14 +449,14 @@ describe 'cap dump' do
   end
 
   describe 'upload' do
-    it 'should call local:upload' do
+    it 'calls local:upload' do
       expect(@cap.dump.local).to receive(:upload).and_return('')
       @cap.find_and_execute_task('dump:upload')
     end
   end
 
   describe 'download' do
-    it 'should call remote:download' do
+    it 'calls remote:download' do
       expect(@cap.dump.remote).to receive(:download).and_return('')
       @cap.find_and_execute_task('dump:download')
     end
@@ -468,39 +467,39 @@ describe 'cap dump' do
       src = way[0]
       dst = way[1]
       describe name do
-        it 'should create auto-backup with tag auto-backup' do
-          expect(@cap.dump.namespaces[dst]).to receive(:create){ expect(DumpRake::Env[:tags]).to eq('auto-backup'); '' }
+        it 'creates auto-backup with tag auto-backup' do
+          expect(@cap.dump.namespaces[dst]).to receive(:create){ expect(Dump::Env[:tags]).to eq('auto-backup'); '' }
           @cap.find_and_execute_task("dump:mirror:#{dir}")
         end
 
-        it 'should create auto-backup with additional tag auto-backup' do
-          expect(@cap.dump.namespaces[dst]).to receive(:create){ expect(DumpRake::Env[:tags]).to eq('auto-backup,photos'); '' }
-          DumpRake::Env.with_env :tags => 'photos' do
+        it 'creates auto-backup with additional tag auto-backup' do
+          expect(@cap.dump.namespaces[dst]).to receive(:create){ expect(Dump::Env[:tags]).to eq('auto-backup,photos'); '' }
+          Dump::Env.with_env :tags => 'photos' do
             @cap.find_and_execute_task("dump:mirror:#{dir}")
           end
         end
 
-        it 'should not call local:create if auto-backup fails' do
+        it 'does not call local:create if auto-backup fails' do
           allow(@cap.dump.namespaces[dst]).to receive(:create).and_return('')
           expect(@cap.dump.namespaces[src]).not_to receive(:create)
           @cap.find_and_execute_task("dump:mirror:#{dir}")
         end
 
-        it "should call local:create if auto-backup succeedes with tags mirror and mirror-#{dir}" do
+        it "calls local:create if auto-backup succeedes with tags mirror and mirror-#{dir}" do
           allow(@cap.dump.namespaces[dst]).to receive(:create).and_return('123.tgz')
-          expect(@cap.dump.namespaces[src]).to receive(:create){ expect(DumpRake::Env[:tags]).to eq('mirror'); '' }
+          expect(@cap.dump.namespaces[src]).to receive(:create){ expect(Dump::Env[:tags]).to eq('mirror'); '' }
           @cap.find_and_execute_task("dump:mirror:#{dir}")
         end
 
-        it "should call local:create if auto-backup succeedes with additional tags mirror and mirror-#{dir}" do
+        it "calls local:create if auto-backup succeedes with additional tags mirror and mirror-#{dir}" do
           allow(@cap.dump.namespaces[dst]).to receive(:create).and_return('123.tgz')
-          expect(@cap.dump.namespaces[src]).to receive(:create){ expect(DumpRake::Env[:tags]).to eq('mirror,photos'); '' }
-          DumpRake::Env.with_env :tags => 'photos' do
+          expect(@cap.dump.namespaces[src]).to receive(:create){ expect(Dump::Env[:tags]).to eq('mirror,photos'); '' }
+          Dump::Env.with_env :tags => 'photos' do
             @cap.find_and_execute_task("dump:mirror:#{dir}")
           end
         end
 
-        it 'should not call local:upload or remote:restore if local:create fails' do
+        it 'does not call local:upload or remote:restore if local:create fails' do
           allow(@cap.dump.namespaces[dst]).to receive(:create).and_return('123.tgz')
           allow(@cap.dump.namespaces[src]).to receive(:create).and_return('')
           expect(@cap.dump.namespaces[src]).not_to receive(:upload)
@@ -508,17 +507,17 @@ describe 'cap dump' do
           @cap.find_and_execute_task("dump:mirror:#{dir}")
         end
 
-        it 'should call local:upload and remote:restore with only varibale ver set to file name if local:create returns file name' do
+        it 'calls local:upload and remote:restore with only varibale ver set to file name if local:create returns file name' do
           allow(@cap.dump.namespaces[dst]).to receive(:create).and_return('123.tgz')
           allow(@cap.dump.namespaces[src]).to receive(:create).and_return('123.tgz')
           test_env = proc do
-            expect(DumpRake::Env[:like]).to eq('123.tgz')
-            expect(DumpRake::Env[:tags]).to eq(nil)
-            expect(DumpRake::Env[:desc]).to eq(nil)
+            expect(Dump::Env[:like]).to eq('123.tgz')
+            expect(Dump::Env[:tags]).to eq(nil)
+            expect(Dump::Env[:desc]).to eq(nil)
           end
           expect(@cap.dump.namespaces[src]).to receive(:"#{dir}load").ordered(&test_env)
           expect(@cap.dump.namespaces[dst]).to receive(:restore).ordered(&test_env)
-          DumpRake::Env.with_env all_dictionary_variables do
+          Dump::Env.with_env all_dictionary_variables do
             @cap.find_and_execute_task("dump:mirror:#{dir}")
           end
         end
@@ -527,60 +526,60 @@ describe 'cap dump' do
   end
 
   describe 'backup' do
-    it 'should call remote:create' do
+    it 'calls remote:create' do
       expect(@cap.dump.remote).to receive(:create).and_return('')
       @cap.find_and_execute_task('dump:backup')
     end
 
-    it 'should not call remote:download if remote:create returns blank' do
+    it 'does not call remote:download if remote:create returns blank' do
       allow(@cap.dump.remote).to receive(:create).and_return('')
       expect(@cap.dump.remote).not_to receive(:download)
       @cap.find_and_execute_task('dump:backup')
     end
 
-    it 'should call remote:download if remote:create returns file name' do
+    it 'calls remote:download if remote:create returns file name' do
       allow(@cap.dump.remote).to receive(:create).and_return('123.tgz')
       expect(@cap.dump.remote).to receive(:download).ordered
       @cap.find_and_execute_task('dump:backup')
     end
 
-    it 'should call remote:create with tag backup' do
+    it 'calls remote:create with tag backup' do
       expect(@cap.dump.remote).to receive(:create) do
-        expect(DumpRake::Env[:tags]).to eq('backup')
+        expect(Dump::Env[:tags]).to eq('backup')
         ''
       end
       @cap.find_and_execute_task('dump:backup')
     end
 
-    it 'should call remote:create with additional tag backup' do
+    it 'calls remote:create with additional tag backup' do
       expect(@cap.dump.remote).to receive(:create) do
-        expect(DumpRake::Env[:tags]).to eq('backup,photos')
+        expect(Dump::Env[:tags]).to eq('backup,photos')
         ''
       end
-      DumpRake::Env.with_env :tags => 'photos' do
+      Dump::Env.with_env :tags => 'photos' do
         @cap.find_and_execute_task('dump:backup')
       end
     end
 
-    it 'should pass description if it is set' do
+    it 'passes description if it is set' do
       expect(@cap.dump.remote).to receive(:create) do
-        expect(DumpRake::Env[:desc]).to eq('remote dump')
+        expect(Dump::Env[:desc]).to eq('remote dump')
         ''
       end
-      DumpRake::Env.with_env :desc => 'remote dump' do
+      Dump::Env.with_env :desc => 'remote dump' do
         @cap.find_and_execute_task('dump:backup')
       end
     end
 
-    it 'should send only ver variable' do
+    it 'sends only ver variable' do
       allow(@cap.dump.remote).to receive(:create).and_return('123.tgz')
       expect(@cap.dump.remote).to receive(:download) do
-        expect(DumpRake::Env[:like]).to eq('123.tgz')
-        expect(DumpRake::Env[:tags]).to eq(nil)
-        expect(DumpRake::Env[:desc]).to eq(nil)
+        expect(Dump::Env[:like]).to eq('123.tgz')
+        expect(Dump::Env[:tags]).to eq(nil)
+        expect(Dump::Env[:desc]).to eq(nil)
         ''
       end
-      DumpRake::Env.with_env all_dictionary_variables do
+      Dump::Env.with_env all_dictionary_variables do
         @cap.find_and_execute_task('dump:backup')
       end
     end