dbox 0.7.6 → 0.8.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.8.9 / 2013-10.28
+  * Using the dropbox-sdk from a gem rather than vendoring it.
+  * Using OAuth2 instead of OAuth1 for authenticating. This means that the environment variables you need are renamed from DROPBOX_AUTH_KEY and DROPBOX_SECRET to DROPBOX_ACCESS_TOKEN.
+
 == 0.7.6 / 2013-10-02
   * Bug Fixes
     * When downloading files, write in binary (issue with Ruby 1.9 running inside Rails environment).

data/README.md

@@ -42,35 +42,34 @@ $ export DROPBOX_APP_SECRET=uvuulp75xf9jffl
 ```sh
 $ DROPBOX_APP_KEY=cmlrrjd3j0gbend DROPBOX_APP_SECRET=uvuulp75xf9jffl dbox ...
 ```
-### Generate an auth token
+### Generate an access token
 
 * Make an authorize request:
 
 ```sh
 $ dbox authorize
-Please visit the following URL in your browser, log into Dropbox, and authorize the app you created.
-
-http://www.dropbox.com/0/oauth/authorize?oauth_token=j2kuzfvobcpqh0g
-
-When you have done so, press [ENTER] to continue.
+1. Go to: https://www.dropbox.com/1/oauth2/authorize?client_id=1x7xvn1pvas3a3&response_type=code
+2. Click "Allow" (you might have to log in first)
+3. Copy the authorization code
+Enter the authorization code here: 
 ```
 
-* Visit the given URL in your browser, and then go back to the terminal and press Enter.
+* Visit the given URL in your browser, and then go back to the terminal and enter the code that Dropbox provides.
 
 * Now either set the keys as environment variables:
 
 ```sh
-$ export DROPBOX_AUTH_KEY=v4d7l1rez1czksn
-$ export DROPBOX_AUTH_SECRET=pqej9rmnj0i1gcxr4
+$ export DROPBOX_ACCESS_TOKEN=aeDsfS4QaReAAAAAAAAAAbZ6nrUUrXZ_Z4Rct2DVTYp6B14N-qiz189gm2VHQqvD
+$ export DROPBOX_USER_ID=230324561
 ```
 
-* Or include them in calls to ```dbox```:
+* Or include the access token in calls to ```dbox```:
 
 ```sh
-$ DROPBOX_AUTH_KEY=v4d7l1rez1czksn DROPBOX_AUTH_SECRET=pqej9rmnj0i1gcxr4 dbox ...
+$ DROPBOX_ACCESS_TOKEN=aeDsfS4QaReAAAAAAAAAAbZ6nrUUrXZ_Z4Rct2DVTYp6B14N-qiz189gm2VHQqvD dbox ...
 ```
 
-* This auth token will last for **10 years**, or when you choose to invalidate it, whichever comes first. So you really only need to do this once, and then keep them around.
+* The access token will last for **10 years**, or when you choose to invalidate it, whichever comes first. So you really only need to do this once, and then keep them around.
 
 
 Using dbox from the Command-Line
@@ -136,8 +135,7 @@ $ open http://www.dropbox.com/0/oauth/authorize?oauth_token=aaoeuhtns123456
 ```
 
 ```sh
-$ export DROPBOX_AUTH_KEY=v4d7l1rez1czksn
-$ export DROPBOX_AUTH_SECRET=pqej9rmnj0i1gcxr4
+$ export DROPBOX_ACCESS_TOKEN=aeDsfS4QaReAAAAAAAAAAbZ6nrUUrXZ_Z4Rct2DVTYp6B14N-qiz189gm2VHQqvD
 ```
 
 ```sh
@@ -245,8 +243,8 @@ $ open http://www.dropbox.com/0/oauth/authorize?oauth_token=aaoeuhtns123456
 ```
 
 ```sh
-$ export DROPBOX_AUTH_KEY=v4d7l1rez1czksn
-$ export DROPBOX_AUTH_SECRET=pqej9rmnj0i1gcxr4
+$ export DROPBOX_ACCESS_TOKEN=aeDsfS4QaReAAAAAAAAAAbZ6nrUUrXZ_Z4Rct2DVTYp6B14N-qiz189gm2VHQqvD
+$ export DROPBOX_USER_ID=pqej9rmnj0i1gcxr4
 ```
 
 ```ruby

data/Rakefile

@@ -18,6 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_dependency "oauth", ">= 0.4.5"
   gem.add_dependency "json", ">= 1.5.3"
   gem.add_dependency "sqlite3", ">= 1.3.3"
+  gem.add_dependency "dropbox-sdk", ">= 1.6.2"
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.8.0

data/dbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dbox"
-  s.version = "0.7.6"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ken Pratt"]
-  s.date = "2013-10-02"
+  s.date = "2013-10-30"
   s.description = "An easy-to-use Dropbox client with fine-grained control over syncs."
   s.email = "ken@kenpratt.net"
   s.executables = ["dbox"]
@@ -37,24 +37,12 @@ Gem::Specification.new do |s|
     "sample_polling_script.rb",
     "spec/dbox_spec.rb",
     "spec/spec_helper.rb",
-    "vendor/dropbox-ruby-sdk/CHANGELOG",
-    "vendor/dropbox-ruby-sdk/LICENSE",
-    "vendor/dropbox-ruby-sdk/README",
-    "vendor/dropbox-ruby-sdk/cli_example.rb",
-    "vendor/dropbox-ruby-sdk/copy_between_accounts.rb",
-    "vendor/dropbox-ruby-sdk/dropbox_controller.rb",
-    "vendor/dropbox-ruby-sdk/gemspec.rb",
-    "vendor/dropbox-ruby-sdk/lib/dropbox_sdk.rb",
-    "vendor/dropbox-ruby-sdk/lib/trusted-certs.crt",
-    "vendor/dropbox-ruby-sdk/search_cache.json",
-    "vendor/dropbox-ruby-sdk/search_cache.rb",
-    "vendor/dropbox-ruby-sdk/web_file_browser.rb",
     "vendor/insensitive_hash_patched.rb"
   ]
   s.homepage = "http://github.com/kenpratt/dbox"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Dropbox made easy."
 
   if s.respond_to? :specification_version then
@@ -65,17 +53,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.5"])
       s.add_runtime_dependency(%q<json>, [">= 1.5.3"])
       s.add_runtime_dependency(%q<sqlite3>, [">= 1.3.3"])
+      s.add_runtime_dependency(%q<dropbox-sdk>, [">= 1.6.2"])
     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"])
       s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
+      s.add_dependency(%q<dropbox-sdk>, [">= 1.6.2"])
     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"])
     s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
+    s.add_dependency(%q<dropbox-sdk>, [">= 1.6.2"])
   end
 end
 

data/lib/dbox/api.rb

@@ -14,22 +14,31 @@ module Dbox
     def self.authorize
       app_key = ENV["DROPBOX_APP_KEY"]
       app_secret = ENV["DROPBOX_APP_SECRET"]
-
+      
       raise(ConfigurationError, "Please set the DROPBOX_APP_KEY environment variable to a Dropbox application key") unless app_key
       raise(ConfigurationError, "Please set the DROPBOX_APP_SECRET environment variable to a Dropbox application secret") unless app_secret
 
-      auth = DropboxSession.new(app_key, app_secret)
-      puts "Please visit the following URL in your browser, log into Dropbox, and authorize the app you created.\n\n#{auth.get_authorize_url}\n\nWhen you have done so, press [ENTER] to continue."
-      STDIN.readline
-      res = auth.get_access_token
-      puts "export DROPBOX_AUTH_KEY=#{res.key}"
-      puts "export DROPBOX_AUTH_SECRET=#{res.secret}"
+
+      flow = DropboxOAuth2FlowNoRedirect.new(app_key, app_secret)
+      authorize_url = flow.start()
+
+      puts '1. Go to: ' + authorize_url
+      puts '2. Click "Allow" (you might have to log in first)'
+      puts '3. Copy the authorization code'
+      print 'Enter the authorization code here: '
+      code = STDIN.readline.strip
+
+      # This will fail if the user gave us an invalid authorization code
+      access_token, user_id = flow.finish(code)
+      
+      puts "export DROPBOX_ACCESS_TOKEN=#{access_token}"
+      puts "export DROPBOX_USER_ID=#{user_id}"
       puts
       puts "This auth token will last for 10 years, or when you choose to invalidate it, whichever comes first."
       puts
       puts "Now either include these constants in yours calls to dbox, or set them as environment variables."
       puts "In bash, including them in calls looks like:"
-      puts "$ DROPBOX_AUTH_KEY=#{res.key} DROPBOX_AUTH_SECRET=#{res.secret} dbox ..."
+      puts "$ DROPBOX_ACCESS_TOKEN=#{access_token} DROPBOX_USER_ID=#{user_id} dbox ..."
     end
 
     def self.connect
@@ -50,21 +59,12 @@ module Dbox
     end
 
     def connect
-      app_key = ENV["DROPBOX_APP_KEY"]
-      app_secret = ENV["DROPBOX_APP_SECRET"]
-      auth_key = ENV["DROPBOX_AUTH_KEY"]
-      auth_secret = ENV["DROPBOX_AUTH_SECRET"]
-      access_type = ENV["DROPBOX_ACCESS_TYPE"] || "dropbox" # "app_folder"
-
-      raise(ConfigurationError, "Please set the DROPBOX_APP_KEY environment variable to a Dropbox application key") unless app_key
-      raise(ConfigurationError, "Please set the DROPBOX_APP_SECRET environment variable to a Dropbox application secret") unless app_secret
-      raise(ConfigurationError, "Please set the DROPBOX_AUTH_KEY environment variable to an authenticated Dropbox session key") unless auth_key
-      raise(ConfigurationError, "Please set the DROPBOX_AUTH_SECRET environment variable to an authenticated Dropbox session secret") unless auth_secret
+      access_token = ENV["DROPBOX_ACCESS_TOKEN"]
+      access_type = ENV["DROPBOX_ACCESS_TYPE"] || "dropbox"
+      
+      raise(ConfigurationError, "Please set the DROPBOX_ACCESS_TOKEN environment variable to a Dropbox access token") unless access_token
       raise(ConfigurationError, "Please set the DROPBOX_ACCESS_TYPE environment variable either dropbox (full access) or sandbox (App access)") unless access_type == "dropbox" || access_type == "app_folder"
-
-      @session = DropboxSession.new(app_key, app_secret)
-      @session.set_access_token(auth_key, auth_secret)
-      @client = DropboxClient.new(@session, access_type)
+      @client = DropboxClient.new(access_token)
     end
 
     def run(path, tries = NUM_TRIES, &proc)

metadata

@@ -1,96 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dbox
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.8.0
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 6
-  version: 0.7.6
 platform: ruby
-authors: 
+authors:
 - Ken Pratt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multipart-post
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 4
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.3
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
   name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: dropbox-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 description: An easy-to-use Dropbox client with fine-grained control over syncs.
 email: ken@kenpratt.net
-executables: 
+executables:
 - dbox
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - History.txt
 - LICENSE.txt
@@ -110,51 +119,30 @@ files:
 - sample_polling_script.rb
 - spec/dbox_spec.rb
 - spec/spec_helper.rb
-- vendor/dropbox-ruby-sdk/CHANGELOG
-- vendor/dropbox-ruby-sdk/LICENSE
-- vendor/dropbox-ruby-sdk/README
-- vendor/dropbox-ruby-sdk/cli_example.rb
-- vendor/dropbox-ruby-sdk/copy_between_accounts.rb
-- vendor/dropbox-ruby-sdk/dropbox_controller.rb
-- vendor/dropbox-ruby-sdk/gemspec.rb
-- vendor/dropbox-ruby-sdk/lib/dropbox_sdk.rb
-- vendor/dropbox-ruby-sdk/lib/trusted-certs.crt
-- vendor/dropbox-ruby-sdk/search_cache.json
-- vendor/dropbox-ruby-sdk/search_cache.rb
-- vendor/dropbox-ruby-sdk/web_file_browser.rb
 - vendor/insensitive_hash_patched.rb
 homepage: http://github.com/kenpratt/dbox
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Dropbox made easy.
 test_files: []
-