dbox 0.6.4 → 0.6.5

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.5 / 2012-02-03
+  * Bug Fixes
+    * Fixed issue with threads continuing after Dbox crashes when using Ruby API.
+
 == 0.6.4 / 2011-11-29
   * Minor Enhancements
     * Removed workaround for /put_files API bug, as Dropbox has fixed it.

data/README.md

@@ -11,7 +11,7 @@ $ dbox clone Public
 $ cd Public
 $ echo "Hello World" > hello.txt
 $ dbox sync
-[INFO] Uploading /Public/hello2.txt
+[INFO] Uploading /Public/hello.txt
 ```
 
 **IMPORTANT:** This is **not** an automated Dropbox client. It will exit after sucessfully pushing/pulling, so if you want regular updates, you can run it in cron, a loop, etc. If you do want to run it in a loop, take a look at [sample_polling_script.rb](http://github.com/kenpratt/dbox/blob/master/sample_polling_script.rb). You get deterministic control over what you want Dropbox to do and when you want it to happen.

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/dbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dbox"
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ken Pratt"]
-  s.date = "2011-11-29"
+  s.date = "2012-02-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/database.rb

@@ -319,7 +319,7 @@ module Dbox
     end
 
     def update_entry(where_clause, fields)
-      log.debug "Updating entry: #{where_clause}, #{fields.inspect}"
+      log.debug "Updating entry: #{where_clause.inspect}, #{fields.inspect}"
       h = fields.clone
       h[:modified]  = h[:modified].to_i if h[:modified]
       conditions, *args = *where_clause

data/lib/dbox/parallel_tasks.rb

@@ -51,7 +51,14 @@ class ParallelTasks
               end
             end
           end
-          task.call if task
+          if task
+            begin
+              task.call
+            rescue Exception => e
+              log.error e.inspect
+              task.call
+            end
+          end
         end
       end
     end

data/lib/dbox/syncer.rb

@@ -208,7 +208,7 @@ module Dbox
                     changelist[:conflicts] ||= []
                     changelist[:conflicts] << res[1]
                   end
-                rescue Dbox::ServerError => e
+                rescue Exception => e
                   log.error "Error while downloading #{c[:path]}: #{e.inspect}"
                   parent_ids_of_failed_entries << c[:parent_id]
                   changelist[:failed] << { :operation => :create, :path => c[:path], :error => e }
@@ -231,7 +231,7 @@ module Dbox
                     changelist[:conflicts] ||= []
                     changelist[:conflicts] << res[1]
                   end
-                rescue Dbox::ServerError => e
+                rescue Exception => e
                   log.error "Error while downloading #{c[:path]}: #{e.inspect}"
                   parent_ids_of_failed_entries << c[:parent_id]
                   changelist[:failed] << { :operation => :create, :path => c[:path], :error => e }
@@ -320,8 +320,12 @@ module Dbox
         # recursively process new & existing subdirectories in parallel
         threads = recur_dirs.map do |operation, dir|
           Thread.new do
-            clone_api_into_current_thread()
-            Thread.current[:out] = calculate_changes(dir, operation)
+            begin
+              clone_api_into_current_thread()
+              Thread.current[:out] = calculate_changes(dir, operation)
+            rescue Exception => e
+              log.error "Error while caclulating changes #{dir}: #{operation}"
+            end
           end
         end
         threads.each {|t| t.join; out += t[:out] }
@@ -467,7 +471,7 @@ module Dbox
                     changelist[:conflicts] ||= []
                     changelist[:conflicts] << { :original => c[:path], :renamed => res[:path] }
                   end
-                rescue Dbox::ServerError => e
+                rescue Exception => e
                   log.error "Error while uploading #{c[:path]}: #{e.inspect}"
                   changelist[:failed] << { :operation => :create, :path => c[:path], :error => e }
                 end
@@ -496,7 +500,7 @@ module Dbox
                     changelist[:conflicts] ||= []
                     changelist[:conflicts] << { :original => c[:path], :renamed => res[:path] }
                   end
-                rescue Dbox::ServerError => e
+                rescue Exception => e
                   log.error "Error while uploading #{c[:path]}: #{e.inspect}"
                   changelist[:failed] << { :operation => :update, :path => c[:path], :error => e }
                 end
@@ -517,7 +521,7 @@ module Dbox
                 end
                 database.delete_entry_by_path(c[:path])
                 changelist[:deleted] << c[:path]
-              rescue Dbox::ServerError => e
+              rescue Exception => e
                 log.error "Error while deleting #{c[:path]}: #{e.inspect}"
                 changelist[:failed] << { :operation => :delete, :path => c[:path], :error => e }
               end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 Z
+date: 2012-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post