Skip to content

Commit

Permalink
attempting update to change google_spreadsheet to google_drive
Browse files Browse the repository at this point in the history
  • Loading branch information
Kagetsuki committed May 24, 2013
1 parent c634c29 commit f03f5be
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'http://rubygems.org'
gem 'spreadsheet', '> 0.6.4'
gem 'nokogiri'
gem 'rubyzip'
# gem 'google-spreadsheet-ruby'
gem 'google_drive'

group :development do
gem 'jeweler'
Expand Down
24 changes: 24 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,37 @@ GEM
addressable (2.3.2)
crack (0.3.1)
diff-lcs (1.2.1)
faraday (0.8.7)
multipart-post (~> 1.1)
git (1.2.5)
google_drive (0.3.6)
nokogiri (>= 1.4.4, != 1.5.2, != 1.5.1)
oauth (>= 0.3.6)
oauth2 (>= 0.5.0)
httpauth (0.2.0)
jeweler (1.8.3)
bundler (~> 1.0)
git (>= 1.2.5)
rake
rdoc
json (1.7.7)
json (1.7.7-java)
jwt (0.1.8)
multi_json (>= 1.5)
multi_json (1.7.3)
multi_xml (0.5.3)
multipart-post (1.2.0)
nokogiri (1.5.6)
nokogiri (1.5.6-java)
oauth (0.4.7)
oauth2 (0.9.1)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
multi_json (~> 1.0)
multi_xml (~> 0.5)
rack (~> 1.2)
rack (1.5.2)
rake (0.9.2.2)
rdoc (3.12.2)
json (~> 1.4)
Expand Down Expand Up @@ -41,6 +64,7 @@ PLATFORMS
ruby

DEPENDENCIES
google_drive
jeweler
nokogiri
rspec
Expand Down
8 changes: 4 additions & 4 deletions lib/roo/google.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
begin
require "google_spreadsheet"
require "google_drive"
rescue LoadError => e
raise e, "Using Roo::Google requires the google-spreadsheet-ruby gem"
raise e, "Using Roo::Google requires the google_drive gem"
end

class GoogleHTTPError < RuntimeError; end
Expand All @@ -11,7 +11,7 @@ class GoogleWriteError < RuntimeError; end
class Roo::Google < Roo::GenericSpreadsheet
attr_accessor :date_format, :datetime_format

# Creates a new Google spreadsheet object.
# Creates a new Google Drive object.
def initialize(spreadsheetkey, options = {})
@spreadsheetkey = spreadsheetkey
@user = options[:user] || ENV['GOOGLE_MAIL']
Expand All @@ -33,7 +33,7 @@ def initialize(spreadsheetkey, options = {})
@datetime_format = '%d/%m/%Y %H:%M:%S'
@time_format = '%H:%M:%S'

session = GoogleSpreadsheet.login(@user, @password)
session = GoogleDrive.login(@user, @password)
@sheets = session.spreadsheet_by_key(@spreadsheetkey).worksheets.map do |sheet|
sheet.title
end
Expand Down
2 changes: 2 additions & 0 deletions roo.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<spreadsheet>, ["> 0.6.4"])
s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
s.add_runtime_dependency(%q<rubyzip>, [">= 0"])
s.add_runtime_dependency(%q<google_drive>, [">= 0"])
s.add_development_dependency(%q<jeweler>, [">= 0"])
else
s.add_dependency(%q<spreadsheet>, ["> 0.6.4"])
Expand All @@ -185,6 +186,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<spreadsheet>, ["> 0.6.4"])
s.add_dependency(%q<nokogiri>, [">= 0"])
s.add_dependency(%q<rubyzip>, [">= 0"])
s.add_dependency(%q<google_drive>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
end
end
Expand Down

0 comments on commit f03f5be

Please sign in to comment.