dump 1.2.2 → 1.3.0

data/spec/dump/snapshot_spec.rb

@@ -30,9 +30,7 @@ describe Dump::Snapshot do
 
       @file = double('file')
       expect(@file).to receive(:flock).with(File::LOCK_EX | File::LOCK_NB).and_return(nil)
-      expect(@file).to receive(:flock).with(File::LOCK_UN)
-      expect(@file).to receive(:close)
-      expect(File).to receive(:open).and_return(@file)
+      expect(File).to receive(:open).and_yield(@file)
 
       described_class.new('hello').lock do
         @yield_receiver.fire
@@ -44,9 +42,7 @@ describe Dump::Snapshot do
 
       @file = double('file')
       expect(@file).to receive(:flock).with(File::LOCK_EX | File::LOCK_NB).and_return(true)
-      expect(@file).to receive(:flock).with(File::LOCK_UN)
-      expect(@file).to receive(:close)
-      expect(File).to receive(:open).and_return(@file)
+      expect(File).to receive(:open).and_yield(@file)
 
       described_class.new('hello').lock do
         @yield_receiver.fire
@@ -125,7 +121,7 @@ describe Dump::Snapshot do
         #             0        1 2   3     4     5       6   7   8     9 10  11  12    131415  16
         dumps_tags = [''] + %w[a a,d a,d,o a,d,s a,d,s,o a,o a,s a,s,o d d,o d,s d,s,o o s s,o z]
         paths = dumps_tags.each_with_index.map do |dump_tags, i|
-          path = dump_path("196504140659#{10 + i}@#{dump_tags}.tgz")
+          path = dump_path("196504140659#{i + 10}@#{dump_tags}.tgz")
           expect(File).to receive(:file?).with(path).at_least(1).and_return(true)
           path
         end
@@ -264,18 +260,18 @@ describe Dump::Snapshot do
 
   describe 'get_filter_tags' do
     it 'splits string and returns uniq non blank sorted tags' do
-      expect(described_class.new('').send(:get_filter_tags, 'a,+b,+c,-d')).to eq(:simple => %w[a], :mandatory => %w[b c], :forbidden => %w[d])
-      expect(described_class.new('').send(:get_filter_tags, ' a , + b , + c , - d ')).to eq(:simple => %w[a], :mandatory => %w[b c], :forbidden => %w[d])
-      expect(described_class.new('').send(:get_filter_tags, ' a , + c , + b , - d ')).to eq(:simple => %w[a], :mandatory => %w[b c], :forbidden => %w[d])
-      expect(described_class.new('').send(:get_filter_tags, ' a , + b , + , - ')).to eq(:simple => %w[a], :mandatory => %w[b], :forbidden => [])
-      expect(described_class.new('').send(:get_filter_tags, ' a , a , + b , + b , - d , - d ')).to eq(:simple => %w[a], :mandatory => %w[b], :forbidden => %w[d])
+      expect(described_class.new('').send(:get_filter_tags, 'a,+b,+c,-d')).to eq(:any => %w[a].to_set, :all => %w[b c].to_set, :none => %w[d].to_set)
+      expect(described_class.new('').send(:get_filter_tags, ' a , + b , + c , - d ')).to eq(:any => %w[a].to_set, :all => %w[b c].to_set, :none => %w[d].to_set)
+      expect(described_class.new('').send(:get_filter_tags, ' a , + c , + b , - d ')).to eq(:any => %w[a].to_set, :all => %w[b c].to_set, :none => %w[d].to_set)
+      expect(described_class.new('').send(:get_filter_tags, ' a , + b , + , - ')).to eq(:any => %w[a].to_set, :all => %w[b].to_set, :none => [].to_set)
+      expect(described_class.new('').send(:get_filter_tags, ' a , a , + b , + b , - d , - d ')).to eq(:any => %w[a].to_set, :all => %w[b].to_set, :none => %w[d].to_set)
       expect{ described_class.new('').send(:get_filter_tags, 'a,+a') }.not_to raise_error
       expect{ described_class.new('').send(:get_filter_tags, 'a,-a') }.to raise_error ArgumentError, /clashes/
       expect{ described_class.new('').send(:get_filter_tags, '+a,-a') }.to raise_error ArgumentError, /clashes/
     end
 
     it 'accepts non string' do
-      expect(described_class.new('').send(:get_filter_tags, nil)).to eq(:simple => [], :mandatory => [], :forbidden => [])
+      expect(described_class.new('').send(:get_filter_tags, nil)).to eq(:any => Set.new, :all => Set.new, :none => Set.new)
     end
   end
 

data/spec/dump/table_manipulation_spec.rb

@@ -141,8 +141,8 @@ describe Dump::TableManipulation do
   describe 'table_chunk_size' do
     it 'returns chunk_size based on estimated average for row size' do
       expect(self).to receive(:table_columns).with('first').and_return(
-        [double(:column, :type => :integer, :limit => nil)] * 3 +
-        [double(:column, :type => :string, :limit => nil)] * 3 +
+        ([double(:column, :type => :integer, :limit => nil)] * 3) +
+        ([double(:column, :type => :string, :limit => nil)] * 3) +
         [double(:column, :type => :text, :limit => nil)]
       )
       expect(table_chunk_size('first')).to satisfy{ |n|
@@ -228,7 +228,7 @@ describe Dump::TableManipulation do
 
         expect(self).to receive(:select_all_by_sql).with(sql % '>= 0').and_return(@rows[0, 100])
         5.times do |i|
-          last_primary_key = 100 + i * 100
+          last_primary_key = (i * 100) + 100
           expect(self).to receive(:select_all_by_sql).with(sql % "> #{last_primary_key}").and_return(@rows[last_primary_key, 100])
         end
 

data/spec/dump/writer_spec.rb

@@ -30,16 +30,19 @@ describe Writer do
 
   describe 'open' do
     it 'creates dir for dump' do
-      allow(Zlib::GzipWriter).to receive(:open)
-      expect(FileUtils).to receive(:mkpath).with('/abc/def/ghi')
+      @gzip = double('gzip', :mtime= => nil)
+      allow(Zlib::GzipWriter).to receive(:open).and_return(@gzip)
+      allow(Dir).to receive(:mkdir).with('/abc')
+      allow(Dir).to receive(:mkdir).with('/abc/def')
+      allow(Dir).to receive(:mkdir).with('/abc/def/ghi')
       described_class.new('/abc/def/ghi/123.tgz').open
     end
 
     it 'sets stream to gzipped tar writer' do
-      allow(FileUtils).to receive(:mkpath)
+      allow(Dir).to receive(:mkdir)
       @gzip = double('gzip')
       @stream = double('stream')
-      expect(Zlib::GzipWriter).to receive(:open).with(Pathname('123.tgz')).and_yield(@gzip)
+      expect(Zlib::GzipWriter).to receive(:open).with(Pathname('123.tgz')).and_return(@gzip)
       expect(Archive::Tar::Minitar::Output).to receive(:open).with(@gzip).and_yield(@stream)
       expect(@gzip).to receive(:mtime=).with(Time.utc(2000))
 

data/spec/dump_spec.rb

@@ -11,7 +11,7 @@ describe Dump do
     end
 
     it 'calls Snapshot.list with options if called with version' do
-      expect(Dump::Snapshot).to receive(:list).with(:like => '123').and_return([])
+      expect(Dump::Snapshot).to receive(:list).with({:like => '123'}).and_return([])
       described_class.versions(:like => '123')
     end
 
@@ -205,7 +205,7 @@ describe Dump do
     describe 'with version' do
       it 'calls Snapshot.list with options' do
         allow(Dump::Snapshot).to receive(:list)
-        expect(Dump::Snapshot).to receive(:list).with(:like => '213').and_return([])
+        expect(Dump::Snapshot).to receive(:list).with({:like => '213'}).and_return([])
         grab_output do
           described_class.restore(:like => '213')
         end
@@ -249,14 +249,14 @@ describe Dump do
 
   describe 'cleanup' do
     it 'calls ask for all files in dump dir and for dumps' do
-      expect(Dump::Snapshot).to receive(:list).with(:all => true).and_return([])
+      expect(Dump::Snapshot).to receive(:list).with({:all => true}).and_return([])
       expect(Dump::Snapshot).to receive(:list).with({}).and_return([])
       described_class.cleanup
     end
 
     it 'calls Snapshot.list with options if called with version and tags' do
-      expect(Dump::Snapshot).to receive(:list).with(:like => '123', :tags => 'a,b,c', :all => true).and_return([])
-      expect(Dump::Snapshot).to receive(:list).with(:like => '123', :tags => 'a,b,c').and_return([])
+      expect(Dump::Snapshot).to receive(:list).with({:like => '123', :tags => 'a,b,c', :all => true}).and_return([])
+      expect(Dump::Snapshot).to receive(:list).with({:like => '123', :tags => 'a,b,c'}).and_return([])
       described_class.cleanup(:like => '123', :tags => 'a,b,c')
     end
 

data/spec/recipes/dump_spec.rb

@@ -5,6 +5,8 @@ require 'dump'
 require 'capistrano'
 
 describe 'cap dump' do
+  plus = '+'.shellescape
+
   before do
     @cap = Capistrano::Configuration.new
     Capistrano::Configuration.instance = @cap
@@ -253,14 +255,14 @@ describe 'cap dump' do
 
     describe 'versions' 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('')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production SHOW_SIZE\\=true").and_return('')
         @cap.find_and_execute_task('dump:remote:versions')
       end
 
       test_passing_environment_variables(:remote, :versions, {
-        :like => 'rake -s dump:versions LIKE\\=some\\ data PROGRESS_TTY\\=\\+ RAILS_ENV\\=production SHOW_SIZE\\=true',
-        :tags => 'rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production SHOW_SIZE\\=true TAGS\\=some\\ data',
-        :summary => 'rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production SHOW_SIZE\\=true SUMMARY\\=some\\ data',
+        :like => "rake -s dump:versions LIKE\\=some\\ data PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production SHOW_SIZE\\=true",
+        :tags => "rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production SHOW_SIZE\\=true TAGS\\=some\\ data",
+        :summary => "rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production SHOW_SIZE\\=true SUMMARY\\=some\\ data",
       })
 
       it 'prints result of rake task' do
@@ -272,21 +274,21 @@ describe 'cap dump' 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('')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production SHOW_SIZE\\=true").and_return('')
         @cap.find_and_execute_task('dump:remote:versions')
       end
     end
 
     describe 'cleanup' 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('')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:cleanup PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production").and_return('')
         @cap.find_and_execute_task('dump:remote:cleanup')
       end
 
       test_passing_environment_variables(:remote, :cleanup, {
-        :like => 'rake -s dump:cleanup LIKE\\=some\\ data PROGRESS_TTY\\=\\+ RAILS_ENV\\=production',
-        :tags => 'rake -s dump:cleanup PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=some\\ data',
-        :leave => 'rake -s dump:cleanup LEAVE\\=some\\ data PROGRESS_TTY\\=\\+ RAILS_ENV\\=production',
+        :like => "rake -s dump:cleanup LIKE\\=some\\ data PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production",
+        :tags => "rake -s dump:cleanup PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TAGS\\=some\\ data",
+        :leave => "rake -s dump:cleanup LEAVE\\=some\\ data PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production",
       })
 
       it 'prints result of rake task' do
@@ -298,28 +300,28 @@ describe 'cap dump' 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('')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:cleanup PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production").and_return('')
         @cap.find_and_execute_task('dump:remote:cleanup')
       end
     end
 
     describe 'create' 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(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:create PROGRESS_TTY\\=#{plus} 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 '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')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:create PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TAGS\\=remote").and_return('123.tgz')
         grab_output do
           @cap.find_and_execute_task('dump:remote:create')
         end
       end
 
       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')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:create PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TAGS\\=remote,photos").and_return('123.tgz')
         grab_output do
           Dump::Env.with_env :tags => 'photos' do
             @cap.find_and_execute_task('dump:remote:create')
@@ -329,17 +331,17 @@ describe 'cap dump' 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')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:create PROGRESS_TTY\\=#{plus} RAILS_ENV\\=dev TAGS\\=remote").and_return('123.tgz')
         grab_output do
           @cap.find_and_execute_task('dump:remote:create')
         end
       end
 
       test_passing_environment_variables(:remote, :create, {
-        :desc => 'rake -s dump:create DESC\\=some\\ data PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=remote',
-        :tags => 'rake -s dump:create PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=remote,some\\ data',
-        :assets => 'rake -s dump:create ASSETS\\=some\\ data PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=remote',
-        :tables => 'rake -s dump:create PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TABLES\\=some\\ data TAGS\\=remote',
+        :desc => "rake -s dump:create DESC\\=some\\ data PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TAGS\\=remote",
+        :tags => "rake -s dump:create PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TAGS\\=remote,some\\ data",
+        :assets => "rake -s dump:create ASSETS\\=some\\ data PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TAGS\\=remote",
+        :tables => "rake -s dump:create PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TABLES\\=some\\ data TAGS\\=remote",
       }, :return_value => '123.tgz')
 
       it 'prints result of rake task' do
@@ -358,7 +360,7 @@ describe 'cap dump' 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')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:create PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TAGS\\=remote").and_return('123.tgz')
         grab_output do
           @cap.find_and_execute_task('dump:remote:create')
         end
@@ -367,40 +369,40 @@ describe 'cap dump' do
 
     describe 'restore' 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")
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:restore PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production")
         @cap.find_and_execute_task('dump:remote:restore')
       end
 
       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")
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:restore PROGRESS_TTY\\=#{plus} RAILS_ENV\\=dev")
         @cap.find_and_execute_task('dump:remote:restore')
       end
 
       test_passing_environment_variables(:remote, :restore, {
-        :like => 'rake -s dump:restore LIKE\\=some\\ data PROGRESS_TTY\\=\\+ RAILS_ENV\\=production',
-        :tags => 'rake -s dump:restore PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=some\\ data',
-        :migrate_down => 'rake -s dump:restore MIGRATE_DOWN\\=some\\ data PROGRESS_TTY\\=\\+ RAILS_ENV\\=production',
-        :restore_schema => 'rake -s dump:restore PROGRESS_TTY\\=\\+ RAILS_ENV\\=production RESTORE_SCHEMA\\=some\\ data',
-        :restore_tables => 'rake -s dump:restore PROGRESS_TTY\\=\\+ RAILS_ENV\\=production RESTORE_TABLES\\=some\\ data',
-        :restore_assets => 'rake -s dump:restore PROGRESS_TTY\\=\\+ RAILS_ENV\\=production RESTORE_ASSETS\\=some\\ data',
+        :like => "rake -s dump:restore LIKE\\=some\\ data PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production",
+        :tags => "rake -s dump:restore PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TAGS\\=some\\ data",
+        :migrate_down => "rake -s dump:restore MIGRATE_DOWN\\=some\\ data PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production",
+        :restore_schema => "rake -s dump:restore PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production RESTORE_SCHEMA\\=some\\ data",
+        :restore_tables => "rake -s dump:restore PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production RESTORE_TABLES\\=some\\ data",
+        :restore_assets => "rake -s dump:restore PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production RESTORE_ASSETS\\=some\\ data",
       })
 
       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")
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:restore PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production")
         @cap.find_and_execute_task('dump:remote:restore')
       end
     end
 
     describe 'download' 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('')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production").and_return('')
         @cap.find_and_execute_task('dump:remote:download')
       end
 
       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('')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production").and_return('')
         Dump::Env::DICTIONARY[:summary].each do |name|
           Dump::Env.with_env name => 'true' do
             @cap.find_and_execute_task('dump:remote:download')
@@ -409,10 +411,10 @@ describe 'cap dump' do
       end
 
       test_passing_environment_variables(:remote, :transfer, {
-        :like => 'rake -s dump:versions LIKE\\=some\\ data PROGRESS_TTY\\=\\+ RAILS_ENV\\=production',
-        :tags => 'rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production TAGS\\=some\\ data',
-        :summary => 'rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production', # block sending summary to versions
-        :transfer_via => 'rake -s dump:versions PROGRESS_TTY\\=\\+ RAILS_ENV\\=production', # tranfer_via is used internally
+        :like => "rake -s dump:versions LIKE\\=some\\ data PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production",
+        :tags => "rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production TAGS\\=some\\ data",
+        :summary => "rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production", # block sending summary to versions
+        :transfer_via => "rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production", # tranfer_via is used internally
       }, :cap_task => 'dump:remote:download')
 
       it 'does not download anything if there are no versions avaliable' do
@@ -424,27 +426,27 @@ describe 'cap 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)
+        allow(Dir).to receive(:mkdir)
         @cap.find_and_execute_task('dump:remote:download')
       end
 
       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)
+        allow(Dir).to receive(:mkdir)
         @cap.find_and_execute_task('dump:remote:download')
       end
 
       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')
+        allow(Dir).to receive(:mkdir).with('dump')
         @cap.find_and_execute_task('dump:remote:download')
       end
 
       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('')
+        expect(@cap.dump).to receive(:run_remote).with("cd #{@remote_path}; /custom/rake -s dump:versions PROGRESS_TTY\\=#{plus} RAILS_ENV\\=production").and_return('')
         @cap.find_and_execute_task('dump:remote:download')
       end
     end

data/spec/tasks/assets_spec.rb

@@ -19,7 +19,7 @@ describe 'rake assets' do
     end_src
     expect(File).to receive(:readlines).with(File.join(Dump.rails_root, 'config/assets')).and_return(StringIO.new(data).readlines)
     @rake['assets'].invoke
-    expect(ENV['ASSETS']).to eq('public/images/a:public/images/b')
+    expect(ENV.fetch('ASSETS', nil)).to eq('public/images/a:public/images/b')
   end
 
   it 'ignores comments in config/assets' do
@@ -31,7 +31,7 @@ describe 'rake assets' do
     end_src
     allow(File).to receive(:readlines).and_return(StringIO.new(data).readlines)
     @rake['assets'].invoke
-    expect(ENV['ASSETS']).to eq('public/images/a:public/images/b')
+    expect(ENV.fetch('ASSETS', nil)).to eq('public/images/a:public/images/b')
   end
 
   it "does not change ENV['ASSETS'] if it already exists" do
@@ -42,7 +42,7 @@ describe 'rake assets' do
     allow(File).to receive(:readlines).and_return(StringIO.new(data).readlines)
     Dump::Env.with_env :assets => 'public/images' do
       @rake['assets'].invoke
-      expect(ENV['ASSETS']).to eq('public/images')
+      expect(ENV.fetch('ASSETS', nil)).to eq('public/images')
     end
   end