diff --git a/bin/google-api b/bin/google-api index 1e41f940d..0ae86a84c 100755 --- a/bin/google-api +++ b/bin/google-api @@ -161,6 +161,7 @@ def oauth_login(options={}) end def execute(options={}) + require 'signet/oauth_1/client' config_file = File.expand_path('~/.google-api.yaml') signed = File.exist?(config_file) rpcname = ARGV.detect { |p| p =~ /^[a-z0-9_-]+\.[a-z0-9_\.-]+$/i } @@ -171,7 +172,10 @@ def execute(options={}) exit(1) end service_name = options[:service_name] || rpcname[/^([^\.]+)\./, 1] - client = Google::APIClient.new(:service => service_name) + client = Google::APIClient.new( + :service => service_name, + :authorization => :oauth_1 + ) if signed if !client.authorization.kind_of?(Signet::OAuth1::Client) STDERR.puts( @@ -190,7 +194,8 @@ def execute(options={}) config["token_credential_secret"] end service_version = - options[:service_version] || client.latest_service(service_name).version + options[:service_version] || + client.latest_service_version(service_name).version service = client.discovered_service(service_name, service_version) method = service.to_h[rpcname] if !method diff --git a/examples/sinatra/explorer.rb b/examples/sinatra/explorer.rb index fb0d74816..0d5828201 100644 --- a/examples/sinatra/explorer.rb +++ b/examples/sinatra/explorer.rb @@ -23,6 +23,8 @@ rescue LoadError exit(1) end +enable :sessions + CSS = <<-CSS /* http://meyerweb.com/eric/tools/css/reset/ */ /* v1.0 | 20080212 */ @@ -308,7 +310,7 @@ end def service(service_name, service_version) unless service_version - service_version = client.latest_service(service_name).version + service_version = client.latest_service_version(service_name).version end client.discovered_service(service_name, service_version) end