backup 3.0.15 → 3.0.16

data/spec/archive_spec.rb

@@ -9,8 +9,8 @@ describe Backup::Archive do
       a.add '/home/rspecuser/somefile'
       a.add '/home/rspecuser/logs/'
       a.add '/home/rspecuser/dotfiles/'
-      a.exclude '/home/rspecuser/excludefile'
-      a.exclude '/home/rspecuser/excludedir/'
+      a.exclude '/home/rspecuser/badfile'
+      a.exclude '/home/rspecuser/wrongdir/'
     end
   end
 
@@ -51,7 +51,7 @@ describe Backup::Archive do
 
     it 'should return a tar -c friendly string' do
       archive.send(:paths_to_exclude).should ==
-      "--exclude={'/home/rspecuser/excludefile','/home/rspecuser/excludedir/'}"
+      "--exclude='/home/rspecuser/badfile' --exclude='/home/rspecuser/wrongdir/'"
     end
   end
 
@@ -64,7 +64,7 @@ describe Backup::Archive do
     context 'when both paths were added and paths that should be excluded were added' do
       it 'should render both the syntax for the paths that be included as well as excluded' do
         archive.expects(:mkdir).with(File.join(Backup::TMP_PATH, Backup::TRIGGER, 'archive'))
-        archive.expects(:run).with("tar -c -f '#{File.join(Backup::TMP_PATH, Backup::TRIGGER, 'archive', "#{:dummy_archive}.tar")}' --exclude={'/home/rspecuser/excludefile','/home/rspecuser/excludedir/'} '/home/rspecuser/somefile' '/home/rspecuser/logs/' '/home/rspecuser/dotfiles/' 2> /dev/null")
+        archive.expects(:run).with("tar -c -f '#{File.join(Backup::TMP_PATH, Backup::TRIGGER, 'archive', "#{:dummy_archive}.tar")}' --exclude='/home/rspecuser/badfile' --exclude='/home/rspecuser/wrongdir/' '/home/rspecuser/somefile' '/home/rspecuser/logs/' '/home/rspecuser/dotfiles/' 2> /dev/null")
         archive.expects(:utility).with(:tar).returns(:tar)
         archive.perform!
       end

data/spec/compressor/bzip2_spec.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Backup::Compressor::Bzip2 do
+  let(:compressor) { Backup::Compressor::Bzip2.new }
+
+  before do
+    Backup::Model.extension = 'tar'
+  end
+
+  describe 'the options' do
+    it do
+      compressor.send(:best).should == []
+    end
+
+    it do
+      compressor.send(:fast).should == []
+    end
+  end
+
+  describe '#perform!' do
+    before do
+      [:run, :utility].each { |method| compressor.stubs(method) }
+      Backup::Logger.stubs(:message)
+    end
+
+    it 'should perform the compression' do
+      compressor.expects(:utility).with(:bzip2).returns(:bzip2)
+      compressor.expects(:run).with("bzip2  '#{ File.join(Backup::TMP_PATH, "#{ Backup::TIME }.#{ Backup::TRIGGER }.tar") }'")
+      compressor.perform!
+    end
+
+    it 'should perform the compression with the --best and --fast options' do
+      compressor = Backup::Compressor::Bzip2.new do |c|
+        c.best = true
+        c.fast = true
+      end
+
+      compressor.stubs(:utility).returns(:bzip2)
+      compressor.expects(:run).with("bzip2 --best --fast '#{ File.join(Backup::TMP_PATH, "#{ Backup::TIME }.#{ Backup::TRIGGER }.tar") }'")
+      compressor.perform!
+    end
+
+    it 'should set the class variable @extension (Backup::Model.extension) to .bz2' do
+      compressor.stubs(:utility).returns(:bzip2)
+      compressor.expects(:run)
+
+      Backup::Model.extension.should == 'tar'
+      compressor.perform!
+      Backup::Model.extension.should == 'tar.bz2'
+    end
+
+    it 'should log' do
+      Backup::Logger.expects(:message).with("Backup::Compressor::Bzip2 started compressing the archive.")
+      compressor.perform!
+    end
+  end
+end

data/spec/encryptor/gpg_spec.rb

@@ -20,19 +20,19 @@ describe Backup::Encryptor::GPG do
   end
 
   context "when a block is provided" do
-    it do
+    it "should strip initial whitespace from key lines" do
       key = <<-KEY
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-        Version: GnuPG v1.4.11 (Darwin)
-
-        mQENBE12G/8BCAC4mnlSMYMBwBYTHe5zURcnYYNCORPWOr0iXGiLWuKxYtrDQyLm
-        X2Nws44Iz7Wp7AuJRAjkitf1cRBgXyDu8wuogXO7JqPmtsUdBCABz9w5NH6IQjgR
-        WNa3g2n0nokA7Zr5FA4GXoEaYivfbvGiyNpd6P4okH+//G2p+3FIryu5xz+89D1b
-        =Yvhg
-        -----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (Darwin)
+
+mQENBE12G/8BCAC4mnlSMYMBwBYTHe5zURcnYYNCORPWOr0iXGiLWuKxYtrDQyLm
+X2Nws44Iz7Wp7AuJRAjkitf1cRBgXyDu8wuogXO7JqPmtsUdBCABz9w5NH6IQjgR
+WNa3g2n0nokA7Zr5FA4GXoEaYivfbvGiyNpd6P4okH+//G2p+3FIryu5xz+89D1b
+=Yvhg
+-----END PGP PUBLIC KEY BLOCK-----
       KEY
 
-      encryptor.key.should == key.gsub(/^(\s|\t)+/, '')
+      encryptor.key.should == key
     end
   end
 

data/spec/notifier/presently_spec.rb

@@ -0,0 +1,99 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Backup::Notifier::Presently do
+  let(:notifier) do
+    Backup::Notifier::Presently.new do |presently|
+      presently.user_name = 'user_name'
+      presently.subdomain = 'subdomain'
+      presently.password   = 'password'
+      presently.group_id   = 'group_id'
+    end
+  end
+
+  it do
+    notifier.user_name.should == 'user_name'
+    notifier.subdomain.should == 'subdomain'
+    notifier.password.should   == 'password'
+    notifier.group_id.should   == 'group_id'
+
+    notifier.on_success.should == true
+    notifier.on_failure.should == true
+  end
+
+  describe 'defaults' do
+    it do
+      Backup::Configuration::Notifier::Presently.defaults do |presently|
+        presently.user_name  = 'old_user_name'
+        presently.on_success = false
+        presently.on_failure = true
+      end
+      notifier           = Backup::Notifier::Presently.new do |presently|
+        presently.user_name = 'new_user_name'
+      end
+
+      notifier.user_name.should  == 'new_user_name'
+      notifier.on_success.should == false
+      notifier.on_failure.should == true
+    end
+  end
+
+  describe '#initialize' do
+    it do
+      Backup::Notifier::Presently.any_instance.expects(:set_defaults!)
+      Backup::Notifier::Presently.new
+    end
+  end
+
+  describe '#perform!' do
+    let(:model) { Backup::Model.new('blah', 'blah') {} }
+    before do
+      notifier.on_success = false
+      notifier.on_failure = false
+    end
+
+    context "when successful" do
+      it do
+        Backup::Logger.expects(:message).with("Backup::Notifier::Presently started notifying about the process.")
+        notifier.expects("notify_success!")
+        notifier.on_success = true
+        notifier.perform!(model)
+      end
+
+      it do
+        notifier.expects("notify_success!").never
+        notifier.on_success = false
+        notifier.perform!(model)
+      end
+    end
+
+    context "when failed" do
+      it do
+        Backup::Logger.expects(:message).with("Backup::Notifier::Presently started notifying about the process.")
+        notifier.expects("notify_failure!")
+        notifier.on_failure = true
+        notifier.perform!(model, Exception.new)
+      end
+
+      it do
+        notifier.expects("notify_failure!").never
+        notifier.on_failure = false
+        notifier.perform!(model, Exception.new)
+      end
+    end
+  end
+
+  describe Backup::Notifier::Presently::Client do
+    let(:client) do
+      Backup::Notifier::Presently::Client.new('subdomain', 'user_name', 'password', 'group_id')
+    end
+
+    it do
+      client.user_name.should == 'user_name'
+      client.subdomain.should == 'subdomain'
+      client.password.should   == 'password'
+      client.group_id.should == 'group_id'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -19,3 +19,7 @@ module Backup
   TRIGGER = 'myapp'
   TIME = Time.now.strftime("%Y.%m.%d.%H.%M.%S")
 end
+
+unless @put_ruby_version
+  puts @put_ruby_version = "\n\nRuby version: #{ENV['rvm_ruby_string']}\n\n"
+end

metadata

@@ -2,7 +2,7 @@
 name: backup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.15
+  version: 3.0.16
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 Z
+date: 2011-06-03 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -33,10 +34,9 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- .infinity_test
-- .rspec
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.md
 - README.md
 - backup.gemspec
@@ -45,9 +45,11 @@ files:
 - lib/backup/archive.rb
 - lib/backup/cli.rb
 - lib/backup/compressor/base.rb
+- lib/backup/compressor/bzip2.rb
 - lib/backup/compressor/gzip.rb
 - lib/backup/configuration/base.rb
 - lib/backup/configuration/compressor/base.rb
+- lib/backup/configuration/compressor/bzip2.rb
 - lib/backup/configuration/compressor/gzip.rb
 - lib/backup/configuration/database/base.rb
 - lib/backup/configuration/database/mongodb.rb
@@ -61,6 +63,7 @@ files:
 - lib/backup/configuration/notifier/base.rb
 - lib/backup/configuration/notifier/campfire.rb
 - lib/backup/configuration/notifier/mail.rb
+- lib/backup/configuration/notifier/presently.rb
 - lib/backup/configuration/notifier/twitter.rb
 - lib/backup/configuration/storage/base.rb
 - lib/backup/configuration/storage/cloudfiles.rb
@@ -89,6 +92,7 @@ files:
 - lib/backup/notifier/binder.rb
 - lib/backup/notifier/campfire.rb
 - lib/backup/notifier/mail.rb
+- lib/backup/notifier/presently.rb
 - lib/backup/notifier/templates/notify_failure.erb
 - lib/backup/notifier/templates/notify_success.erb
 - lib/backup/notifier/twitter.rb
@@ -106,6 +110,7 @@ files:
 - lib/backup/syncer/s3.rb
 - lib/backup/version.rb
 - lib/templates/archive
+- lib/templates/compressor/bzip2
 - lib/templates/compressor/gzip
 - lib/templates/database/mongodb
 - lib/templates/database/mysql
@@ -115,6 +120,7 @@ files:
 - lib/templates/encryptor/openssl
 - lib/templates/notifier/campfire
 - lib/templates/notifier/mail
+- lib/templates/notifier/presently
 - lib/templates/notifier/twitter
 - lib/templates/readme
 - lib/templates/storage/cloudfiles
@@ -128,6 +134,7 @@ files:
 - lib/templates/syncer/s3
 - spec/archive_spec.rb
 - spec/backup_spec.rb
+- spec/compressor/bzip2_spec.rb
 - spec/compressor/gzip_spec.rb
 - spec/configuration/base_spec.rb
 - spec/configuration/compressor/gzip_spec.rb
@@ -161,6 +168,7 @@ files:
 - spec/model_spec.rb
 - spec/notifier/campfire_spec.rb
 - spec/notifier/mail_spec.rb
+- spec/notifier/presently_spec.rb
 - spec/notifier/twitter_spec.rb
 - spec/spec_helper.rb
 - spec/storage/base_spec.rb
@@ -175,6 +183,7 @@ files:
 - spec/syncer/rsync_spec.rb
 - spec/syncer/s3_spec.rb
 - spec/version_spec.rb
+has_rdoc: true
 homepage: http://rubygems.org/gems/backup
 licenses: []
 
@@ -198,10 +207,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: "Backup is a RubyGem (for UNIX-like operating systems: Linux, Mac OSX) that allows you to configure and perform backups in a simple manner using an elegant Ruby DSL. It supports various databases (MySQL, PostgreSQL, MongoDB and Redis), it supports various storage locations (Amazon S3, Rackspace Cloud Files, Dropbox, any remote server through FTP, SFTP, SCP and RSync), it provide Syncers (RSync, S3) for efficient backups, it can archive files and directories, it can cycle backups, it can do incremental backups, it can compress backups, it can encrypt backups (OpenSSL or GPG), it can notify you about successful and/or failed backups (Email, Twitter and Campfire). It is very extensible and easy to add new functionality to. It's easy to use."
+summary: Backup is a RubyGem, written for Linux and Mac OSX, that allows you to easily perform backup operations on both your remote, as well as your local environment. It provides you with an elegant DSL in Ruby for modeling (configuring) your backups. Backup has built-in support for various databases, storage protocols/services, syncers, compressors, encryptors and notifiers which you can mix and match. It was built with modularity, extensibility and simplicity in mind.
 test_files: []
 
-has_rdoc: 

data/.infinity_test

@@ -1,7 +0,0 @@
-infinity_test do
-  heuristics do
-    add('lib/') do |file|
-      run :all => :tests
-    end
-  end
-end

data/.rspec

@@ -1,3 +0,0 @@
---format Fuubar
---color
---tty