dump 1.0.2 → 1.0.3

data/spec/lib/dump_rake/dump_spec.rb

@@ -11,7 +11,7 @@ describe DumpRake::Dump do
 
   describe "lock" do
     before do
-      @yield_receiver = mock('yield_receiver')
+      @yield_receiver = double('yield_receiver')
     end
 
     it "should not yield if file does not exist" do
@@ -27,7 +27,7 @@ describe DumpRake::Dump do
     it "should not yield if file can not be locked" do
       @yield_receiver.should_not_receive(:fire)
 
-      @file = mock('file')
+      @file = double('file')
       @file.should_receive(:flock).with(File::LOCK_EX | File::LOCK_NB).and_return(nil)
       @file.should_receive(:flock).with(File::LOCK_UN)
       @file.should_receive(:close)
@@ -41,7 +41,7 @@ describe DumpRake::Dump do
     it "should yield if file can not be locked" do
       @yield_receiver.should_receive(:fire)
 
-      @file = mock('file')
+      @file = double('file')
       @file.should_receive(:flock).with(File::LOCK_EX | File::LOCK_NB).and_return(true)
       @file.should_receive(:flock).with(File::LOCK_UN)
       @file.should_receive(:close)
@@ -64,10 +64,10 @@ describe DumpRake::Dump do
 
     describe "with options" do
       before do
-        @time = mock('time')
-        @time.stub!(:utc).and_return(@time)
-        @time.stub!(:strftime).and_return('19650414065945')
-        Time.stub!(:now).and_return(@time)
+        @time = double('time')
+        @time.stub(:utc).and_return(@time)
+        @time.stub(:strftime).and_return('19650414065945')
+        Time.stub(:now).and_return(@time)
       end
 
       it "should generate path with no options" do
@@ -100,7 +100,7 @@ describe DumpRake::Dump do
           File.should_receive(:file?).with(path).at_least(1).and_return(true)
           path
         end
-        Dir.stub!(:[]).and_return(paths)
+        Dir.stub(:[]).and_return(paths)
       end
 
       it "should search for files in dump dir when asked for list" do
@@ -128,7 +128,7 @@ describe DumpRake::Dump do
           File.should_receive(:file?).with(path).at_least(1).and_return(true)
           path
         end
-        Dir.stub!(:[]).and_return(paths)
+        Dir.stub(:[]).and_return(paths)
       end
 
       it "should return all dumps if no tags send" do

data/spec/lib/dump_rake/dump_writer_spec.rb

@@ -6,16 +6,17 @@ DumpWriter = DumpRake::DumpWriter
 describe DumpWriter do
   describe "create" do
     it "should create selves instance and open" do
-      @dump = mock('dump')
+      @dump = double('dump')
       @dump.should_receive(:open)
       DumpWriter.should_receive(:new).with('/abc/123.tmp').and_return(@dump)
       DumpWriter.create('/abc/123.tmp')
     end
 
     it "should call dump subroutines" do
-      @dump = mock('dump')
-      @dump.stub!(:open).and_yield(@dump)
-      DumpWriter.stub!(:new).and_return(@dump)
+      @dump = double('dump')
+      @dump.stub(:open).and_yield(@dump)
+      @dump.stub(:silence).and_yield
+      DumpWriter.stub(:new).and_return(@dump)
 
       @dump.should_receive(:write_schema).ordered
       @dump.should_receive(:write_tables).ordered
@@ -28,15 +29,15 @@ describe DumpWriter do
 
   describe "open" do
     it "should create dir for dump" do
-      Zlib::GzipWriter.stub!(:open)
+      Zlib::GzipWriter.stub(:open)
       FileUtils.should_receive(:mkpath).with('/abc/def/ghi')
       DumpWriter.new('/abc/def/ghi/123.tgz').open
     end
 
     it "should set stream to gzipped tar writer" do
-      FileUtils.stub!(:mkpath)
-      @gzip = mock('gzip')
-      @stream = mock('stream')
+      FileUtils.stub(:mkpath)
+      @gzip = double('gzip')
+      @stream = double('stream')
       Zlib::GzipWriter.should_receive(:open).with(Pathname("123.tgz")).and_yield(@gzip)
       Archive::Tar::Minitar::Output.should_receive(:open).with(@gzip).and_yield(@stream)
       @gzip.should_receive(:mtime=).with(Time.utc(2000))
@@ -52,23 +53,23 @@ describe DumpWriter do
 
   describe "subroutines" do
     before do
-      @tar = mock('tar')
-      @stream = mock('stream', :tar => @tar)
+      @tar = double('tar')
+      @stream = double('stream', :tar => @tar)
       @config = {:tables => {}}
       @dump = DumpWriter.new('123.tgz')
-      @dump.stub!(:stream).and_return(@stream)
-      @dump.stub!(:config).and_return(@config)
-      Progress.stub!(:io).and_return(StringIO.new)
+      @dump.stub(:stream).and_return(@stream)
+      @dump.stub(:config).and_return(@config)
+      Progress.stub(:io).and_return(StringIO.new)
     end
 
     describe "create_file" do
       it "should create temp file, yield it for writing, create file in tar and write it there" do
-        @temp = mock('temp', :open => true, :length => 6, :read => 'qwfpgj')
+        @temp = double('temp', :open => true, :length => 6, :read => 'qwfpgj')
         @temp.should_receive(:write).with('qwfpgj')
-        @temp.stub!(:eof?).and_return(false, true)
+        @temp.stub(:eof?).and_return(false, true)
         Tempfile.should_receive(:open).and_yield(@temp)
 
-        @file = mock('file')
+        @file = double('file')
         @file.should_receive(:write).with('qwfpgj')
 
         @stream.tar.should_receive(:add_file_simple).with('abc/def.txt', :mode => 0100444, :size => 6).and_yield(@file)
@@ -87,16 +88,16 @@ describe DumpWriter do
       end
 
       it "should set ENV[SCHEMA] to path of returned file" do
-        @file = mock('file', :path => 'db/schema.rb')
-        @dump.stub!(:create_file).and_yield(@file)
+        @file = double('file', :path => 'db/schema.rb')
+        @dump.stub(:create_file).and_yield(@file)
         DumpRake::Env.should_receive(:with_env).with('SCHEMA' => 'db/schema.rb')
         @dump.write_schema
       end
 
       it "should call rake task db:schema:dump" do
-        @file = mock('file', :path => 'db/schema.rb')
-        @dump.stub!(:create_file).and_yield(@file)
-        @task = mock('task')
+        @file = double('file', :path => 'db/schema.rb')
+        @dump.stub(:create_file).and_yield(@file)
+        @task = double('task')
         Rake::Task.should_receive(:[]).with('db:schema:dump').and_return(@task)
         @task.should_receive(:invoke)
         @dump.write_schema
@@ -105,14 +106,14 @@ describe DumpWriter do
 
     describe "write_tables" do
       it "should verify connection" do
-        @dump.stub!(:tables_to_dump).and_return([])
+        @dump.stub(:tables_to_dump).and_return([])
         @dump.should_receive(:verify_connection)
         @dump.write_tables
       end
 
       it "should call write_table for each table returned by tables_to_dump" do
-        @dump.stub!(:verify_connection)
-        @dump.stub!(:tables_to_dump).and_return(%w[first second])
+        @dump.stub(:verify_connection)
+        @dump.stub(:tables_to_dump).and_return(%w[first second])
 
         @dump.should_receive(:write_table).with('first')
         @dump.should_receive(:write_table).with('second')
@@ -124,32 +125,32 @@ describe DumpWriter do
     describe "write_table" do
       it "should get row count and store it to config" do
         @dump.should_receive(:table_row_count).with('first').and_return(666)
-        @dump.stub!(:create_file)
+        @dump.stub(:create_file)
         @dump.write_table('first')
         @config[:tables]['first'].should == 666
       end
 
       it "should create_file" do
-        @dump.stub!(:table_row_count).and_return(666)
+        @dump.stub(:table_row_count).and_return(666)
         @dump.should_receive(:create_file)
         @dump.write_table('first')
       end
 
       it "should dump column names and values of each row" do
         @column_definitions = [
-          mock('column', :name => 'id'),
-          mock('column', :name => 'name'),
-          mock('column', :name => 'associated_id')
+          double('column', :name => 'id'),
+          double('column', :name => 'name'),
+          double('column', :name => 'associated_id')
         ]
-        ActiveRecord::Base.connection.stub!(:columns).and_return(@column_definitions)
+        ActiveRecord::Base.connection.stub(:columns).and_return(@column_definitions)
         @rows = [
           {'id' => 1, 'name' => 'a', 'associated_id' => 100},
           {'id' => 2, 'name' => 'b', 'associated_id' => 666},
         ]
 
-        @file = mock('file')
-        @dump.stub!(:table_row_count).and_return(666)
-        @dump.stub!(:create_file).and_yield(@file)
+        @file = double('file')
+        @dump.stub(:table_row_count).and_return(666)
+        @dump.stub(:create_file).and_yield(@file)
 
         column_names = @column_definitions.map(&:name).sort
         @file.should_receive(:write).with(Marshal.dump(column_names)).ordered
@@ -168,7 +169,7 @@ describe DumpWriter do
 
     describe "write_assets" do
       before do
-        @dump.stub!(:assets_root_link).and_yield('/tmp', 'assets')
+        @dump.stub(:assets_root_link).and_yield('/tmp', 'assets')
       end
 
       it "should call assets_to_dump" do
@@ -177,22 +178,22 @@ describe DumpWriter do
       end
 
       it "should change root to rails app root" do
-        @file = mock('file')
-        @dump.stub!(:assets_to_dump).and_return(%w[images videos])
-        @dump.stub!(:create_file).and_yield(@file)
+        @file = double('file')
+        @dump.stub(:assets_to_dump).and_return(%w[images videos])
+        @dump.stub(:create_file).and_yield(@file)
 
         Dir.should_receive(:chdir).with(DumpRake::RailsRoot)
         @dump.write_assets
       end
 
       it "should put assets to config" do
-        @file = mock('file')
-        @dump.stub!(:assets_to_dump).and_return(%w[images/* videos])
-        @dump.stub!(:create_file).and_yield(@file)
-        Dir.stub!(:chdir).and_yield
-        @tar = mock('tar_writer')
-        Archive::Tar::Minitar::Output.stub!(:open).and_yield(@tar)
-        Dir.stub!(:[]).and_return([])
+        @file = double('file')
+        @dump.stub(:assets_to_dump).and_return(%w[images/* videos])
+        @dump.stub(:create_file).and_yield(@file)
+        Dir.stub(:chdir).and_yield
+        @tar = double('tar_writer')
+        Archive::Tar::Minitar::Output.stub(:open).and_yield(@tar)
+        Dir.stub(:[]).and_return([])
         Dir.should_receive(:[]).with(*%w[images/* videos]).and_return(%w[images/a images/b videos])
 
         @dump.write_assets
@@ -201,12 +202,12 @@ describe DumpWriter do
       end
 
       it "should use glob to find files" do
-        @file = mock('file')
-        @dump.stub!(:assets_to_dump).and_return(%w[images/* videos])
-        @dump.stub!(:create_file).and_yield(@file)
-        Dir.stub!(:chdir).and_yield
-        @tar = mock('tar_writer')
-        Archive::Tar::Minitar::Output.stub!(:open).and_yield(@tar)
+        @file = double('file')
+        @dump.stub(:assets_to_dump).and_return(%w[images/* videos])
+        @dump.stub(:create_file).and_yield(@file)
+        Dir.stub(:chdir).and_yield
+        @tar = double('tar_writer')
+        Archive::Tar::Minitar::Output.stub(:open).and_yield(@tar)
 
         Dir.should_receive(:[]).with(*%w[images/* videos]).and_return(%w[images/a images/b videos])
         Dir.should_receive(:[]).with('images/a/**/*').and_return([])
@@ -217,12 +218,12 @@ describe DumpWriter do
       end
 
       it "should pack each file from assets_root_link" do
-        @file = mock('file')
-        @dump.stub!(:assets_to_dump).and_return(%w[images/* videos])
-        @dump.stub!(:create_file).and_yield(@file)
-        Dir.stub!(:chdir).and_yield
-        @tar = mock('tar_writer')
-        Archive::Tar::Minitar::Output.stub!(:open).and_yield(@tar)
+        @file = double('file')
+        @dump.stub(:assets_to_dump).and_return(%w[images/* videos])
+        @dump.stub(:create_file).and_yield(@file)
+        Dir.stub(:chdir).and_yield
+        @tar = double('tar_writer')
+        Archive::Tar::Minitar::Output.stub(:open).and_yield(@tar)
 
         Dir.should_receive(:[]).with(*%w[images/* videos]).and_return(%w[images/a images/b videos])
         Dir.should_receive(:[]).with('images/a/**/*').and_return([])
@@ -235,12 +236,12 @@ describe DumpWriter do
       end
 
       it "should pack each file" do
-        @file = mock('file')
-        @dump.stub!(:assets_to_dump).and_return(%w[images/* videos])
-        @dump.stub!(:create_file).and_yield(@file)
-        Dir.stub!(:chdir).and_yield
-        @tar = mock('tar_writer')
-        Archive::Tar::Minitar::Output.stub!(:open).and_yield(@tar)
+        @file = double('file')
+        @dump.stub(:assets_to_dump).and_return(%w[images/* videos])
+        @dump.stub(:create_file).and_yield(@file)
+        Dir.stub(:chdir).and_yield
+        @tar = double('tar_writer')
+        Archive::Tar::Minitar::Output.stub(:open).and_yield(@tar)
 
         Dir.should_receive(:[]).with(*%w[images/* videos]).and_return(%w[images/a images/b videos])
         Dir.should_receive(:[]).with('images/a/**/*').and_return(%w[a.jpg b.jpg])
@@ -255,12 +256,12 @@ describe DumpWriter do
       end
 
       it "should not raise if something fails when packing" do
-        @file = mock('file')
-        @dump.stub!(:assets_to_dump).and_return(%w[videos])
-        @dump.stub!(:create_file).and_yield(@file)
-        Dir.stub!(:chdir).and_yield
-        @tar = mock('tar_writer')
-        Archive::Tar::Minitar::Output.stub!(:open).and_yield(@tar)
+        @file = double('file')
+        @dump.stub(:assets_to_dump).and_return(%w[videos])
+        @dump.stub(:create_file).and_yield(@file)
+        Dir.stub(:chdir).and_yield
+        @tar = double('tar_writer')
+        Archive::Tar::Minitar::Output.stub(:open).and_yield(@tar)
 
         Dir.should_receive(:[]).with(*%w[videos]).and_return(%w[videos])
         Dir.should_receive(:[]).with('videos/**/*').and_return(%w[a.mov b.mov])
@@ -282,8 +283,8 @@ describe DumpWriter do
       end
 
       it "should dump column names and values of each row" do
-        @file = mock('file')
-        @dump.stub!(:create_file).and_yield(@file)
+        @file = double('file')
+        @dump.stub(:create_file).and_yield(@file)
         @config.replace({:tables => {'first' => 1, 'second' => 2}, :assets => %w[images videos]})
 
         @file.should_receive(:write).with(Marshal.dump(@config))
@@ -293,32 +294,32 @@ describe DumpWriter do
 
     describe "assets_to_dump" do
       it "should call rake task assets" do
-        @task = mock('task')
+        @task = double('task')
         Rake::Task.should_receive(:[]).with('assets').and_return(@task)
         @task.should_receive(:invoke)
         @dump.assets_to_dump
       end
 
       it "should return array of assets if separator is colon" do
-        @task = mock('task')
-        Rake::Task.stub!(:[]).and_return(@task)
-        @task.stub!(:invoke)
+        @task = double('task')
+        Rake::Task.stub(:[]).and_return(@task)
+        @task.stub(:invoke)
         DumpRake::Env.with_env(:assets => 'images:videos') do
           @dump.assets_to_dump.should == %w[images videos]
         end
       end
 
       it "should return array of assets if separator is comma" do
-        @task = mock('task')
-        Rake::Task.stub!(:[]).and_return(@task)
-        @task.stub!(:invoke)
+        @task = double('task')
+        Rake::Task.stub(:[]).and_return(@task)
+        @task.stub(:invoke)
         DumpRake::Env.with_env(:assets => 'images,videos') do
           @dump.assets_to_dump.should == %w[images videos]
         end
       end
 
       it "should return empty array if calling rake task assets raises an exception" do
-        Rake::Task.stub!(:[]).and_raise('task assets not found')
+        Rake::Task.stub(:[]).and_raise('task assets not found')
         DumpRake::Env.with_env(:assets => 'images:videos') do
           @dump.assets_to_dump.should == []
         end

data/spec/lib/dump_rake/rails_root_spec.rb

@@ -16,7 +16,7 @@ end
 
 describe 'RailsRoot' do
   before do
-    @root = mock('root')
+    @root = double('root')
     @root.should_receive(:to_s).and_return(@root)
   end
 
@@ -25,7 +25,7 @@ describe 'RailsRoot' do
   temp_remove_const DumpRake, :RailsRoot
 
   it "should use Rails if it is present" do
-    Object.const_set('Rails', mock('rails'))
+    Object.const_set('Rails', double('rails'))
     Rails.should_receive(:root).and_return(@root)
     load 'dump_rake/rails_root.rb'
     DumpRake::RailsRoot.should === @root

data/spec/lib/dump_rake/table_manipulation_spec.rb

@@ -143,9 +143,9 @@ describe TableManipulation do
   describe "table_chunk_size" do
     it "should return chunk_size based on estimated average for row size" do
       should_receive(:table_columns).with('first').and_return(
-        [mock(:column, :type => :integer, :limit => nil)] * 3 +
-        [mock(:column, :type => :string, :limit => nil)] * 3 +
-        [mock(:column, :type => :text, :limit => nil)]
+        [double(:column, :type => :integer, :limit => nil)] * 3 +
+        [double(:column, :type => :string, :limit => nil)] * 3 +
+        [double(:column, :type => :text, :limit => nil)]
       )
       table_chunk_size('first').should satisfy { |n|
         (TableManipulation::CHUNK_SIZE_MIN..TableManipulation::CHUNK_SIZE_MAX).include?(n)
@@ -154,14 +154,14 @@ describe TableManipulation do
 
     it "should not return value less than CHUNK_SIZE_MIN" do
       should_receive(:table_columns).with('first').and_return(
-        [mock(:column, :type => :text, :limit => nil)] * 100
+        [double(:column, :type => :text, :limit => nil)] * 100
       )
       table_chunk_size('first').should == TableManipulation::CHUNK_SIZE_MIN
     end
 
     it "should not return value more than CHUNK_SIZE_MAX" do
       should_receive(:table_columns).with('first').and_return(
-        [mock(:column, :type => :boolean, :limit => 1)] * 10
+        [double(:column, :type => :boolean, :limit => 1)] * 10
       )
       table_chunk_size('first').should == TableManipulation::CHUNK_SIZE_MAX
     end
@@ -169,7 +169,7 @@ describe TableManipulation do
 
   describe "table_columns" do
     it "should return table column definitions" do
-      columns = [mock(:column), mock(:column), mock(:column)]
+      columns = [double(:column), double(:column), double(:column)]
       ActiveRecord::Base.connection.should_receive(:columns).with('first').and_return(columns)
       table_columns('first').should == columns
     end
@@ -179,13 +179,13 @@ describe TableManipulation do
     it "should return true only if table has column with name id and type :integer" do
       should_receive(:table_primary_key).at_least(3).times.and_return('id')
 
-      should_receive(:table_columns).with('first').and_return([mock(:column, :name => 'id', :type => :integer), mock(:column, :name => 'title', :type => :integer)])
+      should_receive(:table_columns).with('first').and_return([double(:column, :name => 'id', :type => :integer), double(:column, :name => 'title', :type => :integer)])
       table_has_primary_column?('first').should be_true
 
-      should_receive(:table_columns).with('second').and_return([mock(:column, :name => 'id', :type => :string), mock(:column, :name => 'title', :type => :integer)])
+      should_receive(:table_columns).with('second').and_return([double(:column, :name => 'id', :type => :string), double(:column, :name => 'title', :type => :integer)])
       table_has_primary_column?('second').should be_false
 
-      should_receive(:table_columns).with('third').and_return([mock(:column, :name => 'name', :type => :integer), mock(:column, :name => 'title', :type => :integer)])
+      should_receive(:table_columns).with('third').and_return([double(:column, :name => 'name', :type => :integer), double(:column, :name => 'title', :type => :integer)])
       table_has_primary_column?('third').should be_false
     end
   end
@@ -248,7 +248,7 @@ describe TableManipulation do
 
   describe "select_all_by_sql" do
     it "should return all rows returned by database" do
-      rows = [mock(:row), mock(:row), mock(:row)]
+      rows = [double(:row), double(:row), double(:row)]
       ActiveRecord::Base.connection.should_receive(:select_all).with("SELECT * FROM abc WHERE x = y").and_return(rows)
       select_all_by_sql("SELECT * FROM abc WHERE x = y").should == rows
     end