datapimp 1.0.15 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c51cdbb1f0199b7e2103dacab3a00589f1260d8
-  data.tar.gz: 61106a508c649acb572873e0ab67352223c405bf
+  metadata.gz: 80251b7cd07afb918868270d8577332c934dc39e
+  data.tar.gz: 933f340ba6dba49e53a72df069b853f3b7382111
 SHA512:
-  metadata.gz: 9ddc5e9d47cdb12ef0635419c0df7898484b76c77507f26fa4139ae2783cf68a786337236002b3b3f5c040a0059a8893d1762e48d79ea8ab1dfa0d890017b266
-  data.tar.gz: 745fd6304639db2849f52cc2ba359ec3b4f8d9c8e6e185ee11cfcc94f38219862bf0444379b84b64b41d3ebfc36a018610d830248111b1b4cbfb1a6743e5bb51
+  metadata.gz: 1b4e89d940d208a9e3975fbe10e2f299bcf8d1627fce3f150a86d770d0781fbed35f03b53e83473589b8500e430aeb01f3cbfe20dedf8c618cedcd499807c049
+  data.tar.gz: a8a9f99fffbaf5def8e8f30fbe4e7dcecfe8bd5fbdb6bb5d41ecc701c32b58b060dcd3fe670881e48444a013800b08355f32b4b3f9c4780526ccb6780fe97468

data/bin/datapimp

@@ -1,11 +1,7 @@
 #!/usr/bin/env ruby
 
 require "rubygems"
-require "bundler"
-
-require "pathname"
 require "pry"
-require "hashie"
 require "commander/import"
 require 'datapimp'
 require 'datapimp/cli'

data/datapimp.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   
   spec.add_dependency 'pry', '~> 0.10'
-  spec.add_dependency 'hashie', '>= 2.0', '< 3.0' 
+  spec.add_dependency 'hashie', '>= 3.0.4' 
   spec.add_dependency 'commander', '~> 4.3'
   spec.add_dependency 'terminal-table'
-  spec.add_dependency 'fog-aws', '~> 0.1'
-  spec.add_dependency 'dropbox-api', '> 0.4.5'
+  spec.add_dependency 'fog-aws', '>= 0.1'
+  spec.add_dependency 'dropbox-api', '>= 0.4.7'
   spec.add_dependency 'google_drive', '~> 1.0'
-  spec.add_dependency 'google-api-client', '~> 0.7'
+  spec.add_dependency 'google-api-client', '>= 0.8'
   spec.add_dependency 'rack-contrib', '~> 1.2'
   spec.add_dependency 'uri_template', '~> 0.7'
   spec.add_dependency 'dnsimple-ruby', '~> 1.7'
@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '~> 4.0'
   spec.add_dependency 'github-fs', '~> 0'
   spec.add_dependency 'colored', '> 0.0'
+  spec.add_dependency 'multi_json', '~> 1.10'
 
   # these are locked to specific versions so that 
   # we can use the native extensions for traveling ruby

data/lib/datapimp/clients/dropbox.rb

@@ -112,11 +112,15 @@ module Datapimp
         interactive_setup(options)
       end
 
+      def request_token
+        @request_token ||= begin
+                           consumer = ::Dropbox::API::OAuth.consumer(:authorize)
+                           consumer.get_request_token
+                         end
+      end
+
       def browser_authorization_url
-        @browser_authorization_url ||= begin
-                                         consumer = ::Dropbox::API::OAuth.consumer(:authorize)
-                                         consumer.get_request_token.authorize_url
-                                       end
+        @browser_authorization_url ||= request_token.authorize_url
       end
 
       def consume_auth_client_code code=nil
@@ -126,7 +130,7 @@ module Datapimp
           code  = params['oauth_token'].first
         end
 
-        access_token  = request_token.get_access_token(:oauth_verifier => token)
+        access_token  = request_token.get_access_token(:oauth_verifier => code)
 
         Datapimp.config.set 'dropbox_client_token', access_token.token
         Datapimp.config.set 'dropbox_client_secret', access_token.secret
@@ -159,11 +163,12 @@ module Datapimp
         print "\nOnce you authorize the app on Dropbox, press enter... "
         STDIN.gets.chomp
 
-        consume_auth_client_code()
+        access_token = consume_auth_client_code()
 
         puts "\nAuthorization complete!:\n\n"
-        puts "  Dropbox::API::Config.app_key    = '#{consumer.key}'"
-        puts "  Dropbox::API::Config.app_secret = '#{consumer.secret}'"
+        puts "  Dropbox::API::Config.app_key    = '#{Datapimp.config.dropbox_app_key}'"
+        puts "  Dropbox::API::Config.app_secret = '#{Datapimp.config.dropbox_app_secret}'"
+        puts "  Dropbox::API::Config.mode = '#{Datapimp.config.dropbox_app_type}'"
         puts "  client = Dropbox::API::Client.new(:token  => '#{access_token.token}', :secret => '#{access_token.secret}')"
         puts "\n"
       end

data/lib/datapimp/version.rb

@@ -1,3 +1,3 @@
 module Datapimp
-  VERSION = "1.0.15"
+  VERSION = "1.0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datapimp
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.20
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -76,30 +70,30 @@ dependencies:
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: dropbox-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.7
 - !ruby/object:Gem::Dependency
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
@@ -118,16 +112,16 @@ dependencies:
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -282,6 +276,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -459,4 +467,3 @@ summary: A collection of API development patterns that I have accumulated in my
 test_files:
 - spec/spec_helper.rb
 - spec/support/test_helpers.rb
-has_rdoc: