backup2qiniu 3.3.2 → 3.5.0

data/Gemfile.lock

@@ -1,19 +1,85 @@
 PATH
   remote: .
   specs:
-    backup2qiniu (3.3.2)
-      backup (~> 3.3.0)
+    backup2qiniu (3.5.0)
+      backup (>= 3.4.0)
       qiniu-rs (~> 3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    backup (3.3.2)
-      open4 (~> 1.3.0)
-      thor (>= 0.15.4, < 2)
+    backup (3.5.0)
+      builder (= 3.2.0)
+      dropbox-sdk (= 1.5.1)
+      excon (= 0.20.1)
+      faraday (= 0.8.7)
+      fog (= 1.10.1)
+      formatador (= 0.2.4)
+      hipchat (= 0.8.0)
+      httparty (= 0.11.0)
+      i18n (= 0.6.4)
+      json (= 1.7.7)
+      mail (= 2.5.3)
+      mime-types (= 1.23)
+      multi_json (= 1.7.2)
+      multi_xml (= 0.5.3)
+      multipart-post (= 1.2.0)
+      net-scp (= 1.1.0)
+      net-sftp (= 2.1.1)
+      net-ssh (= 2.6.7)
+      nokogiri (= 1.5.9)
+      open4 (= 1.3.0)
+      parallel (= 0.6.4)
+      polyglot (= 0.3.3)
+      prowler (= 1.3.1)
+      ruby-hmac (= 0.4.0)
+      simple_oauth (= 0.2.0)
+      thor (= 0.18.1)
+      treetop (= 1.4.12)
+      twitter (= 4.6.2)
+    builder (3.2.0)
+    dropbox-sdk (1.5.1)
+      json
+    excon (0.20.1)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    fog (1.10.1)
+      builder
+      excon (~> 0.20)
+      formatador (~> 0.2.0)
+      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.8.0)
+      httparty
+      httparty
+    httparty (0.11.0)
+      multi_json (~> 1.0)
+      multi_xml (>= 0.5.2)
+    i18n (0.6.4)
     json (1.7.7)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.23)
+    multi_json (1.7.2)
+    multi_xml (0.5.3)
+    multipart-post (1.2.0)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.7)
+    nokogiri (1.5.9)
     open4 (1.3.0)
+    parallel (0.6.4)
+    polyglot (0.3.3)
+    prowler (1.3.1)
     qiniu-rs (3.4.2)
       json (~> 1.7)
       mime-types (~> 1.19)
@@ -22,7 +88,15 @@ GEM
     rest-client (1.6.7)
       mime-types (>= 1.16)
     ruby-hmac (0.4.0)
+    simple_oauth (0.2.0)
     thor (0.18.1)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    twitter (4.6.2)
+      faraday (~> 0.8, < 0.10)
+      multi_json (~> 1.0)
+      simple_oauth (~> 0.2)
 
 PLATFORMS
   ruby

data/NEWS.md

@@ -1,5 +1,10 @@
 # NEWS
 
+## 3.5.0 (2013-05-08)
+
+* works for backup 3.5.X
+* bump minimum backup verison to 3.4.0
+
 ## 3.3.2 (2013-04-28)
 
 * support backup with upload_token

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.3.0'
+  gem.add_dependency 'backup', '>= 3.4.0'
   gem.add_dependency 'qiniu-rs', '~> 3.1'
 end

data/lib/backup/storage/qiniu.rb

@@ -16,6 +16,7 @@ module Backup
         super(model, storage_id)
 
         @bucket ||= 'backups'
+        @path ||= ''
 
         instance_eval(&block) if block_given?
       end
@@ -23,9 +24,9 @@ module Backup
       def remove!(pkg)
         remote_path = remote_path_for(pkg)
         establish_connection!
-        transferred_files_for(pkg) do |local_file, remote_file|
+        package.filenames.each do |remote_file|
           Logger.info "#{storage_name} started removing " +
-              "'#{ local_file }' from bucket '#{ bucket }'."
+              "'#{ remote_file }' from bucket '#{ bucket }'."
           key = File.join(remote_path, remote_file)
           unless ::Qiniu::RS.delete(bucket, key)
             raise "delete '#{key}' failed"
@@ -45,11 +46,12 @@ module Backup
 
       def transfer_by_upload_token!
         raise "upload_token is not set" if upload_token.nil?
-        files_to_transfer_for(@package) do |local_file, remote_file|
+        package.filenames.each do |local_file|
+          remote_file = local_file
           Logger.info "[transfer_by_upload_token] #{storage_name} started transferring " +
               "'#{ local_file }'."
           key = File.join(remote_path, remote_file)
-          upload_file(File.join(local_path, local_file), key)
+          upload_file(File.join(Config.tmp_path, local_file), key)
           Logger.info "file uploaded to bucket:#{bucket}, key:#{key}"
         end
       end
@@ -61,19 +63,16 @@ module Backup
           :file => File.open(local_file)
       end
 
-      def remote_path
-        remote_path_for(@package)
-      end
-
       def transfer_by_secret!
         establish_connection!
-        files_to_transfer_for(@package) do |local_file, remote_file|
+        package.filenames.each do |local_file|
+          remote_file = local_file
           Logger.info "[transfer_by_secret] #{storage_name} started transferring " +
               "'#{ local_file }'."
           upload_token = ::Qiniu::RS.generate_upload_token :scope => bucket
           key = File.join(remote_path, remote_file)
           res = ::Qiniu::RS.upload_file :uptoken            => upload_token,
-                 :file               => File.join(local_path, local_file),
+                 :file               => File.join(Config.tmp_path, local_file),
                  :key                => key,
                  :bucket             => bucket,
                  :enable_crc32_check => true

data/lib/backup2qiniu/version.rb

@@ -1,3 +1,3 @@
 module Backup2qiniu
-  VERSION = "3.3.2"
+  VERSION = "3.5.0"
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: backup2qiniu
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.5.0
+  prerelease: 
 platform: ruby
 authors:
 - LI Daobing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backup
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: qiniu-rs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,26 +67,27 @@ files:
 - lib/backup2qiniu/version.rb
 homepage: https://github.com/lidaobing/backup2qiniu
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 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: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: backup to qiniutek.com
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: ad8669fe044ac662b06fbeaa22a28eda68f0b1a8
-  data.tar.gz: 2c1a2b5b39adb74c906309d492339e79e493ce88
-SHA512:
-  metadata.gz: 53d66c2f74d51abf96aaa21eb1df81be529e5a548f7d4b64c9f97162936489f8f396a0c1e099f0017c1ce8647f2774ac78d61666ba2007388de72d30cee5dfa5
-  data.tar.gz: df50b9d0e29d593b04deb63b3f9d81d2e237c8d0931e724032dcfcb5a369cd5e51770ec354c22119e5cdf39c55270469c64c026d2cbc79c67cb977f39091061d