backup 4.2.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5add3999b96619c0b921169ed52e635cf4b61c56
-  data.tar.gz: 72f1c297b011a1487bc2ddb46f31cb9ce94afad6
+  metadata.gz: c7e4e7ea9006f973c8df272ad4520265fb5a25e1
+  data.tar.gz: ce45e91cc9d2b80f721cbcda2f4012fce936fb7f
 SHA512:
-  metadata.gz: 605f7883e601a0f2552fc4db82948642ab3f839219bb671141aae99099fe8eccd51805322cfd8377d9860783f3cd4c325f04789217ab77a3e88ee19800a0ebe4
-  data.tar.gz: 10b798e65ca1c71ebf4d17be9f8b8ea56de44ed801c11b71d57864c96512ff3d1d7092bb41c87c4eca43c590d3552e73afd8dbb3d9410eff814431e3af31795c
+  metadata.gz: 866350af1103a7eeb171bd80d01c73d4a728f31eda444823b4250d3788d09402f6cbca600a6dfc0d48e05c0c74a2746fd68dee230b847acff3ba7d92a2a8bb07
+  data.tar.gz: b0585f85c576423c12291990521ad7d33a82fc6d1cadf97b009e332bbc8e0a42840b3debb9cd382291115e2282bbaa1f5b18088fa0dd6fde98e8edacc7f90e2b

data/README.md

@@ -14,10 +14,10 @@ was built with modularity, extensibility and simplicity in mind.
 
 Please use the Backup features [issue tracker][Features] to suggest new features.
 Only use the Backup gem [issue tracker][Issues] for bugs and other issues.
-We're also available on [Gitter][] for questions and problems.
+We're also available on [Gitter] for questions and problems.
 
-**Copyright (c) 2009-2015 [Michael van Rooijen][] ( [@meskyanichi][] )**  
-Released under the **MIT** [License](LICENSE.md).
+**Copyright (c) 2009-2016 [Michael van Rooijen][] ( [@mrrooijen] )**  
+Released under the **MIT** [LICENSE](LICENSE).
 
 [Installation]:  http://backup.github.io/backup/v4/installation
 [Release Notes]: http://backup.github.io/backup/v4/release-notes
@@ -25,5 +25,5 @@ Released under the **MIT** [License](LICENSE.md).
 [Issues]: https://github.com/backup/backup/issues
 [Features]: https://github.com/backup/backup-features/issues
 [Gitter]: https://gitter.im/backup/backup?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-[Michael van Rooijen]: http://michaelvanrooijen.com
-[@meskyanichi]: http://twitter.com/#!/meskyanichi
+[Michael van Rooijen]: http://github.com/mrrooijen
+[@mrrooijen]: http://twitter.com/mrrooijen

data/lib/backup.rb

@@ -49,6 +49,7 @@ module Backup
     autoload :SCP,        File.join(STORAGE_PATH, 'scp')
     autoload :RSync,      File.join(STORAGE_PATH, 'rsync')
     autoload :Local,      File.join(STORAGE_PATH, 'local')
+    autoload :Qiniu,      File.join(STORAGE_PATH, 'qiniu')
   end
 
   ##

data/lib/backup/config/dsl.rb

@@ -30,7 +30,7 @@ module Backup
               ['MySQL', 'PostgreSQL', 'MongoDB', 'Redis', 'Riak', 'OpenLDAP', 'SQLite'],
               # Storages
               ['S3', 'CloudFiles', 'Ninefold', 'Dropbox', 'FTP',
-              'SFTP', 'SCP', 'RSync', 'Local'],
+              'SFTP', 'SCP', 'RSync', 'Local', 'Qiniu'],
               # Compressors
               ['Gzip', 'Bzip2', 'Custom', 'Pbzip2', 'Lzma'],
               # Encryptors

data/lib/backup/notifier/mail.rb

@@ -215,11 +215,8 @@ module Backup
             when 'test' then {}
             end
 
-        ::Mail.defaults do
-          delivery_method method.to_sym, options
-        end
-
         email = ::Mail.new
+        email.delivery_method method.to_sym, options
         email.to       = to
         email.from     = from
         email.cc       = cc

data/lib/backup/storage/dropbox.rb

@@ -210,27 +210,3 @@ module Backup
     end
   end
 end
-
-# Patch for dropbox-ruby-sdk-1.5.1
-class DropboxClient
-  class ChunkedUploader
-    def upload(chunk_size = 1024**2 * 4)
-      while @offset < @total_size
-        @file_obj.seek(@offset) unless @file_obj.pos == @offset
-        data = @file_obj.read(chunk_size)
-
-        begin
-          resp = @client.parse_response(
-            @client.partial_chunked_upload(data, @upload_id, @offset)
-          )
-        rescue DropboxError => err
-          resp = JSON.parse(err.http_response.body) rescue {}
-          raise err unless resp['offset']
-        end
-
-        @offset = resp['offset']
-        @upload_id ||= resp['upload_id']
-      end
-    end
-  end
-end

data/lib/backup/storage/qiniu.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+require 'qiniu'
+
+module Backup
+  module Storage
+    class Qiniu < Base
+      include Storage::Cycler
+      class Error < Backup::Error; end
+
+      ##
+      # Qiniu API credentials
+      attr_accessor :access_key, :secret_key
+
+      ##
+      # Qiniu bucket name
+      attr_accessor :bucket
+
+      def initialize(model, storage_id = nil)
+        super
+
+        @path ||= 'backups'
+
+        check_configuration
+        config_credentials
+      end
+
+      private
+      def transfer!
+        package.filenames.each do |filename|
+          src = File.join(Config.tmp_path, filename)
+          dest = File.join(remote_path, filename)
+          Logger.info "Storing '#{ dest }'..."
+
+          ::Qiniu.upload_file(uptoken: ::Qiniu.generate_upload_token,
+                              bucket: bucket,
+                              file: src,
+                              key: dest)
+        end
+      end
+
+      # Called by the Cycler.
+      # Any error raised will be logged as a warning.
+      def remove!(package)
+        Logger.info "Removing backup package dated #{ package.time }..."
+        remote_path = remote_path_for(package)
+        package.filenames.each do |filename|
+          ::Qiniu.delete(bucket, File.join(remote_path, filename))
+        end
+      end
+
+      def check_configuration
+         required = %w{ access_key secret_key bucket }
+
+        raise Error, <<-EOS if required.map {|name| send(name) }.any?(&:nil?)
+          Configuration Error
+          #{ required.map {|name| "##{ name }"}.join(', ') } are all required
+        EOS
+      end
+
+      def config_credentials
+        ::Qiniu.establish_connection!(access_key: access_key, secret_key: secret_key)
+      end
+    end
+  end
+end

data/lib/backup/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Backup
-  VERSION = '4.2.3'
+  VERSION = '4.3.0'
 end

data/templates/cli/storages/qiniu

@@ -0,0 +1,12 @@
+  ##
+  # Qiniu [Storage]
+  #
+  store_with Qiniu do |qiniu|
+    # Qiniu Credentials
+    qiniu.access_key = "my_access_key"
+    qiniu.secret_key = "my_secret_key"
+
+    qiniu.bucket     = "bucket-name"
+    qiniu.keep       = 5
+    qiniu.path       = "path/to/backups"
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -576,14 +576,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: memoizable
   requirement: !ruby/object:Gem::Requirement
@@ -604,14 +604,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.1
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: mini_portile
   requirement: !ruby/object:Gem::Requirement
@@ -702,14 +702,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -753,75 +767,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: polyglot
+  name: qiniu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 6.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 6.5.1
 - !ruby/object:Gem::Dependency
-  name: simple_oauth
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: ruby-hmac
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: treetop
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.15
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.15
+        version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -890,7 +918,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.md
 - README.md
 - bin/backup
 - lib/backup.rb
@@ -952,7 +979,7 @@ files:
 - lib/backup/storage/dropbox.rb
 - lib/backup/storage/ftp.rb
 - lib/backup/storage/local.rb
-- lib/backup/storage/ninefold.rb
+- lib/backup/storage/qiniu.rb
 - lib/backup/storage/rsync.rb
 - lib/backup/storage/s3.rb
 - lib/backup/storage/scp.rb
@@ -1004,7 +1031,7 @@ files:
 - templates/cli/storages/dropbox
 - templates/cli/storages/ftp
 - templates/cli/storages/local
-- templates/cli/storages/ninefold
+- templates/cli/storages/qiniu
 - templates/cli/storages/rsync
 - templates/cli/storages/s3
 - templates/cli/storages/scp

data/LICENSE.md

@@ -1,24 +0,0 @@
-
-Copyright (c) 2009-2013 Michael van Rooijen ( [@meskyanichi](http://twitter.com/#!/meskyanichi) )
-=================================================================================================
-
-The "Backup" RubyGem is released under the **MIT LICENSE**
-----------------------------------------------------------
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/lib/backup/storage/ninefold.rb

@@ -1,74 +0,0 @@
-# encoding: utf-8
-require 'fog'
-
-module Backup
-  module Storage
-    class Ninefold < Base
-      include Storage::Cycler
-      class Error < Backup::Error; end
-
-      ##
-      # Ninefold Credentials
-      attr_accessor :storage_token, :storage_secret
-
-      def initialize(model, storage_id = nil)
-        super
-
-        @path ||= 'backups'
-        path.sub!(/^\//, '')
-      end
-
-      private
-
-      def connection
-        @connection ||= Fog::Storage.new(
-          :provider                => 'Ninefold',
-          :ninefold_storage_token  => storage_token,
-          :ninefold_storage_secret => storage_secret
-        )
-      end
-
-      def transfer!
-        directory = directory_for(remote_path, true)
-        package.filenames.each do |filename|
-          src = File.join(Config.tmp_path, filename)
-          dest = File.join(remote_path, filename)
-          Logger.info "Storing '#{ dest }'..."
-          File.open(src, 'r') do |file|
-            directory.files.create(:key => filename, :body => file)
-          end
-        end
-      end
-
-      ##
-      # Queries the connection for the directory for the given +remote_path+
-      # Returns nil if not found, or creates the directory if +create+ is true.
-      def directory_for(remote_path, create = false)
-        directory = connection.directories.get(remote_path)
-        if directory.nil? && create
-          directory = connection.directories.create(:key => remote_path)
-        end
-        directory
-      end
-
-      # Called by the Cycler.
-      # Any error raised will be logged as a warning.
-      def remove!(package)
-        Logger.info "Removing backup package dated #{ package.time }..."
-
-        remote_path = remote_path_for(package)
-        directory = directory_for(remote_path)
-
-        raise Error, "Directory at '#{ remote_path }' not found" unless directory
-
-        package.filenames.each do |filename|
-          file = directory.files.get(filename)
-          file.destroy if file
-        end
-
-        directory.destroy
-      end
-
-    end
-  end
-end

data/templates/cli/storages/ninefold

@@ -1,10 +0,0 @@
-  ##
-  # Ninefold Cloud Storage [Storage]
-  #
-  store_with Ninefold do |nf|
-    nf.storage_token   = "my_storage_token"
-    nf.storage_secret  = "my_storage_secret"
-    nf.path            = "/path/to/my/backups"
-    nf.keep            = 10
-    # nf.keep            = Time.now - 2592000 # Remove all backups older than 1 month.
-  end