dbox 0.3.0 → 0.4.0

data/README.md

@@ -97,6 +97,12 @@ $ dbox pull [<local_path>]
 $ dbox push [<local_path>]
 ```
 
+#### Move (move/rename the Dropbox folder)
+
+```sh
+$ dbox move <new_remote_path> [<local_path>]
+```
+
 #### Example
 
 ```sh
@@ -140,6 +146,12 @@ Oh, Hello
 Using dbox from Ruby
 --------------------
 
+The Ruby clone, pull, and push APIs return a hash listing the changes made during that pull/push.
+
+```ruby
+{ :created => ["foo.txt"], :deleted => [], :updated => [] }
+```
+
 ### Usage
 
 #### Setup
@@ -174,6 +186,12 @@ Dbox.pull(local_path)
 Dbox.push(local_path)
 ```
 
+#### Move (move/rename the Dropbox folder)
+
+```ruby
+Dbox.move(new_remote_path, local_path)
+```
+
 #### Example
 
 ```sh

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/dbox

@@ -9,11 +9,12 @@ def usage
 Usage: dbox <commond> [<args>]
 
 Commands:
-  authorize                            Generate auth keys
-  create <remote_path> [<local_path>]  Create a new Dropbox folder
-  clone <remote_path> [<local_path>]   Clone an existing Dropbox folder
-  pull [<local_path>]                  Pull chonges from Dropbox
-  push [<local_path>]                  Push changes to Dropbox
+  authorize                             Generate auth keys
+  create <remote_path> [<local_path>]   Create a new Dropbox folder
+  clone <remote_path> [<local_path>]    Clone an existing Dropbox folder
+  pull [<local_path>]                   Pull chonges from Dropbox
+  push [<local_path>]                   Push changes to Dropbox
+  move <new_remote_path> [<local_path>] Move the remote Dropbox folder to a new location
 
 Environment varables needed for everything:
   export DROPBOX_APP_KEY=cmlrrjd3j0gbend
@@ -56,6 +57,13 @@ when "pull", "push"
   local_path = args[0] || "."
 
   Dbox.send(command, local_path)
+when "move"
+  remote_path = args[0]
+
+  # default to current directory
+  local_path = args[1] || "."
+
+  Dbox.send(command, remote_path, local_path)
 else
   print_usage_and_quit
 end

data/dbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dbox}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   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-14}
+  s.date = %q{2011-05-16}
   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}]

data/lib/dbox.rb

@@ -39,6 +39,12 @@ module Dbox
     Dbox::DB.push(local_path)
   end
 
+  def self.move(new_remote_path, local_path)
+    new_remote_path = clean_remote_path(new_remote_path)
+    local_path = clean_local_path(local_path)
+    Dbox::DB.move(new_remote_path, local_path)
+  end
+
   private
 
   def self.clean_remote_path(path)

data/lib/dbox/api.rb

@@ -120,6 +120,19 @@ module Dbox
       end
     end
 
+    def move(old_path, new_path)
+      log.info "Moving #{old_path} to #{new_path}"
+      run(old_path) do |old_path|
+        new_path = escape_path(new_path)
+        case res = @client.file_move(@conf["root"], old_path, new_path)
+        when Net::HTTPBadRequest
+          raise RemoteAlreadyExists, "Error during move -- there may already be a Dropbox folder at #{new_path}"
+        else
+          res
+        end
+      end
+    end
+
     def escape_path(path)
       URI.escape(path)
     end

data/lib/dbox/db.rb

@@ -41,6 +41,10 @@ module Dbox
       load(local_path).push
     end
 
+    def self.move(new_remote_path, local_path)
+      load(local_path).move(new_remote_path)
+    end
+
     # IMPORTANT: DropboxDb.new is private. Please use DropboxDb.create, DropboxDb.clone, or DropboxDb.load as the entry point.
     private_class_method :new
     def initialize(local_path, res)
@@ -69,6 +73,12 @@ module Dbox
       res
     end
 
+    def move(new_remote_path)
+      api.move(@remote_path, new_remote_path)
+      @remote_path = new_remote_path
+      save
+    end
+
     def local_to_relative_path(path)
       if path.include?(@local_path)
         path.sub(@local_path, "").sub(/^\//, "")

data/spec/dbox_spec.rb

@@ -182,4 +182,30 @@ describe Dbox do
       Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
     end
   end
+
+  describe "#move" do
+    before(:each) do
+      @new_name = randname()
+      @new_local = File.join(LOCAL_TEST_PATH, @new_name)
+      @new_remote = File.join(REMOTE_TEST_PATH, @new_name)
+    end
+
+    it "should fail if the local dir is missing" do
+      expect { Dbox.move(@new_remote, @local) }.to raise_error(Dbox::MissingDatabase)
+    end
+
+    it "should be able to move" do
+      Dbox.create(@remote, @local)
+      expect { Dbox.move(@new_remote, @local) }.to_not raise_error
+      @local.should exist
+      expect { Dbox.clone(@new_remote, @new_local) }.to_not raise_error
+      @new_local.should exist
+    end
+
+    it "should not be able to move to a location that exists" do
+      Dbox.create(@remote, @local)
+      Dbox.create(@new_remote, @new_local)
+      expect { Dbox.move(@new_remote, @local) }.to raise_error(Dbox::RemoteAlreadyExists)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 Z
+date: 2011-05-16 00:00:00 Z
 dependencies: []
 
 description: An easy-to-use Dropbox client with fine-grained control over syncs.