datapimp 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe14e7bc0d6be32f769b6fac511147dc2cef501d
-  data.tar.gz: 470fdf3998730258b25faec69bffca68b7db465d
+  metadata.gz: 0c51cdbb1f0199b7e2103dacab3a00589f1260d8
+  data.tar.gz: 61106a508c649acb572873e0ab67352223c405bf
 SHA512:
-  metadata.gz: 15440f01cee38dd52a4256c73796302a0ffd732de8c5b42dd43f2531c3794e8ff12ed1f078146dc660718b5fd575b7ce09d90d0546192bb93ed3ae32763fc8e0
-  data.tar.gz: 2ba18490dac8bc77d4ccc57eb76482c87ad8381f3e7ec21ff9e00a823197af66c0ba6ecaddf1599aa7bca8ed773dd99d8bc5acee41ca482040908ed25b804118
+  metadata.gz: 9ddc5e9d47cdb12ef0635419c0df7898484b76c77507f26fa4139ae2783cf68a786337236002b3b3f5c040a0059a8893d1762e48d79ea8ab1dfa0d890017b266
+  data.tar.gz: 745fd6304639db2849f52cc2ba359ec3b4f8d9c8e6e185ee11cfcc94f38219862bf0444379b84b64b41d3ebfc36a018610d830248111b1b4cbfb1a6743e5bb51

data/datapimp.gemspec

@@ -18,7 +18,7 @@ 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.5'
+  spec.add_dependency 'hashie', '>= 2.0', '< 3.0' 
   spec.add_dependency 'commander', '~> 4.3'
   spec.add_dependency 'terminal-table'
   spec.add_dependency 'fog-aws', '~> 0.1'

data/lib/datapimp/clients/amazon.rb

@@ -13,6 +13,10 @@ module Datapimp
         options[:aws_secret_access_key] || options[:secret_access_key] || Datapimp.config.aws_secret_access_key
       end
 
+      def aws_region
+        options[:aws_region] || options[:region] || Datapimp.config.aws_region || "us-west-1"
+      end
+
       def storage
         return @storage if @storage
 
@@ -25,6 +29,7 @@ module Datapimp
           provider: 'AWS',
           aws_access_key_id: aws_access_key_id,
           aws_secret_access_key: aws_secret_access_key,
+          region: aws_region,
           path_style: true
         })
 

data/lib/datapimp/clients/dropbox.rb

@@ -112,6 +112,28 @@ module Datapimp
         interactive_setup(options)
       end
 
+      def browser_authorization_url
+        @browser_authorization_url ||= begin
+                                         consumer = ::Dropbox::API::OAuth.consumer(:authorize)
+                                         consumer.get_request_token.authorize_url
+                                       end
+      end
+
+      def consume_auth_client_code code=nil
+        if code.nil?
+          query  = browser_authorization_url.split('?').last
+          params = CGI.parse(query)
+          code  = params['oauth_token'].first
+        end
+
+        access_token  = request_token.get_access_token(:oauth_verifier => token)
+
+        Datapimp.config.set 'dropbox_client_token', access_token.token
+        Datapimp.config.set 'dropbox_client_secret', access_token.secret
+
+        true
+      end
+
       def interactive_setup(options={})
         if requires_setup?
           if dropbox_app_key.length == 0
@@ -129,22 +151,15 @@ module Datapimp
         ::Dropbox::API::Config.app_key    = Datapimp.config.dropbox_app_key
         ::Dropbox::API::Config.app_secret = Datapimp.config.dropbox_app_secret
 
-        consumer = ::Dropbox::API::OAuth.consumer(:authorize)
-        request_token = consumer.get_request_token
+        auth_url = browser_authorization_url
         puts "\nGo to this url and click 'Authorize' to get the token:"
-        puts request_token.authorize_url
-        Launchy.open(request_token.authorize_url)
+        puts auth_url
+        Launchy.open(auth_url)
 
-        query  = request_token.authorize_url.split('?').last
-        params = CGI.parse(query)
-        token  = params['oauth_token'].first
         print "\nOnce you authorize the app on Dropbox, press enter... "
         STDIN.gets.chomp
 
-        access_token  = request_token.get_access_token(:oauth_verifier => token)
-
-        Datapimp.config.set 'dropbox_client_token', access_token.token
-        Datapimp.config.set 'dropbox_client_secret', access_token.secret
+        consume_auth_client_code()
 
         puts "\nAuthorization complete!:\n\n"
         puts "  Dropbox::API::Config.app_key    = '#{consumer.key}'"

data/lib/datapimp/clients/google.rb

@@ -27,6 +27,17 @@ module Datapimp
         has_application_keys? && has_refresh_token?
       end
 
+      def browser_authorization_url
+        auth_client.authorization_uri
+      end
+
+      def consume_auth_client_code code
+        auth_client.code = code
+        auth_client.fetch_access_token!
+        Datapimp.config.set "google_refresh_token", auth_client.refresh_token
+        Datapimp.config.set "google_access_token", auth_client.access_token
+      end
+
       # Runs through an interactive session where we get the
       # necessary tokens needed to integrate with google drive.
       def setup(options={})
@@ -43,12 +54,9 @@ module Datapimp
         if has_refresh_token?
           refresh_access_token!
         elsif respond_to?(:ask)
-          Launchy.open(auth_client.authorization_uri)
+          Launchy.open(browser_authorization_url)
           say("\n1. Open this page:\n%s\n\n" % auth_client.authorization_uri)
-          auth_client.code = ask("2. Enter the authorization code shown in the page: ", String)
-          auth_client.fetch_access_token!
-          Datapimp.config.set "google_refresh_token", auth_client.refresh_token
-          Datapimp.config.set "google_access_token", auth_client.access_token
+          consume_auth_client_code ask("2. Enter the authorization code shown in the page: ", String)
         end
       end
 

data/lib/datapimp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datapimp
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -28,16 +28,22 @@ dependencies:
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement