backup2everbox 0.0.3 → 0.1.0

data/Gemfile.lock

@@ -1,93 +1,45 @@
 PATH
   remote: .
   specs:
-    backup2everbox (0.0.3)
+    backup2everbox (0.1.0)
       activesupport
-      backup (~> 2.0)
+      backup (~> 3.0)
       launchy
       oauth
       rest-client
-      sqlite3
 
 GEM
   remote: http://rubygems.org/
   specs:
-    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)
-      fog (~> 0.3.5)
-      hirb (>= 0.2.9)
-      json_pure (~> 1.4.6)
-      net-scp (>= 1.0.2)
-      net-sftp (>= 2.0.4)
-      net-ssh (>= 2.0.15)
-      pony (>= 0.5)
-    builder (3.0.0)
-    cloudfiles (1.5.0.1)
-      json
-    dropbox (1.3.0)
-      json (>= 1.2.0)
-      multipart-post (>= 1.1.0)
-      oauth (>= 0.3.6)
-    excon (0.14.1)
-    fog (0.3.34)
-      builder
-      excon (>= 0.3.6)
-      formatador (>= 0.0.16)
-      json
-      mime-types
-      net-ssh (>= 2.0.23)
-      nokogiri (>= 1.4.4)
-      ruby-hmac
-    formatador (0.2.3)
-    hirb (0.6.2)
+    backup (3.0.24)
+      open4 (~> 1.3.0)
+      thor (~> 0.14.6)
+    columnize (0.3.6)
+    debugger (1.1.4)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.3)
+    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.3)
     i18n (0.6.0)
     json (1.6.6)
-    json_pure (1.4.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)
     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.5.2)
-    nokogiri (1.5.4)
     oauth (0.4.6)
-    polyglot (0.3.3)
-    pony (1.4)
-      mail (> 2.0)
+    open4 (1.3.0)
     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.6)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
@@ -95,5 +47,6 @@ PLATFORMS
 DEPENDENCIES
   backup2everbox!
   bundler (>= 1.0.0)
+  debugger
   rake (= 0.8.7)
   rdoc

data/History.rdoc

@@ -1,3 +1,6 @@
+=== 0.1.0 / 2012-06-25
+* support backup ~> 3.0
+
 === 0.0.3 / 2012-06-22
 * only working with backup-2
 * old everbox auth method no longer works

data/README.rdoc

@@ -11,55 +11,50 @@
 1. 注册一个 EverBox 帐号: http://www.everbox.com/ , 注意必须注册盛大通行证帐号,
    如果需要邀请码，请到 http://www.douban.com/group/topic/17242955/
 
-2. 运行 sudo gem install backup2everbox
+2. 运行 gem install backup2everbox
 
-3. 运行 sudo backup --setup
+3. 运行 backup generate:config
 
-4. 运行 backup2everbox, 得到认证码，输出如下所示
+4. 运行 backup generate:model --trigger=mysql_backup_everbox
+
+5. 运行 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
+
+    add following code to your ~/Backup/models/foo.rb
     ##################################################
-    storage :everbox do
-      access_key_id     '1234567890abcdefgh'
-      secret_access_key 'hgfedcba0987654321'
-      path              '/backups'
-    end
+      store_with Everbox do |eb|
+        eb.token     = '1234567890abcdefgh'
+        eb.secret    = 'hgfedcba0987654321'
+      end
     ##################################################
 
+6. 修改 ~/Backup/models/mysql_backup_everbox.rb, 改为如下的形式
 
-5. 修改 /opt/backup/config/backup.rb, 改为如下的形式
-
+    require 'rubygems'
     gem 'backup2everbox'
     require 'backup2everbox'
 
-    backup 'mysql-backup-everbox' do
-
-      adapter :mysql do
-        user  'USERNAME'
-        password 'PASSWORD'
-        database 'DBNAME'
-        skip_tables ['django_session']
-        options do
-          host '127.0.0.1'
-          port '3306'
-        end
-      end
+    Backup::Model.new(:mysql_backup_everbox, 'Description for mysql_backup_everbox') do
+      split_into_chunks_of 250
 
-      storage :everbox do
-        access_key_id     '1234567890abcdefgh'
-        secret_access_key 'hgfedcba0987654321'
-        path              '/backups'
+      database MySQL do |db|
+        db.name               = "giga_development"
+        db.username           = "my_username"
+        db.password           = "my_password"
+        db.host               = "localhost"
+        db.port               = 3306
+        db.socket             = "/tmp/mysql.sock"
       end
 
-      keep_backups 10
-      encrypt_with_password false
-      notify false
-
+      store_with Everbox do |eb|
+        eb.token     = '1234567890abcdefgh'
+        eb.secret    = 'hgfedcba0987654321'
+      end
     end
 
-6. 运行 sudo backup -r mysql-backup-everbox
+6. 运行 sudo backup perform -t mysql_backup_everbox
 
 7. backup 支持备份目录，数据库等多种源，并且支持非对称密钥加密来保护数据安全，
-   具体可以参考 backup 的文档: https://github.com/meskyanichi/backup/tree/backup-2
+   具体可以参考 backup 的文档: https://github.com/meskyanichi/backup

data/backup2everbox.gemspec

@@ -17,15 +17,15 @@ Gem::Specification.new do |s|
                     '--charset' << 'UTF-8'
   s.extra_rdoc_files = ['README.rdoc', 'History.rdoc']
 
-  s.add_dependency 'backup', '~> 2.0'
+  s.add_dependency 'backup', '~> 3.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.add_development_dependency 'debugger'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/backup/config/everbox.rb

@@ -0,0 +1,6 @@
+module Backup
+  module Config
+    module Everbox
+    end
+  end
+end

data/lib/backup/connection/everbox.rb

@@ -25,6 +25,8 @@ module Backup
 
         def authorize!
           @access_token = OAuth::AccessToken.from_hash(@consumer, {:oauth_token => authorizing_token, :oauth_token_secret => authorizing_secret})
+          raise "@access_token.token is nil" if @access_token.token.nil?
+          raise "@access_token.secret is nil" if @access_token.secret.nil?
           puts @access_token.inspect
         end
 
@@ -43,6 +45,7 @@ module Backup
         end
 
         def upload(filename, remote_path, opts={})
+          raise TypeError, "filename should be string, but #{filename.class}" unless filename.is_a?(String)
           remote_path = find_real_remote_path(remote_path)
           stat = path_stat(remote_path)
           if stat == :not_exist
@@ -63,6 +66,7 @@ module Backup
             :base      => ''
           }
           info = JSON.parse(access_token.post(fs(:prepare_put), JSON.dump(params), {'Content-Type' => 'text/plain' }).body)
+          raise "prepare_put failed:\n#{info}" unless info["required"].is_a?(Array)
           File.open(filename) do |f|
             info["required"].each do |x|
               puts "uploading block ##{x["index"]}"
@@ -181,17 +185,11 @@ module Backup
         end
       end
 
-      attr_accessor :adapter, :procedure, :final_file, :tmp_path, :api_key, :secret_access_key, :access_key_id, :path
+      attr_accessor :token, :secret
 
-      def initialize(adapter=false)
-        if adapter
-          self.adapter            = adapter
-          self.procedure          = adapter.procedure
-          self.final_file         = adapter.final_file
-          self.tmp_path           = adapter.tmp_path.gsub('\ ', ' ')
-
-          load_storage_configuration_attributes
-        end
+      def initialize(token, secret)
+        @token = token
+        @secret = secret
       end
 
       def static_initialize(procedure)
@@ -201,12 +199,12 @@ module Backup
 
       def session
         opts = {}
-        opts[:api_key] = api_key unless api_key.nil?
-        opts[:secret_access_key] = secret_access_key unless secret_access_key.nil?
+        opts[:api_key] = token unless token.nil?
+        opts[:secret_access_key] = secret unless secret.nil?
         @session ||= Session.new(opts)
         unless @session.authorized?
-          @session.authorizing_token = access_key_id
-          @session.authorizing_secret = secret_access_key
+          @session.authorizing_token = token
+          @session.authorizing_secret = secret
           @session.authorize!
         end
 

data/lib/backup/storage/everbox.rb

@@ -1,12 +1,44 @@
 require 'backup/connection/everbox'
+require 'debugger'
 
 module Backup
   module Storage
     class Everbox < Base
-      def initialize(adapter)
-        everbox = Backup::Connection::Everbox.new(adapter)
-        everbox.store
+
+      attr_accessor :token, :secret
+      attr_accessor :path
+
+      def initialize(model, storage_id = nil, &block)
+        super(model, storage_id)
+
+        @path ||= 'backups'
+
+        instance_eval(&block) if block_given?
       end
+
+      def transfer!
+        remote_path = remote_path_for(@package)
+
+        connection = Backup::Connection::Everbox.new(token, secret)
+
+        files_to_transfer_for(@package) do |local_file, remote_file|
+          Logger.message "#{storage_name} started transferring " +
+              "'#{ local_file }'."
+          connection.session.upload(
+            File.join(local_path, local_file),
+            File.join(remote_path, remote_file),
+            :mode => :dropbox
+            )
+
+
+          #File.open(File.join(local_path, local_file), 'r') do |file|
+          #  connection.put_object(
+          #    bucket, File.join(remote_path, remote_file), file
+          #  )
+          #end
+        end
+      end
+
     end
   end
 end

data/lib/backup2everbox.rb

@@ -1,4 +1,4 @@
-require 'active_support/core_ext/module/aliasing'
+require 'backup/config/everbox'
 
 module Backup
   module Connection
@@ -10,24 +10,4 @@ module Backup
   module Record
     autoload :Everbox, 'backup/record/everbox'
   end
-  module Configuration
-    class Base
-      def storage_class_with_everbox
-        res = storage_class_without_everbox
-        if res.nil? and @storage_name == :everbox
-          res = Backup::Storage::Everbox
-        end
-        res
-      end
-      def record_class_with_everbox
-        res = record_class_without_everbox
-        if res.nil? and @storage_name == :everbox
-          res = Backup::Record::Everbox
-        end
-        res
-      end
-      alias_method_chain :storage_class, :everbox
-      alias_method_chain :record_class, :everbox
-    end
-  end
 end

data/lib/backup2everbox/cli.rb

@@ -29,13 +29,13 @@ module Backup2everbox
       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
+      puts "add following code to your ~/Backup/models/foo.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 "  store_with Everbox do |eb|"
+      puts "    eb.token     = '#{access_token.token}'"
+      puts "    eb.secret    = '#{access_token.secret}'"
+      puts "  end"
       puts "#" * 50
     end
 

data/lib/backup2everbox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backup2everbox
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backup
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -92,55 +92,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.0.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -175,8 +175,8 @@ files:
 - TODO
 - backup2everbox.gemspec
 - bin/backup2everbox
+- lib/backup/config/everbox.rb
 - lib/backup/connection/everbox.rb
-- lib/backup/record/everbox.rb
 - lib/backup/storage/everbox.rb
 - lib/backup2everbox.rb
 - lib/backup2everbox/cli.rb

data/lib/backup/record/everbox.rb

@@ -1,23 +0,0 @@
-require 'backup/connection/everbox'
-
-module Backup
-  module Record
-    class Everbox < Backup::Record::Base
-      def load_specific_settings(adapter)
-      end
-
-      private
-
-      def self.destroy_backups(procedure, backups)
-        everbox = Backup::Connection::Everbox.new
-        everbox.static_initialize(procedure)
-        session = everbox.session
-        backups.each do |backup|
-          puts "\nDestroying backup \"#{backup.filename}\"."
-          path_to_file = File.join(everbox.path, backup.filename)
-          session.delete(path_to_file, :mode => :everbox)
-        end
-      end
-    end
-  end
-end