backup-ssh 4.1.10 → 4.4.0

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/storage/s3.rb

@@ -58,6 +58,7 @@ module Backup
       # Supported values:
       #
       # - :standard (default)
+      # - :standard_ia
       # - :reduced_redundancy
       #
       # Default: :standard
@@ -143,10 +144,10 @@ module Backup
           #encryption must be :aes256 or nil
         EOS
 
-        classes = ['STANDARD', 'REDUCED_REDUNDANCY']
+        classes = ['STANDARD', 'STANDARD_IA', 'REDUCED_REDUNDANCY']
         raise Error, <<-EOS unless classes.include?(storage_class.to_s.upcase)
           Configuration Error
-          #storage_class must be :standard or :reduced_redundancy
+          #storage_class must be :standard or :standard_ia or :reduced_redundancy
         EOS
       end
 

data/lib/backup/syncer/rsync/base.rb

@@ -8,12 +8,14 @@ module Backup
         ##
         # Additional String or Array of options for the rsync cli
         attr_accessor :additional_rsync_options
+        attr_accessor :archive
 
         def initialize(syncer_id = nil, &block)
           super
           instance_eval(&block) if block_given?
 
           @path ||= '~/backups'
+          @archive = @archive.nil? ? true : @archive
         end
 
         private
@@ -21,7 +23,7 @@ module Backup
         ##
         # Common base command for Local/Push/Pull
         def rsync_command
-          utility(:rsync) << ' --archive' << mirror_option << exclude_option <<
+          utility(:rsync) << archive_option << mirror_option << exclude_option <<
               " #{ Array(additional_rsync_options).join(' ') }".rstrip
         end
 
@@ -29,6 +31,10 @@ module Backup
           mirror ? ' --delete' : ''
         end
 
+        def archive_option
+          archive ? ' --archive' : ''
+        end
+
         def exclude_option
           excludes.map {|pattern| " --exclude='#{ pattern }'" }.join
         end

data/lib/backup/version.rb

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

data/templates/cli/databases/mongodb

@@ -6,7 +6,7 @@
     db.username           = "my_username"
     db.password           = "my_password"
     db.host               = "localhost"
-    db.port               = 5432
+    db.port               = 27017
     db.ipv6               = false
     db.only_collections   = ["only", "these", "collections"]
     db.additional_options = []

data/templates/cli/notifiers/command

@@ -0,0 +1,32 @@
+  ##
+  # Command [Notifier]
+  #
+  notify_by Command do |cmd|
+    cmd.on_success = true
+    cmd.on_warning = true
+    cmd.on_failure = true
+
+    # Command to execute
+    cmd.command = 'notify-send'
+
+    # Arguments to pass to the command.
+    #
+    # Must be an array of strings or callable objects.
+    #
+    # Callables will be invoked with #call(model, status),
+    # and the return value used as the argument.
+    #
+    # In strings you can use the following placeholders:
+    #
+    # %l - Model label
+    # %t - Model trigger
+    # %s - Status (success/failure/warning)
+    # %v - Status verb (succeeded/failed/succeeded with warnings)
+    #
+    # All placeholders can be used with uppercase letters to capitalize
+    # the value.
+    #
+    # Defaults to ["%L %v"]
+    #
+    # cmd.args = ["Backup %L", "%V"]
+  end

data/templates/cli/notifiers/hipchat

@@ -12,4 +12,5 @@
     hipchat.success_color  = "green"
     hipchat.warning_color  = "yellow"
     hipchat.failure_color  = "red"
+    hipchat.api_version    = "v1"
   end

data/templates/cli/notifiers/mail

@@ -11,6 +11,9 @@
 
     mail.from                 = "sender@email.com"
     mail.to                   = "receiver@email.com"
+    mail.cc                   = "cc@email.com"
+    mail.bcc                  = "bcc@email.com"
+    mail.reply_to             = "reply_to@email.com"
     mail.address              = "smtp.gmail.com"
     mail.port                 = 587
     mail.domain               = "your.host.name"

data/templates/cli/storages/dropbox

@@ -16,4 +16,5 @@
     db.access_type = :app_folder
     db.path        = "/path/to/my/backups"
     db.keep        = 25
+    # db.keep        = Time.now - 2592000 # Remove all backups older than 1 month.
   end

data/templates/cli/storages/ftp

@@ -8,5 +8,6 @@
     server.port         = 21
     server.path         = "~/backups/"
     server.keep         = 5
+    # server.keep         = Time.now - 2592000 # Remove all backups older than 1 month.
     server.passive_mode = false
   end

data/templates/cli/storages/local

@@ -4,4 +4,5 @@
   store_with Local do |local|
     local.path       = "~/backups/"
     local.keep       = 5
+    # local.keep       = Time.now - 2592000 # Remove all backups older than 1 month.
   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

data/templates/cli/storages/s3

@@ -11,4 +11,6 @@
     s3.region            = "us-east-1"
     s3.bucket            = "bucket-name"
     s3.path              = "path/to/backups"
+    s3.keep              = 5
+    # s3.keep              = Time.now - 2592000 # Remove all backups older than 1 month.
   end

data/templates/cli/storages/scp

@@ -8,6 +8,7 @@
     server.port       = 22
     server.path       = "~/backups/"
     server.keep       = 5
+    # server.keep       = Time.now - 2592000 # Remove all backups older than 1 month.
 
     # Additional options for the SSH connection.
     # server.ssh_options = {}

data/templates/cli/storages/sftp

@@ -8,6 +8,7 @@
     server.port       = 22
     server.path       = "~/backups/"
     server.keep       = 5
+    # server.keep         = Time.now - 2592000 # Remove all backups older than 1 month.
 
     # Additional options for the SSH connection.
     # server.ssh_options = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup-ssh
 version: !ruby/object:Gem::Version
-  version: 4.1.10
+  version: 4.4.0
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2016-12-28 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,28 +604,28 @@ 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
+  name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -702,28 +702,42 @@ 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
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -753,75 +767,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: polyglot
+  name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
-  name: simple_oauth
+  name: qiniu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 6.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 6.5.1
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: ruby-hmac
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: treetop
+  name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.15
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.15
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        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 +932,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.md
 - README.md
 - bin/backup
 - lib/backup.rb
@@ -928,6 +969,7 @@ files:
 - lib/backup/model.rb
 - lib/backup/notifier/base.rb
 - lib/backup/notifier/campfire.rb
+- lib/backup/notifier/command.rb
 - lib/backup/notifier/datadog.rb
 - lib/backup/notifier/flowdock.rb
 - lib/backup/notifier/hipchat.rb
@@ -951,7 +993,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
@@ -985,6 +1027,7 @@ files:
 - templates/cli/model
 - templates/cli/notifier/zabbix
 - templates/cli/notifiers/campfire
+- templates/cli/notifiers/command
 - templates/cli/notifiers/datadog
 - templates/cli/notifiers/flowdock
 - templates/cli/notifiers/hipchat
@@ -1002,7 +1045,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
@@ -1024,16 +1067,7 @@ homepage: https://github.com/krautcomputing/backup/tree/ssh
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-      Thank you for installing Backup!
-
-      See the Release Notes for changes in this version:
-      http://backup.github.io/backup/v4/release-notes
-
-      If you're upgrading from v3.x, be sure to read:
-      http://backup.github.io/backup/v4/upgrading
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1041,7 +1075,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1049,9 +1083,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Provides an elegant DSL in Ruby for performing backups on UNIX-like systems.
 test_files: []
-has_rdoc: