dbox 0.4.4 → 0.5.0

data/sample_polling_script.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "dbox"
+
+ENV["DROPBOX_APP_KEY"] = "cmlrrjd3j0gbend"
+ENV["DROPBOX_APP_SECRET"] = "uvuulp75xf9jffl"
+ENV["DROPBOX_AUTH_KEY"] = "v4d7l1rez1czksn"
+ENV["DROPBOX_AUTH_SECRET"] = "pqej9rmnj0i1gcxr4"
+
+LOGFILE = "/home/myuser/dbox.log"
+LOCAL_PATH = "/home/myuser/dropbox"
+REMOTE_PATH = "/stuff/myfolder"
+INTERVAL = 60 # time between syncs, in seconds
+
+LOGGER = Logger.new(LOGFILE, 1, 1024000)
+LOGGER.level = Logger::INFO
+
+def main
+  while 1
+    begin
+      sync
+    rescue Interrupt => e
+      exit 0
+    rescue Exception => e
+      LOGGER.error e
+    end
+    sleep INTERVAL
+  end
+end
+
+def sync
+  unless Dbox.exists?(LOCAL_PATH)
+    LOGGER.info "Cloning"
+    Dbox.clone(REMOTE_PATH, LOCAL_PATH)
+    LOGGER.info "Done"
+  else
+    LOGGER.info "Syncing"
+    Dbox.push(LOCAL_PATH)
+    Dbox.pull(LOCAL_PATH)
+    LOGGER.info "Done"
+  end
+end
+
+main

data/spec/dbox_spec.rb

@@ -22,10 +22,15 @@ describe Dbox do
 
   describe "#create" do
     it "creates the local directory" do
-      Dbox.create(@remote, @local)
+      Dbox.create(@remote, @local).should eql(:created => [], :deleted => [], :updated => [""])
       @local.should exist
     end
 
+    it "creates the remote directory" do
+      Dbox.create(@remote, @local).should eql(:created => [], :deleted => [], :updated => [""])
+      ensure_remote_exists(@remote)
+    end
+
     it "should fail if the remote already exists" do
       Dbox.create(@remote, @local)
       rm_rf @local
@@ -39,7 +44,7 @@ describe Dbox do
       Dbox.create(@remote, @local)
       rm_rf @local
       @local.should_not exist
-      Dbox.clone(@remote, @local)
+      Dbox.clone(@remote, @local).should eql(:created => [], :deleted => [], :updated => [""])
       @local.should exist
     end
 
@@ -51,12 +56,13 @@ describe Dbox do
 
   describe "#pull" do
     it "should fail if the local dir is missing" do
-      expect { Dbox.pull(@local) }.to raise_error(Dbox::MissingDatabase)
+      expect { Dbox.pull(@local) }.to raise_error(Dbox::DatabaseError)
     end
 
     it "should fail if the remote dir is missing" do
       Dbox.create(@remote, @local)
-      modify_dbfile {|s| s.sub(/^remote_path: \/.*$/, "remote_path: /#{randname()}") }
+      db = Dbox::Database.load(@local)
+      db.update_metadata(:remote_path => "/" + randname())
       expect { Dbox.pull(@local) }.to raise_error(Dbox::RemoteMissing)
     end
 
@@ -74,7 +80,7 @@ describe Dbox do
       touch "#{@alternate}/hello.txt"
       Dbox.push(@alternate).should eql(:created => ["hello.txt"], :deleted => [], :updated => [])
 
-      Dbox.pull(@local).should eql(:created => ["hello.txt"], :deleted => [], :updated => [])
+      Dbox.pull(@local).should eql(:created => ["hello.txt"], :deleted => [], :updated => [""])
       "#{@local}/hello.txt".should exist
     end
 
@@ -83,7 +89,7 @@ describe Dbox do
       touch "#{@local}/hello.txt"
       Dbox.push(@local).should eql(:created => ["hello.txt"], :deleted => [], :updated => [])
       rm "#{@local}/hello.txt"
-      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
+      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [""])
       "#{@local}/hello.txt".should_not exist
     end
 
@@ -99,23 +105,28 @@ describe Dbox do
       touch "#{@alternate}/bar.txt"
       touch "#{@alternate}/baz.txt"
       Dbox.push(@alternate).should eql(:created => ["bar.txt", "baz.txt", "foo.txt"], :deleted => [], :updated => [])
+      Dbox.pull(@alternate).should eql(:created => [], :deleted => [], :updated => [""])
+      Dbox.pull(@alternate).should eql(:created => [], :deleted => [], :updated => [])
 
-      Dbox.pull(@local).should eql(:created => ["bar.txt", "baz.txt", "foo.txt"], :deleted => [], :updated => [])
+      Dbox.pull(@local).should eql(:created => ["bar.txt", "baz.txt", "foo.txt"], :deleted => [], :updated => [""])
+      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
 
-      sleep 1
       mkdir "#{@alternate}/subdir"
       touch "#{@alternate}/subdir/one.txt"
       rm "#{@alternate}/foo.txt"
       File.open("#{@alternate}/baz.txt", "w") {|f| f << "baaz" }
       Dbox.push(@alternate).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => ["foo.txt"], :updated => ["baz.txt"])
+      Dbox.pull(@alternate).should eql(:created => [], :deleted => [], :updated => ["", "subdir"])
+      Dbox.pull(@alternate).should eql(:created => [], :deleted => [], :updated => [])
 
-      Dbox.pull(@local).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => ["foo.txt"], :updated => ["baz.txt"])
+      Dbox.pull(@local).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => ["foo.txt"], :updated => ["", "baz.txt"])
+      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
     end
   end
 
   describe "#push" do
     it "should fail if the local dir is missing" do
-      expect { Dbox.push(@local) }.to raise_error(Dbox::MissingDatabase)
+      expect { Dbox.push(@local) }.to raise_error(Dbox::DatabaseError)
     end
 
     it "should be able to push" do
@@ -123,50 +134,64 @@ describe Dbox do
       Dbox.push(@local).should eql(:created => [], :deleted => [], :updated => [])
     end
 
-    it "should be able to push new file" do
+    it "should be able to push a new file" do
       Dbox.create(@remote, @local)
       touch "#{@local}/foo.txt"
       Dbox.push(@local).should eql(:created => ["foo.txt"], :deleted => [], :updated => [])
     end
 
-    it "should create the remote dir if it is missing" do
+    it "should be able to push a new dir" do
       Dbox.create(@remote, @local)
-      touch "#{@local}/foo.txt"
-      @new_name = randname()
-      @new_remote = File.join(REMOTE_TEST_PATH, @new_name)
-      modify_dbfile {|s| s.sub(/^remote_path: \/.*$/, "remote_path: #{@new_remote}") }
-      Dbox.push(@local).should eql(:created => ["foo.txt"], :deleted => [], :updated => [])
+      mkdir "#{@local}/subdir"
+      Dbox.push(@local).should eql(:created => ["subdir"], :deleted => [], :updated => [])
     end
 
-    it "should be able to push nested content" do
+    it "should be able to push a new dir with a file in it" do
       Dbox.create(@remote, @local)
       mkdir "#{@local}/subdir"
       touch "#{@local}/subdir/foo.txt"
       Dbox.push(@local).should eql(:created => ["subdir", "subdir/foo.txt"], :deleted => [], :updated => [])
     end
 
+    it "should be able to push a new file in an existing dir" do
+      Dbox.create(@remote, @local)
+      mkdir "#{@local}/subdir"
+      Dbox.push(@local)
+      touch "#{@local}/subdir/foo.txt"
+      Dbox.push(@local).should eql(:created => ["subdir/foo.txt"], :deleted => [], :updated => [])
+    end
+
+    it "should create the remote dir if it is missing" do
+      Dbox.create(@remote, @local)
+      touch "#{@local}/foo.txt"
+      @new_name = randname()
+      @new_remote = File.join(REMOTE_TEST_PATH, @new_name)
+      db = Dbox::Database.load(@local)
+      db.update_metadata(:remote_path => @new_remote)
+      Dbox.push(@local).should eql(:created => ["foo.txt"], :deleted => [], :updated => [])
+    end
+
     it "should not re-download the file after creating" do
       Dbox.create(@remote, @local)
       touch "#{@local}/foo.txt"
       Dbox.push(@local).should eql(:created => ["foo.txt"], :deleted => [], :updated => [])
-      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
+      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [""])
     end
 
     it "should not re-download the file after updating" do
       Dbox.create(@remote, @local)
       touch "#{@local}/foo.txt"
       Dbox.push(@local).should eql(:created => ["foo.txt"], :deleted => [], :updated => [])
-      sleep 1
       File.open("#{@local}/foo.txt", "w") {|f| f << "fooz" }
       Dbox.push(@local).should eql(:created => [], :deleted => [], :updated => ["foo.txt"])
-      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
+      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [""])
     end
 
     it "should not re-download the dir after creating" do
       Dbox.create(@remote, @local)
       mkdir "#{@local}/subdir"
       Dbox.push(@local).should eql(:created => ["subdir"], :deleted => [], :updated => [])
-      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
+      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [""])
     end
 
     it "should handle a complex set of changes" do
@@ -175,13 +200,12 @@ describe Dbox do
       touch "#{@local}/bar.txt"
       touch "#{@local}/baz.txt"
       Dbox.push(@local).should eql(:created => ["bar.txt", "baz.txt", "foo.txt"], :deleted => [], :updated => [])
-      sleep 1
       mkdir "#{@local}/subdir"
       touch "#{@local}/subdir/one.txt"
       rm "#{@local}/foo.txt"
       touch "#{@local}/baz.txt"
       Dbox.push(@local).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => ["foo.txt"], :updated => ["baz.txt"])
-      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
+      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => ["", "subdir"])
     end
 
     it "should be able to handle crazy filenames" do
@@ -192,17 +216,17 @@ describe Dbox do
       touch "#{@local}/#{crazy_name2}"
       Dbox.push(@local).should eql(:created => [crazy_name1, crazy_name2], :deleted => [], :updated => [])
       rm_rf @local
-      Dbox.clone(@remote, @local).should eql(:created => [crazy_name1, crazy_name2], :deleted => [], :updated => [])
+      Dbox.clone(@remote, @local).should eql(:created => [crazy_name1, crazy_name2], :deleted => [], :updated => [""])
     end
 
-    it "should be able to handle directory names" do
+    it "should be able to handle crazy directory names" do
       Dbox.create(@remote, @local)
       crazy_name1 = "Day[J] #42"
       mkdir File.join(@local, crazy_name1)
       touch File.join(@local, crazy_name1, "foo.txt")
       Dbox.push(@local).should eql(:created => [crazy_name1, File.join(crazy_name1, "foo.txt")], :deleted => [], :updated => [])
       rm_rf @local
-      Dbox.clone(@remote, @local).should eql(:created => [crazy_name1, File.join(crazy_name1, "foo.txt")], :deleted => [], :updated => [])
+      Dbox.clone(@remote, @local).should eql(:created => [crazy_name1, File.join(crazy_name1, "foo.txt")], :deleted => [], :updated => [""])
     end
   end
 
@@ -214,7 +238,7 @@ describe Dbox do
     end
 
     it "should fail if the local dir is missing" do
-      expect { Dbox.move(@new_remote, @local) }.to raise_error(Dbox::MissingDatabase)
+      expect { Dbox.move(@new_remote, @local) }.to raise_error(Dbox::DatabaseError)
     end
 
     it "should be able to move" do
@@ -242,10 +266,38 @@ describe Dbox do
       Dbox.exists?(@local).should be_true
     end
 
-    it "should be false if the dir exists but is missing a .dropbox.db file" do
+    it "should be false if the dir exists but is missing a .dbox.sqlite3 file" do
       Dbox.create(@remote, @local)
-      rm "#{@local}/.dropbox.db"
+      rm "#{@local}/.dbox.sqlite3"
       Dbox.exists?(@local).should be_false
     end
   end
+
+  describe "misc" do
+    it "should be able to recreate a dir after deleting it" do
+      Dbox.create(@remote, @local)
+
+      @alternate = "#{ALTERNATE_LOCAL_TEST_PATH}/#{@name}"
+      Dbox.clone(@remote, @alternate)
+
+      Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
+
+      mkdir "#{@local}/subdir"
+      touch "#{@local}/subdir/one.txt"
+      Dbox.push(@local).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => [], :updated => [])
+
+      Dbox.pull(@alternate).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => [], :updated => [""])
+
+      rm_rf "#{@alternate}/subdir"
+      Dbox.push(@alternate).should eql(:created => [], :deleted => ["subdir"], :updated => [])
+
+      Dbox.pull(@local).should eql(:created => [], :deleted => ["subdir"], :updated => [""])
+
+      mkdir "#{@local}/subdir"
+      touch "#{@local}/subdir/one.txt"
+      Dbox.push(@local).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => [], :updated => [])
+
+      Dbox.pull(@alternate).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => [], :updated => [""])
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -24,17 +24,14 @@ def randname
   "test-#{u}"
 end
 
-def modify_dbfile
-  dbfile = File.join(@local, Dbox::DB::DB_FILE)
-  s = File.open(dbfile, "r").read
-  s = yield s
-  File.open(dbfile, "w") {|f| f << s }
-end
-
 def clear_test_log
   File.open(LOGFILE, "w") {|f| f << "" }
 end
 
+def ensure_remote_exists(path)
+  expect { Dbox::Syncer.api.metadata(path) }.to_not raise_error
+end
+
 def log
   LOGGER
 end

data/vendor/dropbox-client-ruby/README

@@ -1,3 +1,5 @@
+Forked from Ruby client at https://www.dropbox.com/developers/releases
+
 Getting started with the Dropbox ruby library:
 1. Make sure you have rake and rubygems installed on your system.
 1b. Some of the gems below may need to be compiled locally, so make sure you

data/vendor/dropbox-client-ruby/lib/dropbox.rb

@@ -85,6 +85,7 @@ class DropboxError < RuntimeError
 end
 
 class DropboxClient
+    attr_reader :token
 
     def initialize(api_host, content_host, port, auth)
         @api_host = api_host
@@ -94,6 +95,12 @@ class DropboxClient
         @token = auth.get_access_token
     end
 
+    def initialize_copy(other)
+        @token = other.token.clone()
+        @token.consumer = @token.consumer.clone()
+        @token.consumer.http = nil
+    end
+
     def parse_response(response, callback=nil)
         if response.kind_of?(Net::HTTPServerError)
             raise DropboxError.new("Invalid response #{response}\n#{response.body}")
@@ -141,10 +148,36 @@ class DropboxClient
         end
     end
 
-    def get_file(root, from_path)
+    def get_file(root, from_path, destination_io=nil)
         path = "/files/#{root}#{from_path}"
-        response = @token.get(build_url(@content_host, @port, path))
-        return parse_response(response, callback=true)
+
+        if destination_io
+            url = URI.parse(build_url(@content_host, @port, path))
+
+            # if a destination is given, stream the response into it
+            Net::HTTP.start(url.host, url.port) do |http|
+                # build the request
+                req = Net::HTTP::Get.new(url.path, {})
+                auth = @auth.clone(@content_host)
+                auth.sign(req)
+
+                # make the request
+                http.request(req) do |response|
+                    if response.kind_of?(Net::HTTPServerError)
+                        raise DropboxError.new("Invalid response #{response}\n#{response.body}")
+                    elsif not response.kind_of?(Net::HTTPSuccess)
+                        return response
+                    else
+                        # stream to given io
+                        response.read_body {|segment| destination_io << segment }
+                        return true
+                    end
+                end
+            end
+        else
+            response = @token.get(build_url(@content_host, @port, path))
+            return parse_response(response, true)
+        end
     end
 
     def file_copy(root, from_path, to_path, callback=nil)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 4
-  version: 0.4.4
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 Z
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -65,6 +65,38 @@ dependencies:
         version: 1.5.3
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
+        version: 1.3.3
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :runtime
+  version_requirements: *id005
 description: An easy-to-use Dropbox client with fine-grained control over syncs.
 email: ken@kenpratt.net
 executables: 
@@ -85,8 +117,12 @@ files:
 - dbox.gemspec
 - lib/dbox.rb
 - lib/dbox/api.rb
+- lib/dbox/database.rb
 - lib/dbox/db.rb
 - lib/dbox/loggable.rb
+- lib/dbox/parallel_tasks.rb
+- lib/dbox/syncer.rb
+- sample_polling_script.rb
 - spec/dbox_spec.rb
 - spec/spec_helper.rb
 - vendor/dropbox-client-ruby/LICENSE
@@ -127,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Dropbox made easy.