dbox 0.6.10 → 0.6.11

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.11 / 2012-04-10
+  * Minor Enhancements
+    * Added operations that failed change calculation to result hash on pull.
+    * Added stack traces to log output when rescuing exceptions.
+
 == 0.6.10 / 2012-04-10
   * Minor Enhancements
     * Improved error handling on calculating changes on pull.

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.6.11

data/dbox.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dbox"
-  s.version = "0.6.10"
+  s.version = "0.6.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ken Pratt"]

data/lib/dbox/syncer.rb

@@ -209,7 +209,7 @@ module Dbox
                     changelist[:conflicts] << res[1]
                   end
                 rescue Exception => e
-                  log.error "Error while downloading #{c[:path]}: #{e.inspect}"
+                  log.error "Error while downloading #{c[:path]}: #{e.inspect}\n#{e.backtrace.join("\n")}"
                   parent_ids_of_failed_entries << c[:parent_id]
                   changelist[:failed] << { :operation => :create, :path => c[:path], :error => e }
                 end
@@ -232,7 +232,7 @@ module Dbox
                     changelist[:conflicts] << res[1]
                   end
                 rescue Exception => e
-                  log.error "Error while downloading #{c[:path]}: #{e.inspect}"
+                  log.error "Error while downloading #{c[:path]}: #{e.inspect}\n#{e.backtrace.join("\n")}"
                   parent_ids_of_failed_entries << c[:parent_id]
                   changelist[:failed] << { :operation => :create, :path => c[:path], :error => e }
                 end
@@ -242,6 +242,9 @@ module Dbox
             c[:is_dir] ? delete_dir(c) : delete_file(c)
             database.delete_entry_by_path(c[:path])
             changelist[:deleted] << c[:path]
+          when :failed
+            parent_ids_of_failed_entries << c[:parent_id]
+            changelist[:failed] << { :operation => c[:operation], :path => c[:path], :error => c[:error] }
           else
             raise(RuntimeError, "Unknown operation type: #{op}")
           end
@@ -324,8 +327,8 @@ module Dbox
               clone_api_into_current_thread()
               Thread.current[:out] = calculate_changes(dir, operation)
             rescue Exception => e
-              log.error "Error while caclulating changes #{dir.inspect}: #{operation}"
-              log.error e.inspect
+              log.error "Error while caclulating changes for #{operation} on #{dir[:path]}: #{e.inspect}\n#{e.backtrace.join("\n")}"
+              Thread.current[:out] = [[:failed, dir.merge({ :operation => operation, :error => e })]]
             end
           end
         end
@@ -473,7 +476,7 @@ module Dbox
                     changelist[:conflicts] << { :original => c[:path], :renamed => res[:path] }
                   end
                 rescue Exception => e
-                  log.error "Error while uploading #{c[:path]}: #{e.inspect}"
+                  log.error "Error while uploading #{c[:path]}: #{e.inspect}\n#{e.backtrace.join("\n")}"
                   changelist[:failed] << { :operation => :create, :path => c[:path], :error => e }
                 end
               end
@@ -502,7 +505,7 @@ module Dbox
                     changelist[:conflicts] << { :original => c[:path], :renamed => res[:path] }
                   end
                 rescue Exception => e
-                  log.error "Error while uploading #{c[:path]}: #{e.inspect}"
+                  log.error "Error while uploading #{c[:path]}: #{e.inspect}\n#{e.backtrace.join("\n")}"
                   changelist[:failed] << { :operation => :update, :path => c[:path], :error => e }
                 end
               end
@@ -523,10 +526,12 @@ module Dbox
                 database.delete_entry_by_path(c[:path])
                 changelist[:deleted] << c[:path]
               rescue Exception => e
-                log.error "Error while deleting #{c[:path]}: #{e.inspect}"
+                log.error "Error while deleting #{c[:path]}: #{e.inspect}\n#{e.backtrace.join("\n")}"
                 changelist[:failed] << { :operation => :delete, :path => c[:path], :error => e }
               end
             end
+          when :failed
+            changelist[:failed] << { :operation => c[:operation], :path => c[:path], :error => c[:error] }
           else
             raise(RuntimeError, "Unknown operation type: #{op}")
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 6
-  - 10
-  version: 0.6.10
+  - 11
+  version: 0.6.11
 platform: ruby
 authors: 
 - Ken Pratt