dbox 0.6.7 → 0.6.8

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.8 / 2012-04-02
+  * Minor Enhancements
+    * Added retries after receiving HTTPServiceUnavailable from Dropbox API.
+    * Turned number of threads down to 3 (more than that triggers Dropbox rate limiting after a while).
+
 == 0.6.7 / 2012-03-29
   * Minor Enhancements
     * Added timeout to SQLite operations to help with threads competing for db operations.

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/dbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dbox"
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ken Pratt"]
-  s.date = "2012-03-29"
+  s.date = "2012-04-03"
   s.description = "An easy-to-use Dropbox client with fine-grained control over syncs."
   s.email = "ken@kenpratt.net"
   s.executables = ["dbox"]

data/lib/dbox/api.rb

@@ -1,4 +1,7 @@
 module Dbox
+  NUM_TRIES = 3
+  TIME_BETWEEN_TRIES = 3 # in seconds
+
   class ConfigurationError < RuntimeError; end
   class ServerError < RuntimeError; end
   class RemoteMissing < RuntimeError; end
@@ -62,16 +65,24 @@ module Dbox
       @client = DropboxClient.new(@session, 'dropbox')
     end
 
-    def run(path)
+    def run(path, tries = NUM_TRIES, &proc)
       begin
-        res = yield
+        res = proc.call
         handle_response(path, res) { raise RuntimeError, "Unexpected result: #{res.inspect}" }
       rescue DropboxNotModified => e
         :not_modified
       rescue DropboxAuthError => e
         raise e
       rescue DropboxError => e
-        handle_response(path, e.http_response) { raise ServerError, "Server error -- might be a hiccup, please try your request again (#{e.message})" }
+        if e.http_response.kind_of?(Net::HTTPServiceUnavailable) && tries > 0
+          log.info "Encountered 503 on #{path} (likely rate limiting). Sleeping #{TIME_BETWEEN_TRIES}s and trying again."
+          # TODO check for "Retry-After" header and use that for sleep instead of TIME_BETWEEN_TRIES
+          log.debug "Headers: #{e.http_response.to_hash.inspect}"
+          sleep TIME_BETWEEN_TRIES
+          run(path, tries - 1, &proc)
+        else
+          handle_response(path, e.http_response) { raise ServerError, "Server error -- might be a hiccup, please try your request again (#{e.message})" }
+        end
       end
     end
 
@@ -95,8 +106,8 @@ module Dbox
     end
 
     def metadata(path = "/", hash = nil, list=true)
-      log.debug "Fetching metadata for #{path}"
       run(path) do
+        log.debug "Fetching metadata for #{path}"
         res = @client.metadata(path, 10000, list, hash)
         log.debug res.inspect
         res
@@ -104,8 +115,8 @@ module Dbox
     end
 
     def create_dir(path)
-      log.info "Creating #{path}"
       run(path) do
+        log.info "Creating #{path}"
         begin
           @client.file_create_folder(path)
         rescue DropboxError => e
@@ -119,17 +130,19 @@ module Dbox
     end
 
     def delete_dir(path)
-      log.info "Deleting #{path}"
       run(path) do
+        log.info "Deleting #{path}"
         @client.file_delete(path)
       end
     end
 
     def get_file(path, file_obj, stream=false)
-      log.info "Downloading #{path}"
       unless stream
         # just download directly using the get_file API
-        res = run(path) { @client.get_file(path) }
+        res = run(path) do
+          log.info "Downloading #{path}"
+          @client.get_file(path)
+        end
         if res.kind_of?(String)
           file_obj << res
           true
@@ -142,6 +155,7 @@ module Dbox
         res = run(path) { @client.media(path) }
         url = res[:url] if res && res.kind_of?(Hash)
         if url
+          log.info "Downloading #{path}"
           streaming_download(url, file_obj)
         else
           get_file(path, file_obj, false)
@@ -149,23 +163,23 @@ module Dbox
       end
     end
 
-    def put_file(path, file_obj, previous_revision=nil)
-      log.info "Uploading #{path}"
+    def put_file(path, local_path, previous_revision=nil)
       run(path) do
-        @client.put_file(path, file_obj, false, previous_revision)
+        log.info "Uploading #{path}"
+        File.open(local_path, "r") {|f| @client.put_file(path, f, false, previous_revision) }
       end
     end
 
     def delete_file(path)
-      log.info "Deleting #{path}"
       run(path) do
+        log.info "Deleting #{path}"
         @client.file_delete(path)
       end
     end
 
     def move(old_path, new_path)
-      log.info "Moving #{old_path} to #{new_path}"
       run(old_path) do
+        log.info "Moving #{old_path} to #{new_path}"
         begin
           @client.file_move(old_path, new_path)
         rescue DropboxError => e

data/lib/dbox/db.rb

@@ -517,9 +517,7 @@ module Dbox
       end
 
       def upload
-        File.open(local_path) do |f|
-          api.put_file(remote_path, f)
-        end
+        api.put_file(remote_path, local_path)
         force_metadata_update_from_server
       end
     end

data/lib/dbox/syncer.rb

@@ -1,6 +1,6 @@
 module Dbox
   class Syncer
-    MAX_PARALLEL_DBOX_OPS = 5
+    MAX_PARALLEL_DBOX_OPS = 3
     MIN_BYTES_TO_STREAM_DOWNLOAD = 1024 * 100 # 100kB
 
     include Loggable
@@ -620,12 +620,10 @@ module Dbox
       def upload_file(file)
         local_path = relative_to_local_path(file[:path])
         remote_path = relative_to_remote_path(file[:path])
-        File.open(local_path) do |f|
-          db_entry = database.find_by_path(file[:path])
-          last_revision = db_entry ? db_entry[:revision] : nil
-          res = api.put_file(remote_path, f, last_revision)
-          process_basic_remote_props(res)
-        end
+        db_entry = database.find_by_path(file[:path])
+        last_revision = db_entry ? db_entry[:revision] : nil
+        res = api.put_file(remote_path, local_path, last_revision)
+        process_basic_remote_props(res)
       end
 
       def force_metadata_update_from_server(entry)

data/spec/dbox_spec.rb

@@ -377,7 +377,14 @@ describe Dbox do
       Dbox.push(@local).should eql(:created => [], :deleted => [], :updated => ["hello.txt"], :failed => [])
 
       make_file "#{@alternate}/hello.txt"
-      Dbox.push(@alternate).should eql(:created => [], :deleted => [], :updated => [], :conflicts => [{:original => "hello.txt", :renamed => "hello (1).txt"}], :failed => [])
+      res = Dbox.push(@alternate)
+      res[:created].should eql([])
+      res[:updated].should eql([])
+      res[:deleted].should eql([])
+      res[:failed].should eql([])
+      res[:conflicts].size.should eql(1)
+      res[:conflicts][0][:original].should eql("hello.txt")
+      res[:conflicts][0][:renamed].should match(/hello \(.* conflicted copy\).txt/)
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-29 00:00:00 Z
+date: 2012-04-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post