webtranslateit-safe 0.4.0 → 0.4.2

data/spec/webtranslateit/safe/gpg_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe WebTranslateIt::Safe::Gpg do
   def def_backup
     {
-      compressed: false,
-      command: 'command',
-      extension: '.foo',
-      filename: 'qweqwe'
+      :compressed => false,
+      :command => 'command',
+      :extension => '.foo',
+      :filename => 'qweqwe'
     }
   end
 
@@ -22,27 +22,27 @@ describe WebTranslateIt::Safe::Gpg do
   describe :process do
 
     before(:each) do
-      @gpg = gpg
-      stub(@gpg).gpg_password_file { 'pwd-file' }
-      stub(@gpg).pipe { '|gpg -BLAH' }
+      @gpg = gpg()
+      stub(@gpg).gpg_password_file {'pwd-file'}
+      stub(@gpg).pipe {'|gpg -BLAH'}
     end
 
     describe 'when active' do
       before(:each) do
-        stub(@gpg).active? { true }
+        stub(@gpg).active? {true}
       end
 
-      it 'adds .gpg extension' do
+      it 'should add .gpg extension' do
         mock(@gpg.backup.extension) << '.gpg'
         @gpg.process
       end
 
-      it 'adds command pipe' do
+      it 'should add command pipe' do
         mock(@gpg.backup.command) << (/\|gpg -BLAH/)
         @gpg.process
       end
 
-      it 'sets compressed' do
+      it 'should set compressed' do
         mock(@gpg.backup).compressed = true
         @gpg.process
       end
@@ -50,20 +50,20 @@ describe WebTranslateIt::Safe::Gpg do
 
     describe 'when inactive' do
       before(:each) do
-        stub(@gpg).active? { false }
+        stub(@gpg).active? {false}
       end
 
-      it 'does not touch extension' do
+      it 'should not touch extension' do
         dont_allow(@gpg.backup.extension) << anything
         @gpg.process
       end
 
-      it 'does not touch command' do
+      it 'should not touch command' do
         dont_allow(@gpg.backup.command) << anything
         @gpg.process
       end
 
-      it 'does not touch compressed' do
+      it 'should not touch compressed' do
         dont_allow(@gpg.backup).compressed = anything
         @gpg.process
       end
@@ -73,27 +73,27 @@ describe WebTranslateIt::Safe::Gpg do
   describe :active? do
 
     describe 'with key' do
-      it 'is true' do
-        expect(gpg(gpg: {key: :foo})).to be_active
+      it 'should be true' do
+        expect(gpg(:gpg => {:key => :foo}).active?).to be_truthy
       end
     end
 
     describe 'with password' do
-      it 'is true' do
-        expect(gpg(gpg: {password: :foo})).to be_active
+      it 'should be true' do
+        expect(gpg(:gpg => {:password => :foo}).active?).to be_truthy
       end
     end
 
     describe 'without key & password' do
-      it 'is false' do
-        expect(gpg).not_to be_active
+      it 'should be false' do
+        expect(gpg.active?).to be_falsy
       end
     end
 
     describe 'with key & password' do
-      it 'raises RuntimeError' do
+      it 'should raise RuntimeError' do
         lambda {
-          gpg(gpg: {key: 'foo', password: 'bar'}).send :active?
+          gpg(:gpg => {:key => 'foo', :password => 'bar'}).send :active?
         }.should raise_error(RuntimeError, "can't use both gpg password and pubkey")
       end
     end
@@ -102,44 +102,44 @@ describe WebTranslateIt::Safe::Gpg do
   describe :pipe do
 
     describe 'with key' do
-      def kgpg(extra = {})
-        gpg({gpg: {key: 'foo', options: 'GPG-OPT'}.merge(extra), options: 'OPT'})
+      def kgpg(extra={})
+        gpg({:gpg => {:key => 'foo', :options => 'GPG-OPT'}.merge(extra), :options => 'OPT'})
       end
 
-      it 'does not call gpg_password_file' do
+      it 'should not call gpg_password_file' do
         g = kgpg
         dont_allow(g).gpg_password_file(anything)
         g.send(:pipe)
       end
 
-      it "uses '-r' and :options" do
+      it "should use '-r' and :options" do
         kgpg.send(:pipe).should == '|gpg GPG-OPT -e -r foo'
       end
 
-      it "uses the 'command' options" do
-        kgpg(command: 'other-gpg').send(:pipe).should == '|other-gpg GPG-OPT -e -r foo'
+      it "should use the 'command' options" do
+        kgpg(:command => 'other-gpg').send(:pipe).should == '|other-gpg GPG-OPT -e -r foo'
       end
     end
 
     describe 'with password' do
       def pgpg(extra = {})
-        returning(gpg({gpg: {password: 'bar', options: 'GPG-OPT'}.merge(extra), options: 'OPT'})) do |g|
-          stub(g).gpg_password_file(anything) { 'pass-file' }
+        returning(gpg({:gpg => {:password => 'bar', :options => 'GPG-OPT'}.merge(extra), :options => 'OPT'})) do |g|
+          stub(g).gpg_password_file(anything) {'pass-file'}
         end
       end
 
-      it "uses '--passphrase-file' and :options" do
+      it "should use '--passphrase-file' and :options" do
         pgpg.send(:pipe).should == '|gpg GPG-OPT -c --passphrase-file pass-file'
       end
 
-      it "uses the 'command' options" do
-        pgpg(command: 'other-gpg').send(:pipe).should == '|other-gpg GPG-OPT -c --passphrase-file pass-file'
+      it "should use the 'command' options" do
+        pgpg(:command => 'other-gpg').send(:pipe).should == '|other-gpg GPG-OPT -c --passphrase-file pass-file'
       end
     end
   end
 
   describe :gpg_password_file do
-    it 'creates password file' do
+    it 'should create password file' do
       file = gpg.send(:gpg_password_file, 'foo')
       expect(File.exist?(file)).to be true
       File.read(file).should == 'foo'

data/spec/webtranslateit/safe/gzip_spec.rb

@@ -4,10 +4,10 @@ describe WebTranslateIt::Safe::Gzip do
 
   def def_backup
     {
-      compressed: false,
-      command: 'command',
-      extension: '.foo',
-      filename: 'qweqwe'
+      :compressed => false,
+      :command => 'command',
+      :extension => '.foo',
+      :filename => 'qweqwe'
     }
   end
 
@@ -25,17 +25,17 @@ describe WebTranslateIt::Safe::Gzip do
     describe 'when not yet compressed' do
       before(:each) { @gzip = gzip }
 
-      it 'adds .gz extension' do
+      it 'should add .gz extension' do
         mock(@backup.extension) << '.gz'
         @gzip.process
       end
 
-      it 'adds |gzip pipe' do
+      it 'should add |gzip pipe' do
         mock(@backup.command) << '|gzip'
         @gzip.process
       end
 
-      it 'sets compressed' do
+      it 'should set compressed' do
         mock(@backup).compressed = true
         @gzip.process
       end
@@ -43,19 +43,19 @@ describe WebTranslateIt::Safe::Gzip do
 
     describe 'when already compressed' do
 
-      before(:each) { @gzip = gzip({}, extension: '.foo', command: 'foobar', compressed: true) }
+      before(:each) { @gzip = gzip({}, :extension => '.foo', :command => 'foobar', :compressed => true) }
 
-      it 'does not touch extension' do
+      it 'should not touch extension' do
         @gzip.process
         @backup.extension.should == '.foo'
       end
 
-      it 'does not touch command' do
+      it 'should not touch command' do
         @gzip.process
         @backup.command.should == 'foobar'
       end
 
-      it 'does not touch compressed' do
+      it 'should not touch compressed' do
         @gzip.process
         @backup.compressed.should == true
       end

data/spec/webtranslateit/safe/local_spec.rb

@@ -3,24 +3,24 @@ require 'spec_helper'
 describe WebTranslateIt::Safe::Local do
   def def_config
     {
-      local: {
-        path: '/:kind~:id~:timestamp'
+      :local => {
+        :path => '/:kind~:id~:timestamp'
       },
-      keep: {
-        local: 2
+      :keep => {
+        :local => 2
       }
     }
   end
 
   def def_backup
     {
-      kind: 'mysqldump',
-      id: 'blog',
-      timestamp: 'NoW',
-      compressed: true,
-      command: 'command',
-      extension: '.foo.gz',
-      filename: 'qweqwe'
+      :kind => 'mysqldump',
+      :id => 'blog',
+      :timestamp => 'NoW',
+      :compressed => true,
+      :command => 'command',
+      :extension => '.foo.gz',
+      :filename => 'qweqwe'
     }
   end
 
@@ -32,19 +32,19 @@ describe WebTranslateIt::Safe::Local do
   end
 
   describe :active? do
-    it 'is true' do
-      expect(local).to be_active
+    it 'should be true' do
+      expect(local.active?).to be_truthy
     end
   end
 
   describe :path do
-    it 'raises RuntimeError when no path' do
+    it 'should raise RuntimeError when no path' do
       lambda {
         local({}).send :path
       }.should raise_error(RuntimeError, 'missing :local/:path')
     end
 
-    it 'uses local/path' do
+    it 'should use local/path' do
       local.send(:path).should == '/mysqldump~blog~NoW'
     end
   end
@@ -53,21 +53,21 @@ describe WebTranslateIt::Safe::Local do
     before(:each) do
       @local = local
       stub(@local).system
-      stub(@local).full_path { 'file-path' }
+      stub(@local).full_path {'file-path'}
       stub(FileUtils).mkdir_p
     end
 
-    it 'calls system to save the file' do
+    it 'should call system to save the file' do
       mock(@local).system('command>file-path')
       @local.send(:save)
     end
 
-    it 'creates directory' do
+    it 'should create directory' do
       mock(FileUtils).mkdir_p('/mysqldump~blog~NoW')
       @local.send(:save)
     end
 
-    it 'sets backup.path' do
+    it 'should set backup.path' do
       mock(@backup).path = 'file-path'
       @local.send(:save)
     end
@@ -77,7 +77,7 @@ describe WebTranslateIt::Safe::Local do
 
       it 'should not create directory'
       it 'should not call system'
-      it 'sets backup.path' do
+      it 'should set backup.path' do
         mock(@backup).path = 'file-path'
         @local.send(:save)
       end
@@ -86,21 +86,21 @@ describe WebTranslateIt::Safe::Local do
 
   describe :cleanup do
     before(:each) do
-      @files = [4, 1, 3, 2].map { |i| "/mysqldump~blog~NoW/qweqwe.#{i}" }
-      stub(File).file?(anything) { true }
-      stub(File).size(anything) { 1 }
+      @files = [4,1,3,2].map { |i| "/mysqldump~blog~NoW/qweqwe.#{i}" }
+      stub(File).file?(anything) {true}
+      stub(File).size(anything) {1}
       stub(File).unlink
     end
 
-    it 'checks [:keep, :local]' do
-      @local = local(def_config.merge(keep: {}))
+    it 'should check [:keep, :local]' do
+      @local = local(def_config.merge(:keep => {}))
       dont_allow(Dir).[]
       @local.send :cleanup
     end
 
-    it 'deletes extra files' do
+    it 'should delete extra files' do
       @local = local
-      mock(Dir).[]('/mysqldump~blog~NoW/qweqwe.*') { @files }
+      mock(Dir).[]('/mysqldump~blog~NoW/qweqwe.*') {@files}
       mock(File).unlink('/mysqldump~blog~NoW/qweqwe.1')
       mock(File).unlink('/mysqldump~blog~NoW/qweqwe.2')
       @local.send :cleanup

data/spec/webtranslateit/safe/mongodump_spec.rb

@@ -3,50 +3,50 @@ require 'spec_helper'
 describe WebTranslateIt::Safe::Mongodump do
   def def_config
     {
-      host: 'prod.example.com',
-      user: 'testuser',
-      password: 'p4ssw0rd'
+      :host => 'prod.example.com',
+      :user => 'testuser',
+      :password => 'p4ssw0rd',
     }
   end
-
+  
   def mongodump(id = :foo, config = def_config)
     WebTranslateIt::Safe::Mongodump.new(id, WebTranslateIt::Safe::Config::Node.new(nil, config))
   end
-
+  
   before(:each) do
-    stub(Time).now.stub!.strftime { 'NOW' }
+    stub(Time).now.stub!.strftime {'NOW'}
     @output_folder = File.join(WebTranslateIt::Safe::TmpFile.tmproot, 'mongodump')
   end
-
+  
   after(:each) { WebTranslateIt::Safe::TmpFile.cleanup }
-
+  
   describe :backup do
     before(:each) do
       @mongo = mongodump
     end
-
+    
     {
-      id: 'foo',
-      kind: 'mongodump',
-      extension: '.tar',
-      filename: 'mongodump-foo.NOW'
+      :id => 'foo',
+      :kind => 'mongodump',
+      :extension => '.tar',
+      :filename => 'mongodump-foo.NOW'
     }.each do |k, v|
-      it "sets #{k} to #{v}" do
+      it "should set #{k} to #{v}" do
         @mongo.backup.send(k).should == v
       end
     end
-
-    it 'sets the command' do
+    
+    it 'should set the command' do
       @mongo.backup.send(:command).should == "mongodump -q \"{xxxx : { \\$ne : 0 } }\" --db foo --host prod.example.com -u testuser -p p4ssw0rd --out #{@output_folder} && cd #{@output_folder} && tar cf - ."
     end
-
+    
     {
-      host: '--host ',
-      user: '-u ',
-      password: '-p '
-    }.each do |key, v|
-      it "does not add #{key} to command if it is not present" do
-        @mongo = mongodump(:foo, def_config.reject! { |k, _v| k == key })
+      :host => '--host ',
+      :user => '-u ',
+      :password => '-p '
+    }.each do |key, v|    
+      it "should not add #{key} to command if it is not present" do
+        @mongo = mongodump(:foo, def_config.reject! {|k,v| k == key})
         @mongo.backup.send(:command).should_not =~ /#{v}/
       end
     end

data/spec/webtranslateit/safe/mysqldump_spec.rb

@@ -4,13 +4,13 @@ describe WebTranslateIt::Safe::Mysqldump do
 
   def def_config(extra = {})
     {
-      options: 'OPTS',
-      user: 'User',
-      password: 'pwd',
-      host: 'localhost',
-      port: 7777,
-      socket: 'socket',
-      skip_tables: [:bar, :baz]
+      :options => 'OPTS',
+      :user => 'User',
+      :password => 'pwd',
+      :host => 'localhost',
+      :port => 7777,
+      :socket => 'socket',
+      :skip_tables => [:bar, :baz]
     }.merge(extra)
   end
 
@@ -19,7 +19,7 @@ describe WebTranslateIt::Safe::Mysqldump do
   end
 
   before(:each) do
-    stub(Time).now.stub!.strftime { 'NOW' }
+    stub(Time).now.stub!.strftime {'NOW'}
   end
 
   after(:each) { WebTranslateIt::Safe::TmpFile.cleanup }
@@ -27,17 +27,17 @@ describe WebTranslateIt::Safe::Mysqldump do
   describe :backup do
     before(:each) do
       @mysql = mysqldump
-      stub(@mysql).mysql_password_file { '/tmp/pwd' }
+      stub(@mysql).mysql_password_file {'/tmp/pwd'}
     end
 
     {
-      id: 'foo',
-      kind: 'mysqldump',
-      extension: '.sql',
-      filename: 'mysqldump-foo.NOW',
-      command: 'mysqldump --defaults-extra-file=/tmp/pwd OPTS --ignore-table=foo.bar --ignore-table=foo.baz foo'
+      :id => 'foo',
+      :kind => 'mysqldump',
+      :extension => '.sql',
+      :filename => 'mysqldump-foo.NOW',
+      :command => 'mysqldump --defaults-extra-file=/tmp/pwd OPTS --ignore-table=foo.bar --ignore-table=foo.baz foo',
     }.each do |k, v|
-      it "sets #{k} to #{v}" do
+      it "should set #{k} to #{v}" do
         @mysql.backup.send(k).should == v
       end
     end
@@ -45,38 +45,38 @@ describe WebTranslateIt::Safe::Mysqldump do
   end
 
   describe :mysql_skip_tables do
-    it 'returns nil if no skip_tables' do
+    it 'should return nil if no skip_tables' do
       config = def_config.dup
       config.delete(:skip_tables)
       m = mysqldump(:foo, WebTranslateIt::Safe::Config::Node.new(nil, config))
-      stub(m).timestamp { 'NOW' }
+      stub(m).timestamp {'NOW'}
       m.send(:mysql_skip_tables).should be_nil
       m.backup.command.should_not match(/ignore-table/)
     end
 
-    it "returns '' if skip_tables empty" do
+    it "should return '' if skip_tables empty" do
       config = def_config.dup
       config[:skip_tables] = []
       m = mysqldump(:foo, WebTranslateIt::Safe::Config::Node.new(nil, config))
-      stub(m).timestamp { 'NOW' }
-      m.send(:mysql_skip_tables).should
+      stub(m).timestamp {'NOW'}
+      m.send(:mysql_skip_tables).should == ''
       m.backup.command.should_not match(/ignore-table/)
     end
 
   end
 
   describe :mysql_password_file do
-    it 'creates passwords file with quoted values' do
-      m = mysqldump(:foo, def_config(password: '#qwe"asd\'zxc'))
+    it 'should create passwords file with quoted values' do
+      m = mysqldump(:foo, def_config(:password => '#qwe"asd\'zxc'))
       file = m.send(:mysql_password_file)
-      File.exist?(file).should
-      File.read(file).should == <<~PWD
-        [mysqldump]
-        user = "User"
-        password = "#qwe\\"asd'zxc"
-        socket = "socket"
-        host = "localhost"
-        port = 7777
+      File.exist?(file).should == true
+      File.read(file).should == <<-PWD
+[mysqldump]
+user = "User"
+password = "#qwe\\"asd'zxc"
+socket = "socket"
+host = "localhost"
+port = 7777
       PWD
     end
   end

data/spec/webtranslateit/safe/pgdump_spec.rb

@@ -4,12 +4,12 @@ describe WebTranslateIt::Safe::Pgdump do
 
   def def_config
     {
-      options: 'OPTS',
-      user: 'User',
-      password: 'pwd',
-      host: 'localhost',
-      port: 7777,
-      skip_tables: [:bar, :baz]
+      :options => 'OPTS',
+      :user => 'User',
+      :password => 'pwd',
+      :host => 'localhost',
+      :port => 7777,
+      :skip_tables => [:bar, :baz]
     }
   end
 
@@ -18,7 +18,7 @@ describe WebTranslateIt::Safe::Pgdump do
   end
 
   before(:each) do
-    stub(Time).now.stub!.strftime { 'NOW' }
+    stub(Time).now.stub!.strftime {'NOW'}
   end
 
   after(:each) { WebTranslateIt::Safe::TmpFile.cleanup }
@@ -29,13 +29,13 @@ describe WebTranslateIt::Safe::Pgdump do
     end
 
     {
-      id: 'foo',
-      kind: 'pgdump',
-      extension: '.sql',
-      filename: 'pgdump-foo.NOW',
-      command: "pg_dump OPTS --username='User' --host='localhost' --port='7777' foo"
+      :id => 'foo',
+      :kind => 'pgdump',
+      :extension => '.sql',
+      :filename => 'pgdump-foo.NOW',
+      :command => "pg_dump OPTS --username='User' --host='localhost' --port='7777' foo",
     }.each do |k, v|
-      it "sets #{k} to #{v}" do
+      it "should set #{k} to #{v}" do
         @pg.backup.send(k).should == v
       end
     end

data/spec/webtranslateit/safe/s3_spec.rb

@@ -165,4 +165,4 @@ describe WebTranslateIt::Safe::S3 do
       @s3.send(:save)
     end
   end
-end
+end

data/spec/webtranslateit/safe/svndump_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe WebTranslateIt::Safe::Svndump do
   def def_config
     {
-      options: 'OPTS',
-      repo_path: 'bar/baz'
+      :options => 'OPTS',
+      :repo_path => 'bar/baz'
     }
   end
 
@@ -13,7 +13,7 @@ describe WebTranslateIt::Safe::Svndump do
   end
 
   before(:each) do
-    stub(Time).now.stub!.strftime { 'NOW' }
+    stub(Time).now.stub!.strftime {'NOW'}
   end
 
   after(:each) { WebTranslateIt::Safe::TmpFile.cleanup }
@@ -24,13 +24,13 @@ describe WebTranslateIt::Safe::Svndump do
     end
 
     {
-      id: 'foo',
-      kind: 'svndump',
-      extension: '.svn',
-      filename: 'svndump-foo.NOW',
-      command: 'svnadmin dump OPTS bar/baz'
+      :id => 'foo',
+      :kind => 'svndump',
+      :extension => '.svn',
+      :filename => 'svndump-foo.NOW',
+      :command => 'svnadmin dump OPTS bar/baz',
     }.each do |k, v|
-      it "sets #{k} to #{v}" do
+      it "should set #{k} to #{v}" do
         @svn.backup.send(k).should == v
       end
     end

data/webtranslateit-safe.gemspec

@@ -1,4 +1,3 @@
-require 'English'
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'webtranslateit/safe/version'
@@ -9,18 +8,18 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Edouard Briere', 'Vitaly Kushner']
   spec.email         = ['support@webtranslateit.com']
   spec.required_ruby_version = '>= 3.2'
-  spec.description = <<~DESC
-    WebTranslateIt-Safe is a simple tool to backup databases (MySQL and PostgreSQL), Subversion repositories (with svndump) and just files.
-    Backups can be stored locally or remotely and can be enctypted.
-    Remote storage is supported on Amazon S3, Rackspace Cloud Files, or just plain FTP/SFTP.
+  spec.description = <<-DESC
+WebTranslateIt-Safe is a simple tool to backup databases (MySQL and PostgreSQL), Subversion repositories (with svndump) and just files.
+Backups can be stored locally or remotely and can be enctypted.
+Remote storage is supported on Amazon S3, Rackspace Cloud Files, or just plain FTP/SFTP.
   DESC
   spec.summary       = 'Backup filesystem and databases (MySQL and PostgreSQL) locally or to a remote server/service (with encryption)'
-  spec.homepage      = 'https://github.com/webtranslateit/safe'
+  spec.homepage      = 'http://github.com/webtranslateit/safe'
   spec.license       = 'MIT'
 
   spec.default_executable = 'webtranslateit-safe'
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']