dbox 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/dbox.gemspec

@@ -5,14 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dbox}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ken Pratt}]
-  s.date = %q{2011-09-19}
+  s.authors = ["Ken Pratt"]
+  s.date = %q{2011-10-03}
+  s.default_executable = %q{dbox}
   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}]
+  s.executables = ["dbox"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -47,12 +48,13 @@ Gem::Specification.new do |s|
     "vendor/dropbox-client-ruby/test/util.rb"
   ]
   s.homepage = %q{http://github.com/kenpratt/dbox}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Dropbox made easy.}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/dbox/database.rb

@@ -11,7 +11,8 @@ module Dbox
       if db.bootstrapped?
         raise DatabaseError, "Database already initialized -- please use 'dbox pull' or 'dbox push'."
       end
-      db.bootstrap(remote_path, local_path)
+      db.bootstrap(remote_path)
+      db.migrate()
       db
     end
 
@@ -20,6 +21,7 @@ module Dbox
       unless db.bootstrapped?
         raise DatabaseError, "Database not initialized -- please run 'dbox create' or 'dbox clone'."
       end
+      db.migrate()
       db
     end
 
@@ -33,10 +35,13 @@ module Dbox
       new_db.migrate_entry_from_old_db_format(old_db.root)
     end
 
+    attr_reader :local_path
+
     # IMPORTANT: Database.new is private. Please use Database.create
     # or Database.load as the entry point.
     private_class_method :new
     def initialize(local_path)
+      @local_path = local_path
       FileUtils.mkdir_p(local_path)
       @db = SQLite3::Database.new(File.join(local_path, DB_FILENAME))
       @db.trace {|sql| log.debug sql.strip }
@@ -48,7 +53,6 @@ module Dbox
       @db.execute_batch(%{
         CREATE TABLE IF NOT EXISTS metadata (
           id           integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-          local_path   varchar(255) NOT NULL,
           remote_path  varchar(255) NOT NULL,
           version      integer NOT NULL
         );
@@ -65,13 +69,22 @@ module Dbox
       })
     end
 
-    METADATA_COLS = [ :local_path, :remote_path, :version ] # don't need to return id
+    def migrate
+      if metadata[:version] < 2
+        @db.execute_batch(%{
+          ALTER TABLE metadata DROP COLUMN local_path;
+          UPDATE_TABLE metadata SET version = 2;
+        })
+      end
+    end
+
+    METADATA_COLS = [ :remote_path, :version ] # don't need to return id
     ENTRY_COLS    = [ :id, :path, :is_dir, :parent_id, :hash, :modified, :revision ]
 
-    def bootstrap(remote_path, local_path)
+    def bootstrap(remote_path)
       @db.execute(%{
-        INSERT INTO metadata (local_path, remote_path, version) VALUES (?, ?, ?);
-      }, local_path, remote_path, 1)
+        INSERT INTO metadata (remote_path, version) VALUES (?, ?);
+      }, remote_path, 2)
       @db.execute(%{
         INSERT INTO entries (path, is_dir) VALUES (?, ?)
       }, "", 1)
@@ -89,7 +102,9 @@ module Dbox
       res = @db.get_first_row(%{
         SELECT #{cols.join(',')} FROM metadata LIMIT 1;
       })
-      make_fields(cols, res) if res
+      out = { :local_path => local_path }
+      out.merge!(make_fields(cols, res)) if res
+      out
     end
 
     def update_metadata(fields)
@@ -128,8 +143,17 @@ module Dbox
     end
 
     def delete_entry_by_path(path)
-      raise(ArgumentError, "path cannot be null") unless path
-      delete_entry("WHERE path=?", path)
+      delete_entry_by_entry(find_by_path(path))
+    end
+
+    def delete_entry_by_entry(entry)
+      raise(ArgumentError, "entry cannot be null") unless entry
+
+      # cascade delete children, if any
+      contents(entry[:id]).each {|child| delete_entry_by_entry(child) }
+
+      # delete main entry
+      delete_entry("WHERE id=?", entry[:id])
     end
 
     def migrate_entry_from_old_db_format(entry, parent = nil)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 Z
+date: 2011-10-03 00:00:00 -07:00
+default_executable: dbox
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -25,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 1
@@ -41,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 4
@@ -57,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 1
         - 5
@@ -73,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 3
@@ -89,7 +85,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 3
         - 0
@@ -134,6 +129,7 @@ files:
 - vendor/dropbox-client-ruby/test/authenticator_test.rb
 - vendor/dropbox-client-ruby/test/client_test.rb
 - vendor/dropbox-client-ruby/test/util.rb
+has_rdoc: true
 homepage: http://github.com/kenpratt/dbox
 licenses: 
 - MIT
@@ -147,7 +143,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -156,14 +151,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Dropbox made easy.