drive_env 0.1.0 → 0.2.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535703d25f647836939114b16807a889f37e7299
-  data.tar.gz: 2d85523a0ac558537e504c6a31b0ac40d949c901
+  metadata.gz: af9d35322807cdaf7024bd6d465374fc082453ca
+  data.tar.gz: 13b1b82d99ba7cfdccd92ec859a688a256d8069e
 SHA512:
-  metadata.gz: f5a292adf7028ae6d917ec25e5b711f71c118c86a0637b0822bb0448c265a26bf4cde4197115ae936bb1446c95c0767033d49549a216e4a7f1bc954c4a6cb9b1
-  data.tar.gz: 1aca98931755a8934fb6a9ff3972971a966e786145211fd91b9f56a865480a0e3ad95bcde8b707c29871496ff9fa31298180021c8434c4ffd48c891be53f399a
+  metadata.gz: 4a0d27c5e673c0e1ef7e8ca21455087f78d48ce894337cc03e733516b7c1d31b412a5dbc88a3e0b2efc37a66b4e99efea4ddfa54d4be58c391239776fda9bdcb
+  data.tar.gz: c02b9decf2b9cb6d04724a8e435e9f07765e4b01fb2ae1ad29997fef074461043aed23caca42483eb786b93ab88ea607863fb6d0c0d8d8fcd380cfe56265707f

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.1.6
-before_install: gem install bundler -v 1.10.5
+  - 2.3.1
+  - 2.2.5
+  - 2.1.10

data/README.md

@@ -23,7 +23,7 @@ SMTP_PASSWORD=appuser
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'drive_env'
+gem 'drive_env', '~> 0.2.pre1'
 ```
 
 And then execute:
@@ -32,7 +32,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install drive_env
+    $ gem install drive_env --pre
 
 ## Usage
 

data/drive_env.gemspec

@@ -27,8 +27,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "google_drive", "~> 1.0.1"
-  spec.add_dependency "google-api-client", "~> 0.8.6"
+  spec.add_dependency "google_drive", "~> 2.0.0.pre1"
+  spec.add_dependency "google-api-client", "~> 0.9.6"
+  spec.add_dependency "googleauth", "~> 0.5.1"
   spec.add_dependency "thor", "~> 0.19.1"
   spec.add_dependency "text-table", "~> 1.2.4"
 

data/lib/drive_env/cli/auth.rb

@@ -4,6 +4,8 @@ require 'drive_env'
 module DriveEnv
   module Cli
     class Auth < Thor
+      OOB_URI = 'urn:ietf:wg:oauth:2.0:oob'
+
       desc 'login', ''
       def login
         if !config.client_id
@@ -12,14 +14,11 @@ module DriveEnv
         if !config.client_secret
           abort "please set client_secret: #{$0} config set client_secret YOUR_CLIENT_SECRET"
         end
-        print("1. Open this page:\n%s\n\n" % auth.authorization_uri)
+        print("1. Open this page:\n%s\n\n" % authorizer.get_authorization_url(base_url: OOB_URI))
         print("2. Enter the authorization code shown in the page: ")
-        auth.code = $stdin.gets.chomp
-        auth.fetch_access_token!
-        config.access_token = auth.access_token
-        config.refresh_token = auth.refresh_token
-        config.expires_at = auth.issued_at + auth.expires_in
-        config.save
+
+        code = $stdin.gets.chomp
+        authorizer.get_and_store_credentials_from_code(user_id: DriveEnv::Config::DEFAULT_TOKEN_USER_ID, code: code, base_url: OOB_URI)
       end
 
       no_commands do
@@ -27,18 +26,8 @@ module DriveEnv
           @config ||= DriveEnv::Config.load(options[:config])
         end
 
-        def auth
-          unless @auth
-            @auth = ::DriveEnv.client.authorization
-            @auth.client_id = config.client_id
-            @auth.client_secret = config.client_secret
-            @auth.scope = %w[
-              https://www.googleapis.com/auth/drive
-              https://spreadsheets.google.com/feeds/
-            ].join(' ')
-            @auth.redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
-          end
-          @auth
+        def authorizer
+          DriveEnv.authorizer(config.client_id, config.client_secret, DriveEnv::Config::DEFAULT_TOKENS_STORE_FILE)
         end
       end
     end

data/lib/drive_env/cli/spreadsheet.rb

@@ -69,34 +69,27 @@ module DriveEnv
           @config ||= DriveEnv::Config.load(options[:config])
         end
 
-        def auth
-          unless @auth
-            @auth = ::DriveEnv.client.authorization
-            @auth.client_id = config.client_id
-            @auth.client_secret = config.client_secret
-          end
-          @auth
+        def authorizer
+          DriveEnv.authorizer(config.client_id, config.client_secret, DriveEnv::Config::DEFAULT_TOKENS_STORE_FILE)
         end
 
         def access_token
           unless @access_token
-            auth.expires_at = config.expires_at
-            if auth.expired?
-              auth.refresh_token = config.refresh_token
-              auth.fetch_access_token!
-              config.access_token = auth.access_token
-              config.expires_at = auth.issued_at + auth.expires_in
-              config.save
+            credential = authorizer.get_credentials(DriveEnv::Config::DEFAULT_TOKEN_USER_ID)
+            case
+            when credential.nil?
+              abort "please set access_token: #{$0} auth login"
+            when credential.expired?
+              credential.fetch_access_token!
+              credential.expires_at = credential.issued_at + credential.expires_in
+              authorizer.store_credentials(DriveEnv::Config::DEFAULT_TOKEN_USER_ID, credential)
             end
-            @access_token = config.access_token
+            @access_token = credential.access_token
           end
           @access_token
         end
 
         def session
-          if !config.access_token
-            abort "please set access_token: #{$0} auth login"
-          end
           @session ||= GoogleDrive.login_with_oauth(access_token)
         end
 

data/lib/drive_env/config.rb

@@ -4,12 +4,11 @@ require 'yaml'
 module DriveEnv
   class Config
     DEFAULT_CONFIG_FILE = File.expand_path('~/.config/drive_env/config')
+    DEFAULT_TOKENS_STORE_FILE = File.expand_path('~/.config/drive_env/tokens.yml')
+    DEFAULT_TOKEN_USER_ID = 'default'
 
     attr_accessor :client_id
     attr_accessor :client_secret
-    attr_accessor :access_token
-    attr_accessor :refresh_token
-    attr_accessor :expires_at
 
     def initialize
       @spreadsheet_aliases = {}
@@ -39,10 +38,20 @@ module DriveEnv
       end
     end
 
+    def migrate
+      ## dropped variables in 0.2.pre1
+      %W[access_token refresh_token expires_at].each do |v|
+        if instance_variable_get("@#{v}")
+          remove_instance_variable("@#{v}")
+        end
+      end
+    end
+
     class << self
       def load(file)
         obj = File.exist?(file) ? YAML.load(File.read(file)) : self.new
         obj.instance_variable_set("@config_file", file)
+        obj.migrate
         obj
       end
     end

data/lib/drive_env/version.rb

@@ -1,3 +1,3 @@
 module DriveEnv
-  VERSION = '0.1.0'
+  VERSION = '0.2.pre1'
 end

data/lib/drive_env.rb

@@ -1,13 +1,23 @@
 require 'drive_env/version'
-require 'google/api_client'
+require 'googleauth'
+require 'googleauth/stores/file_token_store'
 
 module DriveEnv
   autoload :Cli,     'drive_env/cli'
   autoload :Config,  'drive_env/config'
 
   class << self
-    def client
-      @client ||= Google::APIClient.new(:application_name => 'drive_env', :application_version => DriveEnv::VERSION)
+    def authorizer(client_id, client_secret, token_store_file)
+      unless @authorizer
+        client_id = Google::Auth::ClientId.new(client_id, client_secret)
+        scope = %w[
+          https://www.googleapis.com/auth/drive
+          https://spreadsheets.google.com/feeds/
+        ]
+        token_store = Google::Auth::Stores::FileTokenStore.new(file: token_store_file)
+        @authorizer = Google::Auth::UserAuthorizer.new(client_id, scope, token_store)
+      end
+      @authorizer
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drive_env
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.pre1
 platform: ruby
 authors:
 - YAMADA Tsuyoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: googleauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -165,12 +179,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate `.env` file from Spreadsheet in Google Drive