dbox 0.6.11 → 0.6.12

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.12 / 2012-06-01
+  * Minor Enhancements
+    * Added clone_or_pull operation for if you aren't sure if the local folder exists yet or not.
+    * Added delete operation for deleting a remote Dropbox folder as well as the local folder if it exists.
+
 == 0.6.11 / 2012-04-10
   * Minor Enhancements
     * Added operations that failed change calculation to result hash on pull.

data/VERSION

@@ -1 +1 @@
-0.6.11
+0.6.12

data/bin/dbox

@@ -16,6 +16,8 @@ Commands:
   push [<local_path>]                   Push changes to Dropbox
   sync [<local_path>]                   Sync changes to Dropbox
   move <new_remote_path> [<local_path>] Move the remote Dropbox folder to a new location
+  delete <remote_path> [<local_path>]   Delete a Dropbox folder (local path optional, it will be deleted too if provided)
+  clone_or_pull <remote_path> [<local_path>] Clone an existing Dropbox folder, or pull if it already exists locally
 
 Environment varables needed for everything:
   export DROPBOX_APP_KEY=cmlrrjd3j0gbend
@@ -40,9 +42,9 @@ args = ARGV[1..-1]
 case command
 when "authorize"
   Dbox.authorize
-when "create", "clone"
+when "create", "clone", "clone_or_pull", "delete"
   unless args.size >= 1
-    puts "Error: Please provide a remote path to clone"
+    puts "Error: Please provide a remote path"
     print_usage_and_quit
   end
 

data/dbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dbox"
-  s.version = "0.6.11"
+  s.version = "0.6.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ken Pratt"]
-  s.date = "2012-04-10"
+  s.date = "2012-06-01"
   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.rb

@@ -47,6 +47,14 @@ module Dbox
     Dbox::Syncer.pull(local_path)
   end
 
+  def self.clone_or_pull(remote_path, local_path)
+    if exists?(local_path)
+      pull(local_path)
+    else
+      clone(remote_path, local_path)
+    end
+  end
+
   def self.push(local_path)
     log.debug "Pushing (local: #{local_path})"
     local_path = clean_local_path(local_path)
@@ -76,6 +84,17 @@ module Dbox
     Dbox::Database.exists?(local_path)
   end
 
+  def self.delete(remote_path, local_path = nil)
+    log.debug "Deleting (remote: #{remote_path})"
+    remote_path = clean_remote_path(remote_path)
+    Dbox::Syncer.api.delete_dir(remote_path)
+    if local_path
+      local_path = clean_local_path(local_path)
+      log.debug "Deleting (local_path: #{local_path})"
+      FileUtils.rm_rf(local_path) if File.exists?(local_path)
+    end
+  end
+
   private
 
   def self.clean_remote_path(path)

data/lib/dbox/api.rb

@@ -110,6 +110,7 @@ module Dbox
         log.debug "Fetching metadata for #{path}"
         res = @client.metadata(path, 10000, list, hash)
         log.debug res.inspect
+        raise Dbox::RemoteMissing, "#{path} has been deleted on Dropbox" if res["is_deleted"]
         res
       end
     end

data/spec/dbox_spec.rb

@@ -219,6 +219,28 @@ describe Dbox do
     end
   end
 
+  describe "#clone_or_pull" do
+    it "creates the local directory" do
+      Dbox.create(@remote, @local)
+      rm_rf @local
+      @local.should_not exist
+      Dbox.clone_or_pull(@remote, @local).should eql(:created => [], :deleted => [], :updated => [""], :failed => [])
+      @local.should exist
+    end
+
+    it "should fail if the remote does not exist" do
+      expect { Dbox.clone_or_pull(@remote, @local) }.to raise_error(Dbox::RemoteMissing)
+      @local.should_not exist
+    end
+
+    it "shold be able to pull changes on existing repo" do
+      Dbox.create(@remote, @local)
+      @local.should exist
+      Dbox.clone_or_pull(@remote, @local).should eql(:created => [], :deleted => [], :updated => [], :failed => [])
+      @local.should exist
+    end
+  end
+
   describe "#push" do
     it "should fail if the local dir is missing" do
       expect { Dbox.push(@local) }.to raise_error(Dbox::DatabaseError)
@@ -511,4 +533,21 @@ describe Dbox do
       Dbox.pull(@alternate).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => [], :updated => [""], :failed => [])
     end
   end
+
+  describe "#delete" do
+    it "should delete the remote directory" do
+      Dbox.create(@remote, @local)
+      rm_rf @local
+      Dbox.delete(@remote)
+      expect { Dbox.clone(@remote, @local) }.to raise_error(Dbox::RemoteMissing)
+    end
+
+    it "should delete the local directory if given" do
+      Dbox.create(@remote, @local)
+      @local.should exist
+      Dbox.delete(@remote, @local)
+      @local.should_not exist
+      expect { Dbox.clone(@remote, @local) }.to raise_error(Dbox::RemoteMissing)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 6
-  - 11
-  version: 0.6.11
+  - 12
+  version: 0.6.12
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-10 00:00:00 Z
+date: 2012-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post