dump 1.0.2 → 1.0.3

data/spec/lib/dump_rake_spec.rb

@@ -21,7 +21,7 @@ describe DumpRake do
 
     it "should not show summary if not asked for" do
       dumps = %w[123.tgz 456.tgz].map do |s|
-        dump = mock("dump_#{s}", :path => mock("dump_#{s}_path"))
+        dump = double("dump_#{s}", :path => double("dump_#{s}_path"))
         DumpRake::DumpReader.should_not_receive(:summary)
         dump
       end
@@ -35,7 +35,7 @@ describe DumpRake do
 
     it "should show summary if asked for" do
       dumps = %w[123.tgz 456.tgz].map do |s|
-        dump = mock("dump_#{s}", :path => mock("dump_#{s}_path"))
+        dump = double("dump_#{s}", :path => double("dump_#{s}_path"))
         DumpRake::DumpReader.should_receive(:summary).with(dump.path)
         dump
       end
@@ -49,7 +49,7 @@ describe DumpRake do
 
     it "should show summary with scmema if asked for" do
       dumps = %w[123.tgz 456.tgz].map do |s|
-        dump = mock("dump_#{s}", :path => mock("dump_#{s}_path"))
+        dump = double("dump_#{s}", :path => double("dump_#{s}_path"))
         DumpRake::DumpReader.should_receive(:summary).with(dump.path, :schema => true)
         dump
       end
@@ -62,15 +62,15 @@ describe DumpRake do
     end
 
     it "should show output to stderr if summary raises error" do
-      DumpRake::DumpReader.stub!(:summary)
+      DumpRake::DumpReader.stub(:summary)
       dumps = %w[123.tgz 456.tgz].map do |s|
-        mock("dump_#{s}", :path => mock("dump_#{s}_path"))
+        double("dump_#{s}", :path => double("dump_#{s}_path"))
       end
       DumpRake::DumpReader.should_receive(:summary).with(dumps[1].path).and_raise('terrible error')
 
       DumpRake::Dump.should_receive(:list).and_return(dumps)
       grab_output{
-        $stderr.stub!(:puts)
+        $stderr.stub(:puts)
         $stderr.should_receive(:puts) do |s|
           s['terrible error'].should_not be_nil
         end
@@ -82,7 +82,7 @@ describe DumpRake do
   describe "create" do
     describe "naming" do
       it "should create file in 'rails app root'/dump" do
-        File.stub!(:rename)
+        File.stub(:rename)
         DumpRake::DumpWriter.should_receive(:create) do |path|
           File.dirname(path).should == File.join(DumpRake::RailsRoot, 'dump')
         end
@@ -92,7 +92,7 @@ describe DumpRake do
       end
 
       it "should create file with name like 'yyyymmddhhmmss.tmp' when called without description" do
-        File.stub!(:rename)
+        File.stub(:rename)
         DumpRake::DumpWriter.should_receive(:create) do |path|
           File.basename(path).should match(/^\d{14}\.tmp$/)
         end
@@ -102,7 +102,7 @@ describe DumpRake do
       end
 
       it "should create file with name like 'yyyymmddhhmmss-Some text and _.tmp' when called with description 'Some text and !@'" do
-        File.stub!(:rename)
+        File.stub(:rename)
         DumpRake::DumpWriter.should_receive(:create) do |path|
           File.basename(path).should match(/^\d{14}-Some text and _\.tmp$/)
         end
@@ -112,7 +112,7 @@ describe DumpRake do
       end
 
       it "should create file with name like 'yyyymmddhhmmss@super tag,second.tmp' when called with description 'Some text and !@'" do
-        File.stub!(:rename)
+        File.stub(:rename)
         DumpRake::DumpWriter.should_receive(:create) do |path|
           File.basename(path).should match(/^\d{14}-Some text and _\.tmp$/)
         end
@@ -126,15 +126,15 @@ describe DumpRake do
           File.basename(tmp_path).should match(/^\d{14}-Some text and _\.tmp$/)
           File.basename(tgz_path).should match(/^\d{14}-Some text and _\.tgz$/)
         end
-        DumpRake::DumpWriter.stub!(:create)
+        DumpRake::DumpWriter.stub(:create)
         grab_output{
           DumpRake.create(:desc => 'Some text and !@')
         }
       end
 
       it "should output file name" do
-        File.stub!(:rename)
-        DumpRake::DumpWriter.stub!(:create)
+        File.stub(:rename)
+        DumpRake::DumpWriter.stub(:create)
         grab_output{
           DumpRake.create(:desc => 'Some text and !@')
         }[:stdout].should match(/^\d{14}-Some text and _\.tgz$/)
@@ -143,8 +143,8 @@ describe DumpRake do
 
     describe "writing" do
       it "should dump schema, tables, assets" do
-        File.stub!(:rename)
-        @dump = mock('dump')
+        File.stub(:rename)
+        @dump = double('dump')
         DumpRake::DumpWriter.should_receive(:create)
 
         grab_output{
@@ -157,7 +157,7 @@ describe DumpRake do
   describe "restore" do
     describe "without version" do
       it "should call Dump.list" do
-        DumpRake::Dump.stub!(:list)
+        DumpRake::Dump.stub(:list)
         DumpRake::Dump.should_receive(:list).and_return([])
         grab_output{
           DumpRake.restore
@@ -165,9 +165,9 @@ describe DumpRake do
       end
 
       it "should not call DumpReader.restore and should call Dump.list and output it to $stderr if there are no versions at all" do
-        DumpRake::Dump.stub!(:list).and_return([])
+        DumpRake::Dump.stub(:list).and_return([])
         DumpRake::DumpReader.should_not_receive(:restore)
-        all_dumps = mock('all_dumps')
+        all_dumps = double('all_dumps')
         DumpRake::Dump.should_receive(:list).with().and_return(all_dumps)
         grab_output{
           $stderr.should_receive(:puts).with(kind_of(String))
@@ -177,9 +177,9 @@ describe DumpRake do
       end
 
       it "should not call DumpReader.restore and should call Dump.list and output it to $stderr if there are no versions at all" do
-        DumpRake::Dump.stub!(:list).and_return([])
+        DumpRake::Dump.stub(:list).and_return([])
         DumpRake::DumpReader.should_not_receive(:restore)
-        all_dumps = mock('all_dumps')
+        all_dumps = double('all_dumps')
         DumpRake::Dump.should_receive(:list).with().and_return(all_dumps)
         grab_output{
           $stderr.should_receive(:puts).with(kind_of(String))
@@ -189,7 +189,7 @@ describe DumpRake do
       end
 
       it "should call DumpReader.restore if there are versions" do
-        @dump = mock('dump', :path => 'dump/213.tgz')
+        @dump = double('dump', :path => 'dump/213.tgz')
         DumpRake::Dump.should_receive(:list).once.and_return([@dump])
         DumpRake::DumpReader.should_receive(:restore).with('dump/213.tgz')
         grab_output{
@@ -201,7 +201,7 @@ describe DumpRake do
 
     describe "with version" do
       it "should call Dump.list with options" do
-        DumpRake::Dump.stub!(:list)
+        DumpRake::Dump.stub(:list)
         DumpRake::Dump.should_receive(:list).with(:like => '213').and_return([])
         grab_output{
           DumpRake.restore(:like => '213')
@@ -209,9 +209,9 @@ describe DumpRake do
       end
 
       it "should not call DumpReader.restore and should call versions if desired version not found" do
-        DumpRake::Dump.stub!(:list).and_return([])
+        DumpRake::Dump.stub(:list).and_return([])
         DumpRake::DumpReader.should_not_receive(:restore)
-        all_dumps = mock('all_dumps')
+        all_dumps = double('all_dumps')
         DumpRake::Dump.should_receive(:list).with().and_return(all_dumps)
         grab_output{
           $stderr.should_receive(:puts).with(kind_of(String))
@@ -221,7 +221,7 @@ describe DumpRake do
       end
 
       it "should call DumpReader.restore if there is desired version" do
-        @dump = mock('dump', :path => 'dump/213.tgz')
+        @dump = double('dump', :path => 'dump/213.tgz')
         DumpRake::Dump.should_receive(:list).once.and_return([@dump])
         DumpRake::DumpReader.should_receive(:restore).with('dump/213.tgz')
         DumpRake.should_not_receive(:versions)
@@ -232,8 +232,8 @@ describe DumpRake do
       end
 
       it "should call DumpReader.restore on last version if found multiple matching versions" do
-        @dump_a = mock('dump_a', :path => 'dump/213-a.tgz')
-        @dump_b = mock('dump_b', :path => 'dump/213-b.tgz')
+        @dump_a = double('dump_a', :path => 'dump/213-a.tgz')
+        @dump_b = double('dump_b', :path => 'dump/213-b.tgz')
         DumpRake::Dump.should_receive(:list).once.and_return([@dump_a, @dump_b])
         DumpRake::DumpReader.should_receive(:restore).with('dump/213-b.tgz')
         grab_output{
@@ -268,10 +268,10 @@ describe DumpRake do
     }.each do |options, ids|
       it "should call delete #{ids} dumps when called with #{options}" do
         dumps = %w[a b c d e f g h i j].map do |s|
-          mock("dump_#{s}", :ext => 'tgz', :path => mock("dump_#{s}_path"))
+          double("dump_#{s}", :ext => 'tgz', :path => double("dump_#{s}_path"))
         end
         tmp_dumps = %w[a b c].map do |s|
-          mock("tmp_dump_#{s}", :ext => 'tmp', :path => mock("tmp_dump_#{s}_path"))
+          double("tmp_dump_#{s}", :ext => 'tmp', :path => double("tmp_dump_#{s}_path"))
         end
         all_dumps = tmp_dumps[0, 1] + dumps[0, 5] + tmp_dumps[1, 1] + dumps[5, 5] + tmp_dumps[2, 1]
 
@@ -298,17 +298,17 @@ describe DumpRake do
 
     it "should print to stderr if can not delete dump" do
       dumps = %w[a b c d e f g h i j].map do |s|
-        dump = mock("dump_#{s}", :ext => 'tgz', :path => mock("dump_#{s}_path"))
-        dump.stub!(:lock).and_yield
-        dump.path.stub!(:unlink)
+        dump = double("dump_#{s}", :ext => 'tgz', :path => double("dump_#{s}_path"))
+        dump.stub(:lock).and_yield
+        dump.path.stub(:unlink)
         dump
       end
 
       dumps[3].path.should_receive(:unlink).and_raise('Horrible error')
 
-      DumpRake::Dump.stub!(:list).and_return(dumps)
+      DumpRake::Dump.stub(:list).and_return(dumps)
       grab_output{
-        $stderr.stub!(:puts)
+        $stderr.stub(:puts)
         $stderr.should_receive(:puts) do |s|
           s[dumps[3].path.to_s].should_not be_nil
           s['Horrible error'].should_not be_nil

data/spec/recipes/dump_spec.rb

@@ -47,7 +47,7 @@ describe "cap dump" do
 
   describe "do_transfer" do
     before do
-      @cap.dump.stub!(:do_transfer_via)
+      @cap.dump.stub(:do_transfer_via)
     end
 
     [:up, :down].each do |direction|
@@ -61,13 +61,13 @@ describe "cap dump" do
 
           describe "if got_rsync?" do
             it "should use rsync" do
-              @cap.dump.stub!(:got_rsync?).and_return(true)
+              @cap.dump.stub(:got_rsync?).and_return(true)
               @cap.dump.should_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
-              @cap.dump.stub!(:got_rsync?).and_return(true)
+              @cap.dump.stub(:got_rsync?).and_return(true)
               @cap.dump.should_receive(:do_transfer_via).with(:rsync, direction, 'a.tgz', 'b.tgz').and_raise('problem using rsync')
               proc{
                 grab_output{ @cap.dump.do_transfer(direction, 'a.tgz', 'b.tgz') }
@@ -77,20 +77,20 @@ describe "cap dump" do
 
           describe "unless got_rsync?" do
             it "should try sftp" do
-              @cap.dump.stub!(:got_rsync?).and_return(false)
+              @cap.dump.stub(:got_rsync?).and_return(false)
               @cap.dump.should_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
-              @cap.dump.stub!(:got_rsync?).and_return(false)
+              @cap.dump.stub(:got_rsync?).and_return(false)
               @cap.dump.should_receive(:do_transfer_via).with(:sftp, direction, 'a.tgz', 'b.tgz').and_raise('problem using sftp')
               @cap.dump.should_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
-              @cap.dump.stub!(:got_rsync?).and_return(false)
+              @cap.dump.stub(:got_rsync?).and_return(false)
               @cap.dump.should_receive(:do_transfer_via).with(:sftp, direction, 'a.tgz', 'b.tgz').and_raise('problem using sftp')
               @cap.dump.should_receive(:do_transfer_via).with(:scp, direction, 'a.tgz', 'b.tgz').and_raise('problem using scp')
               proc{
@@ -117,7 +117,7 @@ describe "cap dump" do
       })
 
       it "should print result of rake task" do
-        @cap.dump.stub!(:run_local).and_return(" 123M\t123123.tgz\n")
+        @cap.dump.stub(:run_local).and_return(" 123M\t123123.tgz\n")
         grab_output{
           @cap.find_and_execute_task("dump:local:versions")
         }[:stdout].should == " 123M\t123123.tgz\n"
@@ -137,7 +137,7 @@ describe "cap dump" do
       })
 
       it "should print result of rake task" do
-        @cap.dump.stub!(:run_local).and_return("123123.tgz\n")
+        @cap.dump.stub(:run_local).and_return("123123.tgz\n")
         grab_output{
           @cap.find_and_execute_task("dump:local:cleanup")
         }[:stdout].should == "123123.tgz\n"
@@ -176,14 +176,14 @@ describe "cap dump" do
       }, :return_value => '123.tgz')
 
       it "should print result of rake task" do
-        @cap.dump.stub!(:run_local).and_return("123123.tgz\n")
+        @cap.dump.stub(:run_local).and_return("123123.tgz\n")
         grab_output{
           @cap.find_and_execute_task("dump:local:create")
         }[:stdout].should == "123123.tgz\n"
       end
 
       it "should return stripped result of rake task" do
-        @cap.dump.stub!(:run_local).and_return("123123.tgz\n")
+        @cap.dump.stub(:run_local).and_return("123123.tgz\n")
         grab_output{
           @cap.find_and_execute_task("dump:local:create").should == "123123.tgz"
         }
@@ -220,19 +220,19 @@ describe "cap dump" do
       }, :cap_task => 'dump:local:upload')
 
       it "should not upload anything if there are no versions avaliable" do
-        @cap.dump.stub!(:run_local).and_return('')
+        @cap.dump.stub(:run_local).and_return('')
         @cap.dump.should_not_receive(:do_transfer)
         @cap.find_and_execute_task("dump:local:upload")
       end
 
       it "should transfer latest version dump" do
-        @cap.dump.stub!(:run_local).and_return("100.tgz\n200.tgz\n300.tgz\n")
+        @cap.dump.stub(:run_local).and_return("100.tgz\n200.tgz\n300.tgz\n")
         @cap.dump.should_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
-        @cap.dump.stub!(: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  ")
+        @cap.dump.stub(: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  ")
         @cap.dump.should_receive(:do_transfer).with(:up, "dump/300.tgz", "#{@remote_path}/dump/300.tgz")
         @cap.find_and_execute_task("dump:local:upload")
       end
@@ -253,7 +253,7 @@ describe "cap dump" do
       })
 
       it "should print result of rake task" do
-        @cap.dump.stub!(:run_remote).and_return(" 123M\t123123.tgz\n")
+        @cap.dump.stub(:run_remote).and_return(" 123M\t123123.tgz\n")
         grab_output{
           @cap.find_and_execute_task("dump:remote:versions")
         }[:stdout].should == " 123M\t123123.tgz\n"
@@ -279,7 +279,7 @@ describe "cap dump" do
       })
 
       it "should print result of rake task" do
-        @cap.dump.stub!(:run_remote).and_return("123123.tgz\n")
+        @cap.dump.stub(:run_remote).and_return("123123.tgz\n")
         grab_output{
           @cap.find_and_execute_task("dump:remote:cleanup")
         }[:stdout].should == "123123.tgz\n"
@@ -332,14 +332,14 @@ describe "cap dump" do
       }, :return_value => '123.tgz')
 
       it "should print result of rake task" do
-        @cap.dump.stub!(:run_remote).and_return("123123.tgz\n")
+        @cap.dump.stub(:run_remote).and_return("123123.tgz\n")
         grab_output{
           @cap.find_and_execute_task("dump:remote:create")
         }[:stdout].should == "123123.tgz\n"
       end
 
       it "should return stripped result of rake task" do
-        @cap.dump.stub!(:run_remote).and_return("123123.tgz\n")
+        @cap.dump.stub(:run_remote).and_return("123123.tgz\n")
         grab_output{
           @cap.find_and_execute_task("dump:remote:create").should == "123123.tgz"
         }
@@ -405,28 +405,28 @@ describe "cap dump" do
       }, :cap_task => "dump:remote:download")
 
       it "should not download anything if there are no versions avaliable" do
-        @cap.dump.stub!(:run_remote).and_return('')
+        @cap.dump.stub(:run_remote).and_return('')
         @cap.dump.should_not_receive(:do_transfer)
         @cap.find_and_execute_task("dump:remote:download")
       end
 
       it "should transfer latest version dump" do
-        @cap.dump.stub!(:run_remote).and_return("100.tgz\n200.tgz\n300.tgz\n")
+        @cap.dump.stub(:run_remote).and_return("100.tgz\n200.tgz\n300.tgz\n")
         @cap.dump.should_receive(:do_transfer).with(:down, "#{@remote_path}/dump/300.tgz", "dump/300.tgz")
-        FileUtils.stub!(:mkpath)
+        FileUtils.stub(:mkpath)
         @cap.find_and_execute_task("dump:remote:download")
       end
 
       it "should handle extra spaces around file names" do
-        @cap.dump.stub!(: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  ")
+        @cap.dump.stub(: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  ")
         @cap.dump.should_receive(:do_transfer).with(:down, "#{@remote_path}/dump/300.tgz", "dump/300.tgz")
-        FileUtils.stub!(:mkpath)
+        FileUtils.stub(:mkpath)
         @cap.find_and_execute_task("dump:remote:download")
       end
 
       it "should create local dump dir" do
-        @cap.dump.stub!(:run_remote).and_return("100.tgz\n200.tgz\n300.tgz\n")
-        @cap.dump.stub!(:do_transfer)
+        @cap.dump.stub(:run_remote).and_return("100.tgz\n200.tgz\n300.tgz\n")
+        @cap.dump.stub(:do_transfer)
         FileUtils.should_receive(:mkpath).with('dump')
         @cap.find_and_execute_task("dump:remote:download")
       end
@@ -457,19 +457,19 @@ describe "cap dump" do
         end
 
         it "should not call local:create if auto-backup fails" do
-          @cap.dump.namespaces[dst].stub!(:create).and_return('')
+          @cap.dump.namespaces[dst].stub(:create).and_return('')
           @cap.dump.namespaces[src].should_not_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
-          @cap.dump.namespaces[dst].stub!(:create).and_return('123.tgz')
+          @cap.dump.namespaces[dst].stub(:create).and_return('123.tgz')
           @cap.dump.namespaces[src].should_receive(:create){ DumpRake::Env[:tags].should == "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
-          @cap.dump.namespaces[dst].stub!(:create).and_return('123.tgz')
+          @cap.dump.namespaces[dst].stub(:create).and_return('123.tgz')
           @cap.dump.namespaces[src].should_receive(:create){ DumpRake::Env[:tags].should == "mirror,photos"; '' }
           DumpRake::Env.with_env :tags => 'photos' do
             @cap.find_and_execute_task("dump:mirror:#{dir}")
@@ -477,16 +477,16 @@ describe "cap dump" do
         end
 
         it "should not call local:upload or remote:restore if local:create fails" do
-          @cap.dump.namespaces[dst].stub!(:create).and_return('123.tgz')
-          @cap.dump.namespaces[src].stub!(:create).and_return('')
+          @cap.dump.namespaces[dst].stub(:create).and_return('123.tgz')
+          @cap.dump.namespaces[src].stub(:create).and_return('')
           @cap.dump.namespaces[src].should_not_receive(:upload)
           @cap.dump.namespaces[dst].should_not_receive(:restore)
           @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
-          @cap.dump.namespaces[dst].stub!(:create).and_return('123.tgz')
-          @cap.dump.namespaces[src].stub!(:create).and_return('123.tgz')
+          @cap.dump.namespaces[dst].stub(:create).and_return('123.tgz')
+          @cap.dump.namespaces[src].stub(:create).and_return('123.tgz')
           test_env = proc{
             DumpRake::Env[:like].should == '123.tgz'
             DumpRake::Env[:tags].should == nil
@@ -509,13 +509,13 @@ describe "cap dump" do
     end
 
     it "should not call remote:download if remote:create returns blank" do
-      @cap.dump.remote.stub!(:create).and_return('')
+      @cap.dump.remote.stub(:create).and_return('')
       @cap.dump.remote.should_not_receive(:download)
       @cap.find_and_execute_task("dump:backup")
     end
 
     it "should call remote:download if remote:create returns file name" do
-      @cap.dump.remote.stub!(:create).and_return('123.tgz')
+      @cap.dump.remote.stub(:create).and_return('123.tgz')
       @cap.dump.remote.should_receive(:download).ordered
       @cap.find_and_execute_task("dump:backup")
     end
@@ -549,7 +549,7 @@ describe "cap dump" do
     end
 
     it "should send only ver variable" do
-      @cap.dump.remote.stub!(:create).and_return('123.tgz')
+      @cap.dump.remote.stub(:create).and_return('123.tgz')
       def (@cap.dump.remote).download
         DumpRake::Env[:like].should == '123.tgz'
         DumpRake::Env[:tags].should == nil