backup2qiniu 0.1.1 → 0.2.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    backup2qiniu (0.1.1)
+    backup2qiniu (0.2.0)
       backup (~> 3.0)
-      qiniu-rs (>= 2.0, < 4)
+      qiniu-rs (~> 3.0)
 
 GEM
   remote: https://rubygems.org/

data/NEWS.md

@@ -1,5 +1,10 @@
 # NEWS
 
+## 0.2.0 (2012-08-26)
+
+* support cycling.
+* use new upload API (require qiniu-rs 3.x)
+
 ## 0.1.1 (2012-08-19)
 
 * support qiniu-rs 3.x.

data/README.md

@@ -28,6 +28,7 @@ Backup::Model.new(:mysql_backup_qiniu, 'example backup to qiniu') do
   end
 
   store_with Qiniu do |eb|
+    eb.keep = 7
     eb.access_key = 'replace with access key'
     eb.access_secret = 'replace with access secret'
     eb.bucket = 'backup'

data/backup2qiniu.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Backup2qiniu::VERSION
   gem.add_dependency 'backup', '~> 3.0'
-  gem.add_dependency 'qiniu-rs', ['>= 2.0', '< 4']
+  gem.add_dependency 'qiniu-rs', '~> 3.0'
 end

data/lib/backup/storage/qiniu.rb

@@ -20,25 +20,42 @@ module Backup
         ''
       end
 
-      def transfer!
-        ::Qiniu::RS.establish_connection! :access_key => access_key,
-                                          :secret_key => access_secret
+      def remove!(pkg)
+        remote_path = remote_path_for(pkg)
+        establish_connection!
+        transferred_files_for(pkg) do |local_file, remote_file|
+          Logger.message "#{storage_name} started removing " +
+              "'#{ local_file }' from bucket '#{ bucket }'."
+          key = File.join(remote_path, remote_file)
+          unless ::Qiniu::RS.delete(bucket, key)
+            raise "delete '#{key}' failed"
+          end
+        end
+      end
 
+      def transfer!
+        establish_connection!
         remote_path = remote_path_for(@package)
         files_to_transfer_for(@package) do |local_file, remote_file|
           Logger.message "#{storage_name} started transferring " +
               "'#{ local_file }'."
-          remote_upload_url = ::Qiniu::RS.put_auth
-          raise "auth failed" if ! remote_upload_url
+          upload_token = ::Qiniu::RS.generate_upload_token :scope => bucket
           key = File.join(remote_path, remote_file)
-          ::Qiniu::RS.upload :url                => remote_upload_url,
+          res = ::Qiniu::RS.upload_file :uptoken            => upload_token,
                  :file               => File.join(local_path, local_file),
                  :key                => key,
                  :bucket             => bucket,
                  :enable_crc32_check => true
+          raise "upload '#{local_file}' failed" if res == false
           Logger.message "file uploaded to bucket:#{bucket}, key:#{key}"
         end
       end
+
+      private
+      def establish_connection!
+        ::Qiniu::RS.establish_connection! :access_key => access_key,
+                                          :secret_key => access_secret
+      end
     end
   end
 end

data/lib/backup2qiniu/version.rb

@@ -1,3 +1,3 @@
 module Backup2qiniu
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup2qiniu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backup
@@ -32,23 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
 description: backup to qiniutek.com
 email:
 - lidaobing@gmail.com