dbox 0.4.3 → 0.4.4

data/Rakefile

@@ -14,6 +14,9 @@ Jeweler::Tasks.new do |gem|
   gem.email = "ken@kenpratt.net"
   gem.authors = ["Ken Pratt"]
   gem.executables = ["dbox"]
+  gem.add_dependency "multipart-post", ">= 1.1.2"
+  gem.add_dependency "oauth", ">= 0.4.5"
+  gem.add_dependency "json", ">= 1.5.3"
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/dbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dbox}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ken Pratt}]
-  s.date = %q{2011-05-19}
+  s.date = %q{2011-06-28}
   s.description = %q{An easy-to-use Dropbox client with fine-grained control over syncs.}
   s.email = %q{ken@kenpratt.net}
   s.executables = [%q{dbox}]
@@ -52,9 +52,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<multipart-post>, [">= 1.1.2"])
+      s.add_runtime_dependency(%q<oauth>, [">= 0.4.5"])
+      s.add_runtime_dependency(%q<json>, [">= 1.5.3"])
     else
+      s.add_dependency(%q<multipart-post>, [">= 1.1.2"])
+      s.add_dependency(%q<oauth>, [">= 0.4.5"])
+      s.add_dependency(%q<json>, [">= 1.5.3"])
     end
   else
+    s.add_dependency(%q<multipart-post>, [">= 1.1.2"])
+    s.add_dependency(%q<oauth>, [">= 0.4.5"])
+    s.add_dependency(%q<json>, [">= 1.5.3"])
   end
 end
 

data/lib/dbox/db.rb

@@ -1,11 +1,13 @@
 module Dbox
   class MissingDatabase < RuntimeError; end
+  class CorruptDatabase < RuntimeError; end
   class BadPath < RuntimeError; end
 
   class DB
     include Loggable
 
     DB_FILE = ".dropbox.db"
+    DB_TMPFILE = ".dropbox.db.tmp"
 
     attr_accessor :local_path
 
@@ -38,9 +40,19 @@ module Dbox
       File.exists?(db_file(local_path))
     end
 
+    def self.corrupt?(local_path)
+      begin
+        load(local_path)
+        false
+      rescue CorruptDatabase
+        true
+      end
+    end
+
     def self.load(local_path)
       if exists?(local_path)
         db = File.open(db_file(local_path), "r") {|f| YAML::load(f.read) }
+        raise CorruptDatabase unless db && db.kind_of?(DB)
         db.local_path = local_path
         db
       else
@@ -60,7 +72,8 @@ module Dbox
 
     def save
       self.class.saving_timestamp(@local_path) do
-        File.open(db_file, "w") {|f| f << YAML::dump(self) }
+        File.open(db_tmpfile, "w") {|f| f << YAML::dump(self) }
+        FileUtils.mv(db_tmpfile, db_file)
       end
     end
 
@@ -95,7 +108,7 @@ module Dbox
     end
 
     def relative_to_local_path(path)
-      if path.any?
+      if path && path.length > 0
         File.join(@local_path, path)
       else
         @local_path
@@ -103,7 +116,7 @@ module Dbox
     end
 
     def relative_to_remote_path(path)
-      if path.any?
+      if path && path.length > 0
         File.join(@remote_path, path)
       else
         @remote_path
@@ -128,10 +141,18 @@ module Dbox
       File.join(local_path, DB_FILE)
     end
 
+    def self.db_tmpfile(local_path)
+      File.join(local_path, DB_TMPFILE)
+    end
+
     def db_file
       self.class.db_file(@local_path)
     end
 
+    def db_tmpfile
+      self.class.db_tmpfile(@local_path)
+    end
+
     class DropboxBlob
       include Loggable
 

data/lib/dbox.rb

@@ -51,6 +51,11 @@ module Dbox
     Dbox::DB.exists?(local_path)
   end
 
+  def self.corrupt?(local_path)
+    local_path = clean_local_path(local_path)
+    Dbox::DB.corrupt?(local_path)
+  end
+
   private
 
   def self.clean_remote_path(path)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,9 +15,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 Z
-dependencies: []
-
+date: 2011-06-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: multipart-post
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 4
+        - 5
+        version: 0.4.5
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        - 3
+        version: 1.5.3
+  type: :runtime
+  version_requirements: *id003
 description: An easy-to-use Dropbox client with fine-grained control over syncs.
 email: ken@kenpratt.net
 executables: