Merge pull request #122 from netbe/feature/fix_google_drive

Generate client id and keys file

.babelish.sample

@@ -32,4 +32,8 @@ langs:                               # Languages to convert. i.e. English:en
 # sheet: 0                           # Index of worksheet to download. First index is 0.
 # macros_filename: Babelish.h        # File to output the defines of localized strings
 # stripping: false				     # Strips values inside the spreadsheet
+
+###################################### General ######################################
+
+
 # csv_separator: ','				 # CSV column separator character, uses ',' by default

.gitignore

@@ -29,3 +29,6 @@ Gemfile.lock
 
 doc
 .yardoc
+
+
+lib/babelish/keys.rb

.travis.yml

@@ -1,9 +1,14 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.1.0
-  - 2.2
-  - 2.3.1
+- 2.1.0
+- 2.2
+- 2.3.1
+script:
+  - bundle exec rake generate_keys
+  - bundle exec rake test
+before_deploy:
+  - bundle exec rake generate_keys
 deploy:
   provider: rubygems
   api_key:
@@ -13,3 +18,7 @@ deploy:
     tags: true
     repo: netbe/Babelish
     all_branches: true
+env:
+  global:
+  - secure: btKN46sftTFZ9RmmCvVveHt6JGRBt+ausRoWoy/n5iwgdjrHGOPnyLwMkRoZkAvWt6F2AlhzoNiNfcLhrlhtySJgZS2fw/yvkCdCu92vBxuOhhzp0vq5LuNTWL9feTRjDx1kfVLPBDJUS2Ejn7zi8x7BUKnfSJN2lZ3FkkHkUxQ=
+  - secure: qBnld5DOrn+coyVc7ls271REiIN9KY4+dyrZh451mfVbcGX/n2yyu6HG0PaTU8XwS2S6jBDWzaX0Oq1V+1BsKdjZb8OTtbKG0bQ8/F+V8nNG6w1gbNIFRHxTgFK69ASEpwHPmqPt50h6duNeLcc1h+wu43lGaMn8CMN0HqaW5D4=

Rakefile

@@ -5,13 +5,24 @@ require 'yard'
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/babelish/**/test_*.rb']
-  # t.warning = true
   t.verbose = true
 end
 
+task :generate_keys do
+  f = File.open("lib/babelish/keys.rb", "w")
+  f.puts <<-FOO
+  module Babelish
+    module Keys
+      GOOGLE_DRIVE_CLIENT_SECRET = "#{ENV['google_drive_client_secret']}"
+      GOOGLE_DRIVE_CLIENT_ID = "#{ENV['google_drive_client_id']}"
+    end
+  end
+  FOO
+  f.close
+end
+
 YARD::Rake::YardocTask.new do |t|
   t.files   = ['lib/**/*.rb']
-  # t.options = ['--any', '--extra', '--opts']
 end
 
 task :default => :test

babelish.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "thor"
 
-  s.add_dependency "google_drive", "~> 3.0"
+  s.add_dependency "google_drive", "~> 3.0.3"
   s.add_dependency "nokogiri"
   # google_drive dependency to ask for mail and password
   s.add_dependency "highline"

lib/babelish/google_doc.rb

@@ -43,14 +43,17 @@ def open(requested_filename)
 
     def authenticate
       # will try to get token and store in file below
-      @session = GoogleDrive.saved_session ".babelish.token"
+      @session = GoogleDrive.saved_session(".babelish.token",
+                                           nil,
+                                           Babelish::Keys::GOOGLE_DRIVE_CLIENT_ID,
+                                           Babelish::Keys::GOOGLE_DRIVE_CLIENT_SECRET)
     end
 
     def file_with_name(name)
       unless @session
         authenticate
       end
-      @session.spreadsheet_by_title(name)
+      @session.file_by_title(name)
     end
   end
 end

lib/babelish/version.rb

@@ -1,3 +1,3 @@
 module Babelish
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end