backup2qiniu 3.11.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e295432931ffab3e289e6aaae20b30160aaca3
-  data.tar.gz: 4d6478e6fee62871e05712e9dcd29058237d935e
+  metadata.gz: a1907de155547a1a31f750f3c030d47f1a90594b
+  data.tar.gz: 8dacddfb7f99ad425a59fa7fec6a3802ddc80144
 SHA512:
-  metadata.gz: feca92f31bbc2b3ecc813e13610f6083ddafdf2011838956ffe9ba7835e77ca5d98cdd3e1f346d8ce37e85cc2763ac428e25d7b7f01db60ba12460a19452cf7b
-  data.tar.gz: 5ea7da1eb92b3d4524874e5480b1d6b69a101056c1284f3635b25e97d9ac96cde60d1a1ca5eafa805e8ec47c5629aeb99ed0f43a30ef9d948673817b1f50e354
+  metadata.gz: 85c154142ae806a4a44ceb2977cc26d3dd1de4fb398412ffa499d50f262bb77622be2550e2f37ed93afe1946eeb8624a1b256ae73bdc84a643a6a44f08a9f23c
+  data.tar.gz: c53842de35f450cd97181ef40d802d3fe4878844b1652e951a3be7ba3e33f3c0cfaf7cb55df41ff69214566f568f66c8243a2a13554aece716eb5cbc15cdf406

data/Gemfile.lock

@@ -1,99 +1,251 @@
 PATH
   remote: .
   specs:
-    backup2qiniu (3.11.0)
-      backup (~> 3.4)
+    backup2qiniu (4.2.0)
+      backup (~> 4.2)
       qiniu-rs (~> 3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    backup (3.11.0)
+    CFPropertyList (2.3.1)
+    addressable (2.3.5)
+    atomic (1.1.14)
+    aws-ses (0.5.0)
+      builder
+      mail (> 2.2.5)
+      mime-types
+      xml-simple
+    backup (4.2.2)
+      CFPropertyList (= 2.3.1)
+      addressable (= 2.3.5)
+      atomic (= 1.1.14)
+      aws-ses (= 0.5.0)
+      buftok (= 0.2.0)
       builder (= 3.2.2)
+      descendants_tracker (= 0.0.3)
+      dogapi (= 1.11.0)
       dropbox-sdk (= 1.5.1)
-      excon (= 0.25.3)
-      faraday (= 0.8.7)
-      fog (= 1.13.0)
-      formatador (= 0.2.4)
-      hipchat (= 0.11.0)
-      httparty (= 0.11.0)
-      json (= 1.8.0)
+      equalizer (= 0.0.9)
+      excon (= 0.44.4)
+      faraday (= 0.8.8)
+      fission (= 0.5.0)
+      flowdock (= 0.4.0)
+      fog (= 1.28.0)
+      fog-atmos (= 0.1.0)
+      fog-aws (= 0.1.1)
+      fog-brightbox (= 0.7.1)
+      fog-core (= 1.29.0)
+      fog-ecloud (= 0.0.2)
+      fog-json (= 1.0.0)
+      fog-profitbricks (= 0.0.2)
+      fog-radosgw (= 0.0.3)
+      fog-riakcs (= 0.1.0)
+      fog-sakuracloud (= 1.0.0)
+      fog-serverlove (= 0.1.1)
+      fog-softlayer (= 0.4.1)
+      fog-storm_on_demand (= 0.1.0)
+      fog-terremark (= 0.0.4)
+      fog-vmfusion (= 0.0.1)
+      fog-voxel (= 0.0.2)
+      fog-xml (= 0.1.1)
+      formatador (= 0.2.5)
+      hipchat (= 1.0.1)
+      http (= 0.5.0)
+      http_parser.rb (= 0.6.0)
+      httparty (= 0.12.0)
+      inflecto (= 0.0.2)
+      ipaddress (= 0.8.0)
+      json (= 1.8.2)
       mail (= 2.5.4)
-      mime-types (= 1.23)
-      multi_json (= 1.7.7)
-      multi_xml (= 0.5.4)
+      memoizable (= 0.4.0)
+      mime-types (= 1.25.1)
+      mini_portile (= 0.6.2)
+      multi_json (= 1.10.1)
+      multi_xml (= 0.5.5)
       multipart-post (= 1.2.0)
-      net-scp (= 1.1.2)
+      net-scp (= 1.2.1)
       net-sftp (= 2.1.2)
-      net-ssh (= 2.6.8)
-      nokogiri (= 1.5.10)
+      net-ssh (= 2.9.2)
+      nokogiri (= 1.6.6.2)
       open4 (= 1.3.0)
+      pagerduty (= 2.0.0)
       polyglot (= 0.3.3)
-      ruby-hmac (= 0.4.0)
       simple_oauth (= 0.2.0)
       thor (= 0.18.1)
-      treetop (= 1.4.14)
-      twitter (= 4.8.1)
+      thread_safe (= 0.1.3)
+      treetop (= 1.4.15)
+      twitter (= 5.5.0)
+      unf (= 0.1.3)
+      unf_ext (= 0.0.6)
+      xml-simple (= 1.1.4)
+    buftok (0.2.0)
     builder (3.2.2)
+    descendants_tracker (0.0.3)
+    dogapi (1.11.0)
+      json (>= 1.5.1)
     dropbox-sdk (1.5.1)
       json
-    excon (0.25.3)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
-    fog (1.13.0)
+    equalizer (0.0.9)
+    excon (0.44.4)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    flowdock (0.4.0)
+      httparty (~> 0.7)
+      multi_json
+    fog (1.28.0)
+      fog-atmos
+      fog-aws (~> 0.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.27, >= 1.27.3)
+      fog-ecloud
+      fog-json
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.7.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.29.0)
       builder
-      excon (~> 0.25.0)
-      formatador (~> 0.2.0)
+      excon (~> 0.38)
+      formatador (~> 0.2)
       mime-types
-      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
-      ruby-hmac
-    formatador (0.2.4)
-    hipchat (0.11.0)
-      httparty
-    httparty (0.11.0)
+    fog-ecloud (0.0.2)
+      fog-core
+      fog-xml
+    fog-json (1.0.0)
       multi_json (~> 1.0)
+    fog-profitbricks (0.0.2)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.3)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.0.0)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.1)
+      fog-core
+      fog-json
+    fog-softlayer (0.4.1)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.0)
+      fog-core
+      fog-json
+    fog-terremark (0.0.4)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.0.1)
+      fission
+      fog-core
+    fog-voxel (0.0.2)
+      fog-core
+      fog-xml
+    fog-xml (0.1.1)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
+    formatador (0.2.5)
+    hipchat (1.0.1)
+      httparty
+    http (0.5.0)
+      http_parser.rb
+    http_parser.rb (0.6.0)
+    httparty (0.12.0)
+      json (~> 1.8)
       multi_xml (>= 0.5.2)
-    json (1.8.0)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
+    json (1.8.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.7.7)
-    multi_xml (0.5.4)
+    memoizable (0.4.0)
+      thread_safe (~> 0.1.3)
+    mime-types (1.25.1)
+    mini_portile (0.6.2)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
     multipart-post (1.2.0)
-    net-scp (1.1.2)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
-    netrc (0.8.0)
-    nokogiri (1.5.10)
+    net-ssh (2.9.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     open4 (1.3.0)
+    pagerduty (2.0.0)
+      json (>= 1.7.7)
     polyglot (0.3.3)
     qiniu-rs (3.4.10)
       json (~> 1.7)
       mime-types (~> 1.19)
       rest-client (~> 1.6)
       ruby-hmac (~> 0.4)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+    rdoc (4.2.0)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
     ruby-hmac (0.4.0)
     simple_oauth (0.2.0)
     thor (0.18.1)
-    treetop (1.4.14)
+    thread_safe (0.1.3)
+      atomic
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (4.8.1)
-      faraday (~> 0.8, < 0.10)
-      multi_json (~> 1.0)
-      simple_oauth (~> 0.2)
+    twitter (5.5.0)
+      addressable (~> 2.3)
+      buftok (~> 0.2.0)
+      descendants_tracker (~> 0.0.3)
+      equalizer (~> 0.0.9)
+      faraday (>= 0.8, < 0.10)
+      http (~> 0.5.0)
+      http_parser.rb (~> 0.6.0)
+      json (~> 1.8)
+      memoizable (~> 0.4.0)
+      simple_oauth (~> 0.2.0)
+    unf (0.1.3)
+      unf_ext
+    unf_ext (0.0.6)
+    xml-simple (1.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   backup2qiniu!
+
+BUNDLED WITH
+   1.11.2

data/NEWS.md

@@ -1,5 +1,13 @@
 # NEWS
 
+## 4.2.0 (2015-12-16)
+
+* [#8] now support backup 4
+
+## 3.11.0 (2014-11-13)
+
+* backup2qiniu does not support backup 4
+
 ## 3.5.0 (2013-05-08)
 
 * works for backup 3.5.X

data/README.md

@@ -7,9 +7,7 @@
 * 运行 gem install backup2qiniu
 * 运行 backup generate:config
 * 运行 backup generate:model --trigger=mysql_backup_qiniu
-* 获取上传秘钥
-  * 运行 backup2qiniu gen_token
-  * 如果不担心黑客入侵后通过你的备份配置删除你的备份，那么可以直接访问 https://portal.qiniu.com/setting/key, 找到你的 "ACCESS KEY" 和 "SECRET KEY"
+* 运行 backup2qiniu gen_token 来生成配置文件
 * 修改 ~/Backup/models/mysql_backup_qiniu.rb, 改为如下的形式
 
 ```ruby
@@ -30,6 +28,7 @@ Backup::Model.new(:mysql_backup_qiniu, 'example backup to qiniu') do
     db.socket             = "/tmp/mysql.sock"
   end
 
+  # 把这段替换为你刚刚生成的配置文件
   store_with Qiniu do |q|
     ## when using uploadToken, you can not delete the old backup (for security concern)
     # q.keep = 7
@@ -38,26 +37,28 @@ Backup::Model.new(:mysql_backup_qiniu, 'example backup to qiniu') do
     q.path = 'BACKUP_DIR1'
   end
 
-  store_with Qiniu do |q|
-    q.keep = 7
-    q.access_key = 'REPLACE WITH ACCESS KEY'
-    q.access_secret = 'REPLACE WITH ACCESS SECRET'
-    q.bucket = 'BUCKET_NAME'
-    q.path = 'BACKUP_DIR2'
-  end
+  # 如果需要自动删除过期的备份，那么需要直接使用 https://portal.qiniu.com/setting/key 拿到的 AK 和 SK
+  # store_with Qiniu do |q|
+  #   q.keep = 7
+  #   q.access_key = 'REPLACE WITH ACCESS KEY'       # 从网页拿到的 AK
+  #   q.access_secret = 'REPLACE WITH ACCESS SECRET' # 从网页拿到的 SK
+  #   q.bucket = 'BUCKET_NAME'
+  #   q.path = 'BACKUP_DIR2'
+  # end
 
-  # more info: https://github.com/meskyanichi/backup/wiki/Encryptors
-  encrypt_with GPG do |encryption|
-    encryption.keys = {}
-    encryption.keys['YOUR EMAIL'] = <<-KEY
-      -----BEGIN PGP PUBLIC KEY BLOCK-----
-      Version: GnuPG v1.4.12 (Darwin)
-
-      YOUR KEY
-      -----END PGP PUBLIC KEY BLOCK-----
-    KEY
-    encryption.recipients = ['YOUR EMAIL']
-  end
+  # 为安全起见我们推荐你生成一对 GPG 秘钥，用公钥来加密你的数据库备份
+  # 更多信息: https://github.com/meskyanichi/backup/wiki/Encryptors
+  # encrypt_with GPG do |encryption|
+  #   encryption.keys = {}
+  #   encryption.keys['YOUR EMAIL'] = <<-KEY
+  #     -----BEGIN PGP PUBLIC KEY BLOCK-----
+  #     Version: GnuPG v1.4.12 (Darwin)
+  #
+  #     YOUR KEY
+  #     -----END PGP PUBLIC KEY BLOCK-----
+  #   KEY
+  #   encryption.recipients = ['YOUR EMAIL']
+  # end
 end
 ```
 

data/backup2qiniu.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |gem|
   gem.name          = "backup2qiniu"
   gem.require_paths = ["lib"]
   gem.version       = Backup2qiniu::VERSION
-  gem.add_dependency 'backup', '~> 3.4'
+  gem.add_dependency 'backup', '~> 4.2'
   gem.add_dependency 'qiniu-rs', '~> 3.1'
 end

data/lib/backup/config/{qiniu.rb → dsl/qiniu.rb}

@@ -1,6 +1,8 @@
 module Backup
   module Config
-    module Qiniu
+    class DSL
+      module Qiniu
+      end
     end
   end
 end

data/lib/backup/storage/qiniu.rb

@@ -6,19 +6,16 @@ require 'base64'
 module Backup
   module Storage
     class Qiniu < Base
-
       attr_accessor :access_key, :access_secret
       attr_accessor :upload_token
       attr_accessor :bucket
       attr_accessor :path
 
-      def initialize(model, storage_id = nil, &block)
+      def initialize(model, storage_id = nil)
         super(model, storage_id)
 
         @bucket ||= 'backups'
         @path ||= ''
-
-        instance_eval(&block) if block_given?
       end
 
       def remove!(pkg)

data/lib/backup2qiniu.rb

@@ -1,4 +1,4 @@
-require 'backup/config/qiniu'
+require 'backup/config/dsl/qiniu'
 
 module Backup
   module Storage

data/lib/backup2qiniu/version.rb

@@ -1,3 +1,3 @@
 module Backup2qiniu
-  VERSION = "3.11.0"
+  VERSION = "4.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup2qiniu
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 4.2.0
 platform: ruby
 authors:
 - LI Daobing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backup
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: qiniu-rs
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +55,7 @@ files:
 - Rakefile
 - backup2qiniu.gemspec
 - bin/backup2qiniu
-- lib/backup/config/qiniu.rb
+- lib/backup/config/dsl/qiniu.rb
 - lib/backup/storage/qiniu.rb
 - lib/backup2qiniu.rb
 - lib/backup2qiniu/cli.rb
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: backup to qiniu.com