dbox 0.7.2 → 0.7.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.7.3 / 2012-12-23
+  * Minor Enhancements
+    * Added retry on all failed operations, not just rate limiting, to be more resilient with API errors.
+
 == 0.7.2 / 2012-12-04
   * Minor Enhancements
     * Added configurable Dropbox access type (sandbox or app_folder).

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/dbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dbox"
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ken Pratt"]
-  s.date = "2012-12-04"
+  s.date = "2012-12-23"
   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

@@ -76,15 +76,28 @@ module Dbox
       rescue DropboxAuthError => e
         raise e
       rescue DropboxError => e
-        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}"
+        if tries > 0
+          if e.http_response.kind_of?(Net::HTTPServiceUnavailable)
+            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.info "Headers: #{e.http_response.to_hash.inspect}"
+          else
+            log.info "Encountered a dropbox error. Sleeping #{TIME_BETWEEN_TRIES}s and trying again. Error: #{e.inspect}"
+            log.info "Headers: #{e.http_response.to_hash.inspect}"
+          end
           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
+      rescue Exception => e
+        if tries > 0
+          log.info "Encounted an unknown error. Sleeping #{TIME_BETWEEN_TRIES}s and trying again. Error: #{e.inspect}"
+          sleep TIME_BETWEEN_TRIES
+          run(path, tries - 1, &proc)
+        else
+          raise e
+        end
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-04 00:00:00 Z
+date: 2012-12-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post