dump 1.0.4 → 1.0.5

data/spec/lib/dump_rake/dump_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe DumpRake::Dump do
   def dump_path(file_name)
@@ -9,22 +9,20 @@ describe DumpRake::Dump do
     DumpRake::Dump.new(dump_path(file_name))
   end
 
-  describe "lock" do
+  describe 'lock' do
     before do
       @yield_receiver = double('yield_receiver')
     end
 
-    it "should not yield if file does not exist" do
+    it 'should not yield if file does not exist' do
       expect(@yield_receiver).not_to receive(:fire)
 
-      expect(File).to receive(:open).and_return(nil)
-
       DumpRake::Dump.new('hello').lock do
         @yield_receiver.fire
       end
     end
 
-    it "should not yield if file can not be locked" do
+    it 'should not yield if file can not be locked' do
       expect(@yield_receiver).not_to receive(:fire)
 
       @file = double('file')
@@ -38,7 +36,7 @@ describe DumpRake::Dump do
       end
     end
 
-    it "should yield if file can not be locked" do
+    it 'should yield if file can not be locked' do
       expect(@yield_receiver).to receive(:fire)
 
       @file = double('file')
@@ -53,16 +51,16 @@ describe DumpRake::Dump do
     end
   end
 
-  describe "new" do
-    it "should init with path if String sent" do
+  describe 'new' do
+    it 'should init with path if String sent' do
       expect(DumpRake::Dump.new('hello').path).to eq(Pathname('hello'))
     end
 
-    it "should init with path if Pathname sent" do
+    it 'should init with path if Pathname sent' do
       expect(DumpRake::Dump.new(Pathname('hello')).path).to eq(Pathname('hello'))
     end
 
-    describe "with options" do
+    describe 'with options' do
       before do
         @time = double('time')
         allow(@time).to receive(:utc).and_return(@time)
@@ -70,30 +68,30 @@ describe DumpRake::Dump do
         allow(Time).to receive(:now).and_return(@time)
       end
 
-      it "should generate path with no options" do
+      it 'should generate path with no options' do
         expect(DumpRake::Dump.new.path).to eq(Pathname('19650414065945.tgz'))
       end
 
-      it "should generate with dir" do
+      it 'should generate with dir' do
         expect(DumpRake::Dump.new(:dir => 'dump_dir').path).to eq(Pathname('dump_dir/19650414065945.tgz'))
       end
 
-      it "should generate path with description" do
+      it 'should generate path with description' do
         expect(DumpRake::Dump.new(:dir => 'dump_dir', :desc => 'hello world').path).to eq(Pathname('dump_dir/19650414065945-hello world.tgz'))
       end
 
-      it "should generate path with tags" do
+      it 'should generate path with tags' do
         expect(DumpRake::Dump.new(:dir => 'dump_dir', :tags => ' mirror, hello world ').path).to eq(Pathname('dump_dir/19650414065945@hello world,mirror.tgz'))
       end
 
-      it "should generate path with description and tags" do
+      it 'should generate path with description and tags' do
         expect(DumpRake::Dump.new(:dir => 'dump_dir', :desc => 'Anniversary backup', :tags => ' mirror, hello world ').path).to eq(Pathname('dump_dir/19650414065945-Anniversary backup@hello world,mirror.tgz'))
       end
     end
   end
 
-  describe "versions" do
-    describe "list" do
+  describe 'versions' do
+    describe 'list' do
       def stub_glob
         paths = %w[123 345 567].map do |name|
           path = dump_path("#{name}.tgz")
@@ -103,23 +101,23 @@ describe DumpRake::Dump do
         allow(Dir).to receive(:[]).and_return(paths)
       end
 
-      it "should search for files in dump dir when asked for list" do
+      it 'should search for files in dump dir when asked for list' do
         expect(Dir).to receive(:[]).with(dump_path('*.tgz')).and_return([])
         DumpRake::Dump.list
       end
 
-      it "should return selves instances for each found file" do
+      it 'should return selves instances for each found file' do
         stub_glob
         DumpRake::Dump.list.all?{ |dump| expect(dump).to be_a(DumpRake::Dump) }
       end
 
-      it "should return dumps with name containting :like" do
+      it 'should return dumps with name containting :like' do
         stub_glob
         expect(DumpRake::Dump.list(:like => '3')).to eq(DumpRake::Dump.list.values_at(0, 1))
       end
     end
 
-    describe "with tags" do
+    describe 'with tags' do
       before do
         #             0        1  2    3      4      5        6    7    8      9  10   11   12     13 14 15   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]
@@ -131,7 +129,7 @@ describe DumpRake::Dump do
         allow(Dir).to receive(:[]).and_return(paths)
       end
 
-      it "should return all dumps if no tags send" do
+      it 'should return all dumps if no tags send' do
         expect(DumpRake::Dump.list(:tags => '')).to eq(DumpRake::Dump.list)
       end
 
@@ -153,13 +151,13 @@ describe DumpRake::Dump do
     end
   end
 
-  describe "name" do
-    it "should return file name" do
-      expect(new_dump("19650414065945.tgz").name).to eq('19650414065945.tgz')
+  describe 'name' do
+    it 'should return file name' do
+      expect(new_dump('19650414065945.tgz').name).to eq('19650414065945.tgz')
     end
   end
 
-  describe "parts" do
+  describe 'parts' do
     before do
       @time = Time.utc(1965, 4, 14, 6, 59, 45)
     end
@@ -170,14 +168,14 @@ describe DumpRake::Dump do
     end
 
     %w[tmp tgz].each do |ext|
-      it "should return empty results for dump with wrong name" do
+      it 'should return empty results for dump with wrong name' do
         expect(dump_name_parts("196504140659.#{ext}")).to eq([nil, '', [], nil])
         expect(dump_name_parts("196504140659-lala.#{ext}")).to eq([nil, '', [], nil])
         expect(dump_name_parts("196504140659@lala.#{ext}")).to eq([nil, '', [], nil])
-        expect(dump_name_parts("19650414065945.ops")).to eq([nil, '', [], nil])
+        expect(dump_name_parts('19650414065945.ops')).to eq([nil, '', [], nil])
       end
 
-      it "should return tags for dump with tags" do
+      it 'should return tags for dump with tags' do
         expect(dump_name_parts("19650414065945.#{ext}")).to eq([@time, '', [], ext])
         expect(dump_name_parts("19650414065945- Hello world &&& .#{ext}")).to eq([@time, 'Hello world _', [], ext])
         expect(dump_name_parts("19650414065945- Hello world &&& @ test , hello world , bad tag ~~~~.#{ext}")).to eq([@time, 'Hello world _', ['bad tag _', 'hello world', 'test'], ext])
@@ -187,44 +185,44 @@ describe DumpRake::Dump do
     end
   end
 
-  describe "path" do
-    it "should return path" do
-      expect(new_dump("19650414065945.tgz").path).to eq(Pathname(File.join(DumpRake::RailsRoot, 'dump', "19650414065945.tgz")))
+  describe 'path' do
+    it 'should return path' do
+      expect(new_dump('19650414065945.tgz').path).to eq(Pathname(File.join(DumpRake::RailsRoot, 'dump', '19650414065945.tgz')))
     end
   end
 
-  describe "tgz_path" do
-    it "should return path if extension is already tgz" do
-      expect(new_dump("19650414065945.tgz").tgz_path).to eq(new_dump("19650414065945.tgz").path)
+  describe 'tgz_path' do
+    it 'should return path if extension is already tgz' do
+      expect(new_dump('19650414065945.tgz').tgz_path).to eq(new_dump('19650414065945.tgz').path)
     end
 
-    it "should return path with tgz extension" do
-      expect(new_dump("19650414065945.tmp").tgz_path).to eq(new_dump("19650414065945.tgz").path)
+    it 'should return path with tgz extension' do
+      expect(new_dump('19650414065945.tmp').tgz_path).to eq(new_dump('19650414065945.tgz').path)
     end
   end
 
-  describe "tmp_path" do
-    it "should return path if extension is already tmp" do
-      expect(new_dump("19650414065945.tmp").tmp_path).to eq(new_dump("19650414065945.tmp").path)
+  describe 'tmp_path' do
+    it 'should return path if extension is already tmp' do
+      expect(new_dump('19650414065945.tmp').tmp_path).to eq(new_dump('19650414065945.tmp').path)
     end
 
-    it "should return path with tmp extension" do
-      expect(new_dump("19650414065945.tgz").tmp_path).to eq(new_dump("19650414065945.tmp").path)
+    it 'should return path with tmp extension' do
+      expect(new_dump('19650414065945.tgz').tmp_path).to eq(new_dump('19650414065945.tmp').path)
     end
   end
 
-  describe "clean_description" do
+  describe 'clean_description' do
     it "should shorten string to 50 chars and replace special symblos with '-'" do
       expect(DumpRake::Dump.new('').send(:clean_description, 'Special  Dump #12837192837 (before fixind *&^*&^ photos)')).to eq('Special Dump #12837192837 (before fixind _ photos)')
       expect(DumpRake::Dump.new('').send(:clean_description, "To#{'o' * 100} long description")).to eq("T#{'o' * 49}")
     end
 
-    it "should accept non string" do
+    it 'should accept non string' do
       expect(DumpRake::Dump.new('').send(:clean_description, nil)).to eq('')
     end
   end
 
-  describe "clean_tag" do
+  describe 'clean_tag' do
     it "should shorten string to 20 chars and replace special symblos with '-'" do
       expect(DumpRake::Dump.new('').send(:clean_tag, 'Very special  tag #12837192837 (fixind *&^*&^)')).to eq('very special tag _12')
       expect(DumpRake::Dump.new('').send(:clean_tag, "To#{'o' * 100} long tag")).to eq("t#{'o' * 19}")
@@ -238,24 +236,24 @@ describe DumpRake::Dump do
       expect(DumpRake::Dump.new('').send(:clean_tag, '+++++++++++')).to eq('_')
     end
 
-    it "should accept non string" do
+    it 'should accept non string' do
       expect(DumpRake::Dump.new('').send(:clean_tag, nil)).to eq('')
     end
   end
 
-  describe "clean_tags" do
-    it "should split string and return uniq non blank sorted tags" do
+  describe 'clean_tags' do
+    it 'should split string and return uniq non blank sorted tags' do
       expect(DumpRake::Dump.new('').send(:clean_tags, ' perfect  tag , hello,Hello,this  is (*^(*&')).to eq(['hello', 'perfect tag', 'this is _'])
       expect(DumpRake::Dump.new('').send(:clean_tags, "l#{'o' * 100}ng tag")).to eq(["l#{'o' * 19}"])
     end
 
-    it "should accept non string" do
+    it 'should accept non string' do
       expect(DumpRake::Dump.new('').send(:clean_tags, nil)).to eq([])
     end
   end
 
-  describe "get_filter_tags" do
-    it "should split string and return uniq non blank sorted tags" do
+  describe 'get_filter_tags' do
+    it 'should split string and return uniq non blank sorted tags' do
       expect(DumpRake::Dump.new('').send(:get_filter_tags, 'a,+b,+c,-d')).to eq({:simple => %w[a], :mandatory => %w[b c], :forbidden => %w[d]})
       expect(DumpRake::Dump.new('').send(:get_filter_tags, ' a , + b , + c , - d ')).to eq({:simple => %w[a], :mandatory => %w[b c], :forbidden => %w[d]})
       expect(DumpRake::Dump.new('').send(:get_filter_tags, ' a , + c , + b , - d ')).to eq({:simple => %w[a], :mandatory => %w[b c], :forbidden => %w[d]})
@@ -266,25 +264,25 @@ describe DumpRake::Dump do
       expect{ DumpRake::Dump.new('').send(:get_filter_tags, '+a,-a') }.to raise_error
     end
 
-    it "should accept non string" do
+    it 'should accept non string' do
       expect(DumpRake::Dump.new('').send(:get_filter_tags, nil)).to eq({:simple => [], :mandatory => [], :forbidden => []})
     end
   end
 
-  describe "assets_root_link" do
-    it "should create tem dir, chdir there, symlink rails app root to assets, yield and unlink assets ever if something raised" do
+  describe 'assets_root_link' do
+    it 'should create tem dir, chdir there, symlink rails app root to assets, yield and unlink assets ever if something raised' do
       expect(Dir).to receive(:mktmpdir).and_yield('/tmp/abc')
       expect(Dir).to receive(:chdir).with('/tmp/abc').and_yield
       expect(File).to receive(:symlink).with(DumpRake::RailsRoot, 'assets')
       expect(File).to receive(:unlink).with('assets')
-      expect{
+      expect do
         DumpRake::Dump.new('').send(:assets_root_link) do |dir, prefix|
           expect(dir).to eq('/tmp/abc')
           expect(prefix).to eq('assets')
           @yielded = true
-          raise 'just test'
+          fail 'just test'
         end
-      }.to raise_error('just test')
+      end.to raise_error('just test')
       expect(@yielded).to eq(true)
     end
   end

data/spec/lib/dump_rake/dump_writer_spec.rb

@@ -1,18 +1,17 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-require File.dirname(__FILE__) + '/../../../lib/dump_rake'
+require 'spec_helper'
+require 'dump_rake'
 
 DumpWriter = DumpRake::DumpWriter
 describe DumpWriter do
-  describe "create" do
-    it "should create selves instance and open" do
+  describe 'create' do
+    it 'should create selves instance and open' do
       @dump = double('dump')
       expect(@dump).to receive(:open)
       expect(DumpWriter).to receive(:new).with('/abc/123.tmp').and_return(@dump)
       DumpWriter.create('/abc/123.tmp')
     end
 
-    it "should call dump subroutines" do
+    it 'should call dump subroutines' do
       @dump = double('dump')
       allow(@dump).to receive(:open).and_yield(@dump)
       allow(@dump).to receive(:silence).and_yield
@@ -27,18 +26,18 @@ describe DumpWriter do
     end
   end
 
-  describe "open" do
-    it "should create dir for dump" do
+  describe 'open' do
+    it 'should create dir for dump' do
       allow(Zlib::GzipWriter).to receive(:open)
       expect(FileUtils).to receive(:mkpath).with('/abc/def/ghi')
       DumpWriter.new('/abc/def/ghi/123.tgz').open
     end
 
-    it "should set stream to gzipped tar writer" do
+    it 'should set stream to gzipped tar writer' do
       allow(FileUtils).to receive(:mkpath)
       @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_yield(@gzip)
       expect(Archive::Tar::Minitar::Output).to receive(:open).with(@gzip).and_yield(@stream)
       expect(@gzip).to receive(:mtime=).with(Time.utc(2000))
 
@@ -51,7 +50,7 @@ describe DumpWriter do
     end
   end
 
-  describe "subroutines" do
+  describe 'subroutines' do
     before do
       @tar = double('tar')
       @stream = double('stream', :tar => @tar)
@@ -62,8 +61,8 @@ describe DumpWriter do
       allow(Progress).to receive(: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
+    describe 'create_file' do
+      it 'should create temp file, yield it for writing, create file in tar and write it there' do
         @temp = double('temp', :open => true, :length => 6, :read => 'qwfpgj')
         expect(@temp).to receive(:write).with('qwfpgj')
         allow(@temp).to receive(:eof?).and_return(false, true)
@@ -81,20 +80,20 @@ describe DumpWriter do
       end
     end
 
-    describe "write_schema" do
-      it "should create file schema.rb" do
+    describe 'write_schema' do
+      it 'should create file schema.rb' do
         expect(@dump).to receive(:create_file).with('schema.rb')
         @dump.write_schema
       end
 
-      it "should set ENV[SCHEMA] to path of returned file" do
+      it 'should set ENV[SCHEMA] to path of returned file' do
         @file = double('file', :path => 'db/schema.rb')
         allow(@dump).to receive(:create_file).and_yield(@file)
         expect(DumpRake::Env).to receive(:with_env).with('SCHEMA' => 'db/schema.rb')
         @dump.write_schema
       end
 
-      it "should call rake task db:schema:dump" do
+      it 'should call rake task db:schema:dump' do
         @file = double('file', :path => 'db/schema.rb')
         allow(@dump).to receive(:create_file).and_yield(@file)
         @task = double('task')
@@ -104,14 +103,14 @@ describe DumpWriter do
       end
     end
 
-    describe "write_tables" do
-      it "should verify connection" do
+    describe 'write_tables' do
+      it 'should verify connection' do
         allow(@dump).to receive(:tables_to_dump).and_return([])
         expect(@dump).to receive(:verify_connection)
         @dump.write_tables
       end
 
-      it "should call write_table for each table returned by tables_to_dump" do
+      it 'should call write_table for each table returned by tables_to_dump' do
         allow(@dump).to receive(:verify_connection)
         allow(@dump).to receive(:tables_to_dump).and_return(%w[first second])
 
@@ -122,25 +121,25 @@ describe DumpWriter do
       end
     end
 
-    describe "write_table" do
-      it "should get row count and store it to config" do
+    describe 'write_table' do
+      it 'should get row count and store it to config' do
         expect(@dump).to receive(:table_row_count).with('first').and_return(666)
         allow(@dump).to receive(:create_file)
         @dump.write_table('first')
         expect(@config[:tables]['first']).to eq(666)
       end
 
-      it "should create_file" do
+      it 'should create_file' do
         allow(@dump).to receive(:table_row_count).and_return(666)
         expect(@dump).to receive(:create_file)
         @dump.write_table('first')
       end
 
-      it "should dump column names and values of each row" do
+      it 'should dump column names and values of each row' do
         @column_definitions = [
           double('column', :name => 'id'),
           double('column', :name => 'name'),
-          double('column', :name => 'associated_id')
+          double('column', :name => 'associated_id'),
         ]
         allow(ActiveRecord::Base.connection).to receive(:columns).and_return(@column_definitions)
         @rows = [
@@ -167,17 +166,17 @@ describe DumpWriter do
       end
     end
 
-    describe "write_assets" do
+    describe 'write_assets' do
       before do
         allow(@dump).to receive(:assets_root_link).and_yield('/tmp', 'assets')
       end
 
-      it "should call assets_to_dump" do
+      it 'should call assets_to_dump' do
         expect(@dump).to receive(:assets_to_dump).and_return([])
         @dump.write_assets
       end
 
-      it "should change root to rails app root" do
+      it 'should change root to rails app root' do
         @file = double('file')
         allow(@dump).to receive(:assets_to_dump).and_return(%w[images videos])
         allow(@dump).to receive(:create_file).and_yield(@file)
@@ -186,7 +185,7 @@ describe DumpWriter do
         @dump.write_assets
       end
 
-      it "should put assets to config" do
+      it 'should put assets to config' do
         @file = double('file')
         allow(@dump).to receive(:assets_to_dump).and_return(%w[images/* videos])
         allow(@dump).to receive(:create_file).and_yield(@file)
@@ -201,7 +200,7 @@ describe DumpWriter do
         expect(@config[:assets]).to eq({'images/a' => counts, 'images/b' => counts, 'videos' => counts})
       end
 
-      it "should use glob to find files" do
+      it 'should use glob to find files' do
         @file = double('file')
         allow(@dump).to receive(:assets_to_dump).and_return(%w[images/* videos])
         allow(@dump).to receive(:create_file).and_yield(@file)
@@ -217,7 +216,7 @@ describe DumpWriter do
         @dump.write_assets
       end
 
-      it "should pack each file from assets_root_link" do
+      it 'should pack each file from assets_root_link' do
         @file = double('file')
         allow(@dump).to receive(:assets_to_dump).and_return(%w[images/* videos])
         allow(@dump).to receive(:create_file).and_yield(@file)
@@ -235,7 +234,7 @@ describe DumpWriter do
         @dump.write_assets
       end
 
-      it "should pack each file" do
+      it 'should pack each file' do
         @file = double('file')
         allow(@dump).to receive(:assets_to_dump).and_return(%w[images/* videos])
         allow(@dump).to receive(:create_file).and_yield(@file)
@@ -255,7 +254,7 @@ describe DumpWriter do
         @dump.write_assets
       end
 
-      it "should not raise if something fails when packing" do
+      it 'should not raise if something fails when packing' do
         @file = double('file')
         allow(@dump).to receive(:assets_to_dump).and_return(%w[videos])
         allow(@dump).to receive(:create_file).and_yield(@file)
@@ -269,20 +268,20 @@ describe DumpWriter do
         expect(Archive::Tar::Minitar).to receive(:pack_file).with('assets/a.mov', @stream).and_raise('file not found')
         expect(Archive::Tar::Minitar).to receive(:pack_file).with('assets/b.mov', @stream)
 
-        grab_output {
+        grab_output do
           @dump.write_assets
-        }
+        end
       end
 
     end
 
-    describe "write_config" do
-      it "should create file config" do
+    describe 'write_config' do
+      it 'should create file config' do
         expect(@dump).to receive(:create_file).with('config')
         @dump.write_config
       end
 
-      it "should dump column names and values of each row" do
+      it 'should dump column names and values of each row' do
         @file = double('file')
         allow(@dump).to receive(:create_file).and_yield(@file)
         @config.replace({:tables => {'first' => 1, 'second' => 2}, :assets => %w[images videos]})
@@ -292,15 +291,15 @@ describe DumpWriter do
       end
     end
 
-    describe "assets_to_dump" do
-      it "should call rake task assets" do
+    describe 'assets_to_dump' do
+      it 'should call rake task assets' do
         @task = double('task')
         expect(Rake::Task).to receive(:[]).with('assets').and_return(@task)
         expect(@task).to receive(:invoke)
         @dump.assets_to_dump
       end
 
-      it "should return array of assets if separator is colon" do
+      it 'should return array of assets if separator is colon' do
         @task = double('task')
         allow(Rake::Task).to receive(:[]).and_return(@task)
         allow(@task).to receive(:invoke)
@@ -309,7 +308,7 @@ describe DumpWriter do
         end
       end
 
-      it "should return array of assets if separator is comma" do
+      it 'should return array of assets if separator is comma' do
         @task = double('task')
         allow(Rake::Task).to receive(:[]).and_return(@task)
         allow(@task).to receive(:invoke)
@@ -318,7 +317,7 @@ describe DumpWriter do
         end
       end
 
-      it "should return empty array if calling rake task assets raises an exception" do
+      it 'should return empty array if calling rake task assets raises an exception' do
         allow(Rake::Task).to receive(:[]).and_raise('task assets not found')
         DumpRake::Env.with_env(:assets => 'images:videos') do
           expect(@dump.assets_to_dump).to eq([])