backup2qiniu 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78535d0fd1b840a57fae29ce6f887fc0393be28b
-  data.tar.gz: 0d479afc844dc61ba78e76d090f6af36e68ca966
+  metadata.gz: ac679001bd13064b0df2a18d3dfdea85b7ea2419
+  data.tar.gz: 1342954ffd07006565487872622c4f9514ed33fb
 SHA512:
-  metadata.gz: efd3b0680c7c6fa1978ee95f4304010b29e443e55d6e5b78561a8474f933d3eb98bd64855964e715c9f466bc064326e58a199fcc1236581e864cdec5821fc728
-  data.tar.gz: 4c3e336de94427c9c345f920c10a43914c89673814506e23806e32022d642fb17a433cbf531d5b0c513b1dbc85b00ce6aa2932c27fd4c086a2d70c5d55058cce
+  metadata.gz: 912c8d0d5e08fc175fb68fbe7f87a13a2d5b862a1c82d5a2a936c4cb1a278f9d0babdef977840325de48fdda93af1d71b3539ec4b2a37fa18abbfc906f816752
+  data.tar.gz: 036a0cc08a2dda489a18f64714da0c18ef35d1f330cf16076cbbea98a36baea163275419684c165298b6304e2d1b666eb594b0188178a587883eb281bd312974

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    backup2qiniu (3.3.0)
+    backup2qiniu (3.3.1)
       backup (~> 3.3.0)
       qiniu-rs (~> 3.1)
 
@@ -12,7 +12,7 @@ GEM
       open4 (~> 1.3.0)
       thor (>= 0.15.4, < 2)
     json (1.7.7)
-    mime-types (1.22)
+    mime-types (1.23)
     open4 (1.3.0)
     qiniu-rs (3.4.2)
       json (~> 1.7)

data/NEWS.md

@@ -1,5 +1,9 @@
 # NEWS
 
+## 3.3.1 (2013-04-28)
+
+* support backup with upload_token
+
 ## 3.3.0 (2013-04-19)
 
 * works for backup 3.3.X

data/README.md

@@ -7,31 +7,56 @@
 * 运行 gem install backup2qiniu
 * 运行 backup generate:config
 * 运行 backup generate:model --trigger=mysql_backup_qiniu
-* 访问 https://dev.qiniutek.com/account/keys, 找到你的 "Access Key" 和 "Access Secret"
+* 获取上传秘钥
+  * 运行 backup2qiniu gen_token
+  * 如果不担心黑客入侵后通过你的备份配置删除你的备份，那么可以直接访问 https://dev.qiniutek.com/account/keys, 找到你的 "Access Key" 和 "Access Secret"
 * 修改 ~/Backup/models/mysql_backup_qiniu.rb, 改为如下的形式
 
-```
+```ruby
 require 'rubygems'
 gem 'backup2qiniu'
 require 'backup2qiniu'
 
 Backup::Model.new(:mysql_backup_qiniu, 'example backup to qiniu') do
-  split_into_chunks_of 250
+  split_into_chunks_of 4
 
+  # more info: https://github.com/meskyanichi/backup/wiki/Databases
   database MySQL do |db|
-    db.name               = "for_backup"
-    db.username           = "my_username"
-    db.password           = "my_password"
+    db.name               = "DATABASE_NAME"
+    db.username           = "BACKUP_USERNAME"
+    db.password           = "BACKUP_PASSWORD"
     db.host               = "localhost"
     db.port               = 3306
     db.socket             = "/tmp/mysql.sock"
   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'
+  store_with Qiniu do |q|
+    ## when using uploadToken, you can not delete the old backup (for security concern)
+    # q.keep = 7
+    q.upload_token = 'REPLACE WITH UPLOAD TOKEN'
+    q.bucket = 'BUCKET_NAME'
+    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
+
+  # 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
 end
 ```

data/bin/backup2qiniu

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'backup2qiniu/cli'
+
+Backup2qiniu::CLI.start

data/lib/backup/storage/qiniu.rb

@@ -1,12 +1,16 @@
 require 'backup/logger'
 require 'qiniu/rs'
+require 'rest_client'
+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)
         super(model, storage_id)
@@ -16,10 +20,6 @@ module Backup
         instance_eval(&block) if block_given?
       end
 
-      def path
-        ''
-      end
-
       def remove!(pkg)
         remote_path = remote_path_for(pkg)
         establish_connection!
@@ -34,10 +34,41 @@ module Backup
       end
 
       def transfer!
+        if access_key and access_secret
+          transfer_by_secret!
+        else
+          transfer_by_upload_token!
+        end
+      end
+
+      private
+
+      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|
+          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)
+          Logger.info "file uploaded to bucket:#{bucket}, key:#{key}"
+        end
+      end
+
+      def upload_file(local_file, key)
+        RestClient.post 'http://up.qbox.me/upload',
+          :auth => upload_token,
+          :action => action(bucket, key),
+          :file => File.open(local_file)
+      end
+
+      def remote_path
+        remote_path_for(@package)
+      end
+
+      def transfer_by_secret!
         establish_connection!
-        remote_path = remote_path_for(@package)
         files_to_transfer_for(@package) do |local_file, remote_file|
-          Logger.info "#{storage_name} started transferring " +
+          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)
@@ -51,11 +82,16 @@ module Backup
         end
       end
 
-      private
       def establish_connection!
+        raise "access_key is nil" if access_key.nil?
+        raise "access_secret is nil" if access_secret.nil?
         ::Qiniu::RS.establish_connection! :access_key => access_key,
                                           :secret_key => access_secret
       end
+
+      def action(bucket, key)
+        "/rs-put/#{Base64.urlsafe_encode64("#{bucket}:#{key}")}"
+      end
     end
   end
 end

data/lib/backup2qiniu/cli.rb

@@ -0,0 +1,64 @@
+require 'thor'
+require 'qiniu-rs'
+
+module Backup2qiniu
+  class CLI < Thor
+    desc 'gen_token', 'Generate a Upload Token for backup'
+    def gen_token
+      puts 'input your keys (you can find them on https://dev.qiniutek.com/account/keys)'
+      token = get_param("Access Key")
+      secret = get_param("Secret Key")
+      Qiniu::RS.establish_connection! :access_key => token, :secret_key => secret
+      buckets = Qiniu::RS.buckets
+      unless buckets
+        puts 'Can not verify your key, wrong key?'
+        exit 1
+      end
+      bucket = get_bucket_name(buckets)
+      days = get_param("Token Valid Days (365)")
+      if days == ''
+        days = 365
+      else
+        days = days.to_i
+      end
+
+      print_params access_key: token, secret_key: secret, bucket: bucket, valid_days: days
+
+      print_token Qiniu::RS.generate_upload_token(:expires_in => 3600*24*days, :scope => bucket), bucket
+    end
+
+    private
+    def print_token(token, bucket)
+      puts %Q{
+  # Copy following lines to your config file
+  store_with Qiniu do |q|
+    q.upload_token = #{token.inspect}
+    q.bucket = #{bucket}.inspect
+    # q.path = 'BACKUP_DIR1'
+  end
+      }
+    end
+
+    def get_bucket_name(buckets)
+      puts "Your buckets: #{buckets.join(", ")}"
+      bucket = get_param("Select Bucket")
+      return bucket if buckets.include? bucket
+      puts 'ERROR: invalid bucket name'
+      puts
+      get_bucket_name(buckets)
+    end
+
+    def print_params(h)
+      puts
+      puts 'Params'
+      h.each do |k, v|
+        puts "#{k}: #{v}"
+      end
+    end
+
+    def get_param(hint)
+      STDOUT.write "#{hint}: "
+      STDIN.gets.chomp
+    end
+  end
+end

data/lib/backup2qiniu/version.rb

@@ -1,3 +1,3 @@
 module Backup2qiniu
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backup2qiniu
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - LI Daobing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backup
@@ -41,7 +41,8 @@ dependencies:
 description: backup to qiniutek.com
 email:
 - lidaobing@gmail.com
-executables: []
+executables:
+- backup2qiniu
 extensions: []
 extra_rdoc_files: []
 files:
@@ -53,9 +54,11 @@ files:
 - README.md
 - Rakefile
 - backup2qiniu.gemspec
+- bin/backup2qiniu
 - lib/backup/config/qiniu.rb
 - lib/backup/storage/qiniu.rb
 - lib/backup2qiniu.rb
+- lib/backup2qiniu/cli.rb
 - lib/backup2qiniu/version.rb
 homepage: https://github.com/lidaobing/backup2qiniu
 licenses: []
@@ -76,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: backup to qiniutek.com