dbox 0.6.2 → 0.6.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.6.3 / 2011-11-29
+  * Bug Fixes
+    * Fixed crash when multiple Dropbox operations fail.
+
 == 0.6.2 / 2011-11-24
   * Bug Fixes
     * Fixed db migration.

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/dbox.gemspec

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

@@ -202,7 +202,7 @@ module Dbox
           res.read_body {|chunk| io.write(chunk) }
           true
         else
-          raise DropboxError.new("Invalid response #{res}\n#{res.body}")
+          raise DropboxError.new("Invalid response #{res.inspect}")
         end
       end
     end

data/lib/dbox/syncer.rb

@@ -148,6 +148,20 @@ module Dbox
       def remove_tmpfiles
         Dir["#{local_path}/.*.part"].each {|f| FileUtils.rm(f) }
       end
+
+      def sort_changelist(changelist)
+        changelist.keys.each do |k|
+          case k
+          when :conflicts
+            changelist[k].sort! {|c1, c2| c1[:original] <=> c2[:original] }
+          when :failed
+            changelist[k].sort! {|c1, c2| c1[:path] <=> c2[:path] }
+          else
+            changelist[k].sort!
+          end
+        end
+        changelist
+      end
     end
 
     class Pull < Operation
@@ -243,8 +257,7 @@ module Dbox
         end
 
         # sort & return output
-        changelist.keys.each {|k| k == :conflicts ? changelist[k].sort! {|c1, c2| c1[:original] <=> c2[:original] } : changelist[k].sort! }
-        changelist
+        sort_changelist(changelist)
       end
 
       def calculate_changes(dir, operation = :update)
@@ -518,8 +531,7 @@ module Dbox
         ptasks.finish
 
         # sort & return output
-        changelist.keys.each {|k| changelist[k].sort! }
-        changelist
+        sort_changelist(changelist)
       end
 
       def calculate_changes(dir)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-24 00:00:00 Z
+date: 2011-11-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post