backup2everbox 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+        - 1.8.7
+        - 1.9.3

data/Gemfile.lock

@@ -1,27 +1,31 @@
 PATH
   remote: .
   specs:
-    backup2everbox (0.0.2)
+    backup2everbox (0.0.3)
       activesupport
-      backup
+      backup (~> 2.0)
+      launchy
       oauth
       rest-client
+      sqlite3
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.7)
-    backup (2.4.4)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.8)
+    arel (3.0.2)
+    backup (2.4.5.1)
       activerecord (>= 2.3.5)
       cloudfiles (>= 1.4.7)
       dropbox (>= 1.1.2)
@@ -32,16 +36,14 @@ GEM
       net-sftp (>= 2.0.4)
       net-ssh (>= 2.0.15)
       pony (>= 0.5)
-      sqlite3-ruby (>= 1.2.5)
-    builder (2.1.2)
-    cloudfiles (1.4.10)
-      mime-types (>= 1.16)
-    dropbox (1.2.3)
+    builder (3.0.0)
+    cloudfiles (1.5.0.1)
+      json
+    dropbox (1.3.0)
       json (>= 1.2.0)
-      mechanize (>= 1.0.0)
-      multipart-post (>= 1.0)
+      multipart-post (>= 1.1.0)
       oauth (>= 0.3.6)
-    excon (0.4.0)
+    excon (0.14.1)
     fog (0.3.34)
       builder
       excon (>= 0.3.6)
@@ -51,46 +53,47 @@ GEM
       net-ssh (>= 2.0.23)
       nokogiri (>= 1.4.4)
       ruby-hmac
-    formatador (0.0.16)
-    hirb (0.3.6)
-    i18n (0.5.0)
-    json (1.5.1)
+    formatador (0.2.3)
+    hirb (0.6.2)
+    i18n (0.6.0)
+    json (1.6.6)
     json_pure (1.4.6)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    launchy (2.1.0)
+      addressable (~> 2.2.6)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mechanize (1.0.0)
-      nokogiri (>= 1.2.1)
-    mime-types (1.16)
-    multipart-post (1.1.0)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    multipart-post (1.1.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.1.0)
-    nokogiri (1.4.4)
-    oauth (0.4.4)
-    polyglot (0.3.1)
-    pony (1.1)
+    net-ssh (2.5.2)
+    nokogiri (1.5.4)
+    oauth (0.4.6)
+    polyglot (0.3.3)
+    pony (1.4)
       mail (> 2.0)
-    rest-client (1.6.1)
+    rake (0.8.7)
+    rdoc (3.12)
+      json (~> 1.4)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
     ruby-hmac (0.4.0)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    treetop (1.4.9)
+    sqlite3 (1.3.6)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  backup
   backup2everbox!
-  oauth
-  rest-client
+  bundler (>= 1.0.0)
+  rake (= 0.8.7)
+  rdoc

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.0.3 / 2012-06-22
+* only working with backup-2
+* old everbox auth method no longer works
+
 === 0.0.2 / 2011-02-02
 * clean log
 * support "rake rdoc"

data/README.rdoc

@@ -1,7 +1,11 @@
 = 简介
 
+{<img src="https://secure.travis-ci.org/lidaobing/backup2everbox.png?branch=master" alt="Build Status" />}[http://travis-ci.org/lidaobing/backup2everbox]
+
 备份你的数据、文件到 EverBox
 
+文档: http://rubydoc.info/github/lidaobing/backup2everbox/master/frames
+
 = 使用方法
 
 1. 注册一个 EverBox 帐号: http://www.everbox.com/ , 注意必须注册盛大通行证帐号,
@@ -11,13 +15,27 @@
 
 3. 运行 sudo backup --setup
 
-4. 修改 /opt/backup/config/backup.rb, 改为如下的形式
+4. 运行 backup2everbox, 得到认证码，输出如下所示
+
+    open url in your browser: http://account.everbox.com/...
+    please input the verification code: 123456
+    add following code to your /opt/backup/config/backup.rb
+    ##################################################
+    storage :everbox do
+      access_key_id     '1234567890abcdefgh'
+      secret_access_key 'hgfedcba0987654321'
+      path              '/backups'
+    end
+    ##################################################
+
+
+5. 修改 /opt/backup/config/backup.rb, 改为如下的形式
 
     gem 'backup2everbox'
     require 'backup2everbox'
-    
+
     backup 'mysql-backup-everbox' do
-      
+
       adapter :mysql do
         user  'USERNAME'
         password 'PASSWORD'
@@ -28,22 +46,20 @@
           port '3306'
         end
       end
-      
+
       storage :everbox do
-        username          'YOUR SDO USERNAME'
-        password          'YOUR SDO PASSWORD'
+        access_key_id     '1234567890abcdefgh'
+        secret_access_key 'hgfedcba0987654321'
         path              '/backups'
       end
-    
+
       keep_backups 10
       encrypt_with_password false
       notify false
-      
-    end
-
-5. 运行 sudo backup -r mysql-backup-everbox
 
-6. backup 支持备份目录，数据库等多种源，并且支持非对称密钥加密来保护数据安全，
-   具体可以参考 backup 的文档: https://github.com/meskyanichi/backup
+    end
 
+6. 运行 sudo backup -r mysql-backup-everbox
 
+7. backup 支持备份目录，数据库等多种源，并且支持非对称密钥加密来保护数据安全，
+   具体可以参考 backup 的文档: https://github.com/meskyanichi/backup/tree/backup-2

data/Rakefile

@@ -1,9 +1,14 @@
+require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
-require 'rake/rdoctask'
+require 'rdoc'
+require 'rdoc/task'
+
 ENV["RDOC_OPTS"] ||= "-c UTF-8"
-Rake::RDocTask.new do |rd|
+RDoc::Task.new do |rd|
   rd.main = "README.rdoc"
   rd.rdoc_files.include("README.rdoc", "History.rdoc", "lib/**/*.rb")
   rd.options << "--charset" << "UTF-8"
 end
+
+task :default => :rdoc

data/backup2everbox.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["LI Daobing"]
   s.email       = ["lidaobing@gmail.com"]
-  s.homepage    = "http://rubygems.org/gems/backup2everbox"
+  s.homepage    = "https://github.com/lidaobing/backup2everbox"
   s.summary     = %q{backup to EverBox}
   s.description = %q{backup to EverBox}
 
@@ -17,10 +17,15 @@ Gem::Specification.new do |s|
                     '--charset' << 'UTF-8'
   s.extra_rdoc_files = ['README.rdoc', 'History.rdoc']
 
-  s.add_dependency 'backup'
+  s.add_dependency 'backup', '~> 2.0'
   s.add_dependency 'activesupport'
   s.add_dependency 'oauth'
   s.add_dependency 'rest-client'
+  s.add_dependency 'launchy'
+  s.add_dependency 'sqlite3'
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency 'rake', "0.8.7"
+  s.add_development_dependency 'rdoc'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/bin/backup2everbox

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require "backup2everbox/cli"
+
+Backup2everbox::CLI.execute(STDOUT, STDIN, STDERR, ARGV)

data/lib/backup/connection/everbox.rb

@@ -11,31 +11,21 @@ module Backup
 
       class Session
         DEFAULT_OPTIONS = {
-          :api_key => 'GW4YtvBpPwHfY0rCSf2xeOqn7tT0YH2O4zftXCOM',
-          :secret_access_key => 'xlKLpZLVSe0Gk6q4w05PsDpzjEbV8SyE71exgz1i',
+          :consumer_key => 'GW4YtvBpPwHfY0rCSf2xeOqn7tT0YH2O4zftXCOM',
+          :consumer_secret => 'xlKLpZLVSe0Gk6q4w05PsDpzjEbV8SyE71exgz1i',
           :oauth_site => 'http://account.everbox.com',
           :fs_site => 'http://fs.everbox.com',
           :chunk_size => 1024*1024*4
         }
-        attr_accessor :authorizing_user, :authorizing_password, :access_token
+        attr_accessor :authorizing_token, :authorizing_secret, :access_token
         def initialize(opts={})
           @options = DEFAULT_OPTIONS.merge(opts || {})
-          @consumer = OAuth::Consumer.new @options[:api_key], @options[:secret_access_key], :site => 'http://account.everbox.com'
+          @consumer = OAuth::Consumer.new @options[:consumer_key], @options[:consumer_secret], :site => 'http://account.everbox.com'
         end
 
         def authorize!
-          response = @consumer.request(:post, "/oauth/quick_token?provider=sdo&login=#{CGI.escape @authorizing_user}&password=#{CGI.escape @authorizing_password}")
-          if response.code.to_i != 200
-            raise "login failed: #{response.body}"
-          end
-
-          d = CGI.parse(response.body).inject({}) do |h,(k,v)|
-            h[k.strip.to_sym] = v.first
-            h[k.strip]        = v.first
-            h
-          end
-
-          @access_token = OAuth::AccessToken.from_hash(@consumer, d)
+          @access_token = OAuth::AccessToken.from_hash(@consumer, {:oauth_token => authorizing_token, :oauth_token_secret => authorizing_secret})
+          puts @access_token.inspect
         end
 
         def authorized?
@@ -61,7 +51,7 @@ module Backup
           elsif stat == :file
             raise "remote path is a file, failed to backup"
           end
-          
+
           basename = File.basename(filename)
           target_path = File.expand_path(basename, remote_path)
           keys = calc_digests(filename)
@@ -118,7 +108,7 @@ module Backup
           time ||= Time.now
           (time.to_i * 1000 * 1000 * 10).to_s
         end
-        
+
         def mkdir_p(path)
           return if path == "/"
           mkdir_p(File.expand_path("..", path))
@@ -187,11 +177,11 @@ module Backup
               res << urlsafe_base64(Digest::SHA1.digest(data))
             end
           end
-          res 
+          res
         end
       end
 
-      attr_accessor :adapter, :procedure, :final_file, :tmp_path, :api_key, :secret_access_key, :username, :password, :path
+      attr_accessor :adapter, :procedure, :final_file, :tmp_path, :api_key, :secret_access_key, :access_key_id, :path
 
       def initialize(adapter=false)
         if adapter
@@ -215,8 +205,8 @@ module Backup
         opts[:secret_access_key] = secret_access_key unless secret_access_key.nil?
         @session ||= Session.new(opts)
         unless @session.authorized?
-          @session.authorizing_user = username
-          @session.authorizing_password = password
+          @session.authorizing_token = access_key_id
+          @session.authorizing_secret = secret_access_key
           @session.authorize!
         end
 
@@ -239,7 +229,7 @@ module Backup
       private
 
       def load_storage_configuration_attributes(static=false)
-        %w(api_key secret_access_key username password path).each do |attribute|
+        %w(access_key_id secret_access_key path).each do |attribute|
           if static
             send("#{attribute}=", procedure.get_storage_configuration.attributes[attribute])
           else

data/lib/backup2everbox/cli.rb

@@ -0,0 +1,50 @@
+require 'oauth'
+require 'launchy'
+
+module Backup2everbox
+  class CLI
+    DEFAULT_OPTIONS = {
+      :consumer_key => 'GW4YtvBpPwHfY0rCSf2xeOqn7tT0YH2O4zftXCOM',
+      :consumer_secret => 'xlKLpZLVSe0Gk6q4w05PsDpzjEbV8SyE71exgz1i',
+      :oauth_site => 'http://account.everbox.com',
+      :fs_site => 'http://fs.everbox.com',
+      :proxy => nil
+    }
+
+    def self.execute(stdout, stdin, stderr, arguments = [])
+      self.new.execute(stdout, stdin, stderr, arguments)
+    end
+
+    def initialize(opts={})
+      opts ||= {}
+      @options = DEFAULT_OPTIONS.merge(opts)
+    end
+
+    def execute(stdout, stdin, stderr, arguments = [])
+      request_token = consumer.get_request_token
+      url = request_token.authorize_url
+      puts "open url in your browser: #{url}"
+      Launchy.open(url)
+      STDOUT.write "please input the verification code: "
+      STDOUT.flush
+      verification_code = STDIN.readline.strip
+      access_token = request_token.get_access_token :oauth_verifier => verification_code
+      puts "add following code to your /opt/backup/config/backup.rb"
+      puts "#" * 50
+      puts "storage :everbox do"
+      puts "  access_key_id     '#{access_token.token}'"
+      puts "  secret_access_key '#{access_token.secret}'"
+      puts "  path              '/backups'"
+      puts "end"
+      puts "#" * 50
+    end
+
+    private
+    def consumer
+      OAuth::Consumer.new @options[:consumer_key], @options[:consumer_secret], {
+        :site => @options[:oauth_site],
+        :proxy => @options[:proxy]
+      }
+    end
+  end
+end

data/lib/backup2everbox/version.rb

@@ -1,3 +1,3 @@
 module Backup2everbox
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,91 +1,172 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: backup2everbox
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - LI Daobing
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-02 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: backup
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: backup to EverBox
-email: 
+email:
 - lidaobing@gmail.com
-executables: []
-
+executables:
+- backup2everbox
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - History.rdoc
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - History.rdoc
@@ -93,47 +174,39 @@ files:
 - Rakefile
 - TODO
 - backup2everbox.gemspec
+- bin/backup2everbox
 - lib/backup/connection/everbox.rb
 - lib/backup/record/everbox.rb
 - lib/backup/storage/everbox.rb
 - lib/backup2everbox.rb
+- lib/backup2everbox/cli.rb
 - lib/backup2everbox/version.rb
-has_rdoc: true
-homepage: http://rubygems.org/gems/backup2everbox
+homepage: https://github.com/lidaobing/backup2everbox
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --charset
 - UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: backup2everbox
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: backup to EverBox
 test_files: []
-