backup 3.0.26 → 3.0.27

data/spec/storage/dropbox_spec.rb

@@ -396,14 +396,16 @@ describe Backup::Storage::Dropbox do
     end
 
     describe '#email' do
+      before do
+        Backup::Logger.expects(:warn).with do |err|
+          err.message.should match(
+            "Dropbox#email has been deprecated as of backup v.3.0.17"
+          )
+        end
+      end
+
       context 'when set directly' do
         it 'should issue a deprecation warning' do
-          Backup::Logger.expects(:warn).with do |err|
-            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
-                "  Backup::Storage::Dropbox.email has been deprecated " +
-                  "as of backup v.3.0.17"
-          end
-
           Backup::Storage::Dropbox.new(model) do |storage|
             storage.email = 'foo'
           end
@@ -412,12 +414,6 @@ describe Backup::Storage::Dropbox do
 
       context 'when set as a default' do
         it 'should issue a deprecation warning' do
-          Backup::Logger.expects(:warn).with do |err|
-            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
-                "  Backup::Storage::Dropbox.email has been deprecated " +
-                  "as of backup v.3.0.17"
-          end
-
           Backup::Storage::Dropbox.defaults do |storage|
             storage.email = 'foo'
           end
@@ -427,14 +423,16 @@ describe Backup::Storage::Dropbox do
     end
 
     describe '#password' do
+      before do
+        Backup::Logger.expects(:warn).with do |err|
+          err.message.should match(
+            "Dropbox#password has been deprecated as of backup v.3.0.17"
+          )
+        end
+      end
+
       context 'when set directly' do
         it 'should issue a deprecation warning' do
-          Backup::Logger.expects(:warn).with do |err|
-            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
-                "  Backup::Storage::Dropbox.password has been deprecated " +
-                  "as of backup v.3.0.17"
-          end
-
           Backup::Storage::Dropbox.new(model) do |storage|
             storage.password = 'foo'
           end
@@ -443,12 +441,6 @@ describe Backup::Storage::Dropbox do
 
       context 'when set as a default' do
         it 'should issue a deprecation warning' do
-          Backup::Logger.expects(:warn).with do |err|
-            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
-                "  Backup::Storage::Dropbox.password has been deprecated " +
-                  "as of backup v.3.0.17"
-          end
-
           Backup::Storage::Dropbox.defaults do |storage|
             storage.password = 'foo'
           end
@@ -458,14 +450,16 @@ describe Backup::Storage::Dropbox do
     end
 
     describe '#timeout' do
+      before do
+        Backup::Logger.expects(:warn).with do |err|
+          err.message.should match(
+            "Dropbox#timeout has been deprecated as of backup v.3.0.21"
+          )
+        end
+      end
+
       context 'when set directly' do
         it 'should issue a deprecation warning' do
-          Backup::Logger.expects(:warn).with do |err|
-            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
-                "  Backup::Storage::Dropbox.timeout has been deprecated " +
-                  "as of backup v.3.0.21"
-          end
-
           Backup::Storage::Dropbox.new(model) do |storage|
             storage.timeout = 'foo'
           end
@@ -474,12 +468,6 @@ describe Backup::Storage::Dropbox do
 
       context 'when set as a default' do
         it 'should issue a deprecation warning' do
-          Backup::Logger.expects(:warn).with do |err|
-            err.message.should == "ConfigurationError: [DEPRECATION WARNING]\n" +
-                "  Backup::Storage::Dropbox.timeout has been deprecated " +
-                  "as of backup v.3.0.21"
-          end
-
           Backup::Storage::Dropbox.defaults do |storage|
             storage.timeout = 'foo'
           end

data/spec/syncer/cloud/base_spec.rb

@@ -254,7 +254,7 @@ describe 'Backup::Syncer::Cloud::Base' do
           "\s\sGenerating checksums for '/dir/to/sync'"
         )
         sync_context.expects(:`).with(
-          "find /dir/to/sync -print0 | xargs -0 openssl md5 2> /dev/null"
+          "find '/dir/to/sync' -print0 | xargs -0 openssl md5 2> /dev/null"
         ).returns('MD5(tmp/foo)= 0123456789abcdefghijklmnopqrstuv')
 
         sync_context.send(:local_hashes).should ==

data/templates/cli/utility/encryptor/gpg

@@ -1,12 +1,27 @@
   ##
   # GPG [Encryptor]
   #
+  # Setting up #keys, as well as #gpg_homedir and #gpg_config,
+  # would be best set in config.rb using Encryptor::GPG.defaults
+  #
   encrypt_with GPG do |encryption|
-    encryption.key = <<-KEY
+    # Setup public keys for #recipients
+    encryption.keys = {}
+    encryption.keys['user@domain.com'] = <<-KEY
       -----BEGIN PGP PUBLIC KEY BLOCK-----
       Version: GnuPG v1.4.11 (Darwin)
 
           <Your GPG Public Key Here>
       -----END PGP PUBLIC KEY BLOCK-----
     KEY
+
+    # Specify mode (:asymmetric, :symmetric or :both)
+    encryption.mode = :both # defaults to :asymmetric
+
+    # Specify recipients from #keys (for :asymmetric encryption)
+    encryption.recipients = ['user@domain.com']
+
+    # Specify passphrase or passphrase_file (for :symmetric encryption)
+    encryption.passphrase = 'a secret'
+    # encryption.passphrase_file = '~/backup_passphrase'
   end

metadata

@@ -1,64 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: backup
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 0
-  - 26
-  version: 3.0.26
+version: !ruby/object:Gem::Version
+  version: 3.0.27
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-17 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 15
-        - 4
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.15.4
     - - <
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.15.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: 
 email: meskyanichi@gmail.com
-executables: 
+executables:
 - backup
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -132,8 +129,11 @@ files:
 - spec-live/README
 - spec-live/backups/config.rb
 - spec-live/backups/config.yml.template
+- spec-live/backups/models.rb
 - spec-live/compressor/custom_spec.rb
 - spec-live/compressor/gzip_spec.rb
+- spec-live/encryptor/gpg_keys.rb
+- spec-live/encryptor/gpg_spec.rb
 - spec-live/notifier/mail_spec.rb
 - spec-live/spec_helper.rb
 - spec-live/storage/dropbox_spec.rb
@@ -243,35 +243,34 @@ files:
 - templates/storage/dropbox/authorization_url.erb
 - templates/storage/dropbox/authorized.erb
 - templates/storage/dropbox/cache_file_written.erb
-has_rdoc: true
 homepage: http://rubygems.org/gems/backup
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Backup is a RubyGem, written for UNIX-like operating systems, that allows you to easily perform backup operations on both your remote and local environments. It provides you with an elegant DSL in Ruby for modeling 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.
+summary: Backup is a RubyGem, written for UNIX-like operating systems, that allows
+  you to easily perform backup operations on both your remote and local environments.
+  It provides you with an elegant DSL in Ruby for modeling 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: