From 5e751681dd3d103ae4a4a2b89cd4c65b2b5620ca Mon Sep 17 00:00:00 2001 From: Bob Aman Date: Sat, 21 Jul 2012 12:19:16 +0300 Subject: [PATCH] Updating dependencies. --- Gemfile | 4 ++-- Rakefile | 2 +- bin/google-api | 8 ++++---- google-api-client.gemspec | 10 +++++----- lib/google/api_client.rb | 8 ++++---- lib/google/api_client/reference.rb | 2 +- spec/google/api_client/discovery_spec.rb | 4 ++-- spec/google/api_client_spec.rb | 4 ++-- tasks/gem.rake | 4 ++-- tasks/spec.rake | 3 +++ 10 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index f04092421..3cb397121 100644 --- a/Gemfile +++ b/Gemfile @@ -2,11 +2,11 @@ source :rubygems gemspec -gem 'signet', '>= 0.3.4' +gem 'signet', '>= 0.4.0' gem 'addressable', '>= 2.2.3' gem 'uuidtools', '>= 2.1.0' gem 'autoparse', '>= 0.3.1' -gem 'faraday', '~> 0.7.0' +gem 'faraday', '~> 0.8.1' gem 'multi_json', '>= 1.3.0' gem 'extlib', '>= 0.9.15' gem 'jruby-openssl', :platforms => :jruby diff --git a/Rakefile b/Rakefile index 04a09f46d..12f276757 100644 --- a/Rakefile +++ b/Rakefile @@ -29,7 +29,7 @@ PKG_FILES = FileList[ '[A-Z]*', 'Rakefile' ].exclude(/database\.yml/).exclude(/[_\.]git$/) -RCOV_ENABLED = (RUBY_PLATFORM != 'java' && RUBY_VERSION =~ /^1\.8/) +RCOV_ENABLED = !!(RUBY_PLATFORM != 'java' && RUBY_VERSION =~ /^1\.8/) if RCOV_ENABLED task :default => 'spec:rcov' else diff --git a/bin/google-api b/bin/google-api index c1d61ae3a..136960485 100755 --- a/bin/google-api +++ b/bin/google-api @@ -11,7 +11,7 @@ OAUTH_SERVER_PORT = 12736 require 'rubygems' require 'optparse' -gem 'faraday', '~> 0.7.0' +gem 'faraday', '~> 0.8.1' require 'faraday' require 'faraday/utils' @@ -187,7 +187,7 @@ HTML end def client - gem 'signet', '~> 0.3.0' + gem 'signet', '~> 0.4.0' require 'signet/oauth_1/client' require 'yaml' require 'irb' @@ -281,7 +281,7 @@ HTML ] def oauth_1_login - gem 'signet', '~> 0.3.0' + gem 'signet', '~> 0.4.0' require 'signet/oauth_1/client' require 'launchy' require 'yaml' @@ -349,7 +349,7 @@ HTML end def oauth_2_login - gem 'signet', '~> 0.3.0' + gem 'signet', '~> 0.4.0' require 'signet/oauth_2/client' require 'launchy' require 'yaml' diff --git a/google-api-client.gemspec b/google-api-client.gemspec index 7f726b60e..f29d2fa5e 100644 --- a/google-api-client.gemspec +++ b/google-api-client.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Bob Aman"] - s.date = "2012-06-14" + s.date = "2012-06-19" s.description = "The Google API Ruby Client makes it trivial to discover and access supported\nAPIs.\n" s.email = "bobaman@google.com" s.executables = ["google-api"] @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.homepage = "http://code.google.com/p/google-api-ruby-client/" s.rdoc_options = ["--main", "README.md"] s.require_paths = ["lib"] - s.rubygems_version = "1.8.24" + s.rubygems_version = "1.8.15" s.summary = "Package Summary" if s.respond_to? :specification_version then @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q, [">= 0.3.4"]) s.add_runtime_dependency(%q, [">= 2.2.3"]) s.add_runtime_dependency(%q, [">= 0.3.1"]) - s.add_runtime_dependency(%q, ["~> 0.7.0"]) + s.add_runtime_dependency(%q, ["~> 0.8.1"]) s.add_runtime_dependency(%q, [">= 1.3.0"]) s.add_runtime_dependency(%q, [">= 0.9.15"]) s.add_runtime_dependency(%q, [">= 2.1.0"]) @@ -37,7 +37,7 @@ Gem::Specification.new do |s| s.add_dependency(%q, [">= 0.3.4"]) s.add_dependency(%q, [">= 2.2.3"]) s.add_dependency(%q, [">= 0.3.1"]) - s.add_dependency(%q, ["~> 0.7.0"]) + s.add_dependency(%q, ["~> 0.8.1"]) s.add_dependency(%q, [">= 1.3.0"]) s.add_dependency(%q, [">= 0.9.15"]) s.add_dependency(%q, [">= 2.1.0"]) @@ -50,7 +50,7 @@ Gem::Specification.new do |s| s.add_dependency(%q, [">= 0.3.4"]) s.add_dependency(%q, [">= 2.2.3"]) s.add_dependency(%q, [">= 0.3.1"]) - s.add_dependency(%q, ["~> 0.7.0"]) + s.add_dependency(%q, ["~> 0.8.1"]) s.add_dependency(%q, [">= 1.3.0"]) s.add_dependency(%q, [">= 0.9.15"]) s.add_dependency(%q, [">= 2.1.0"]) diff --git a/lib/google/api_client.rb b/lib/google/api_client.rb index b07264741..399dfdaee 100644 --- a/lib/google/api_client.rb +++ b/lib/google/api_client.rb @@ -13,7 +13,7 @@ # limitations under the License. -gem 'faraday', '~> 0.7.0' +gem 'faraday', '~> 0.8.1' require 'faraday' require 'faraday/utils' require 'multi_json' @@ -113,7 +113,7 @@ module Google def authorization=(new_authorization) case new_authorization when :oauth_1, :oauth - gem 'signet', '~> 0.3.0' + gem 'signet', '~> 0.4.0' require 'signet/oauth_1/client' # NOTE: Do not rely on this default value, as it may change new_authorization = Signet::OAuth1::Client.new( @@ -127,7 +127,7 @@ module Google :client_credential_secret => 'anonymous' ) when :two_legged_oauth_1, :two_legged_oauth - gem 'signet', '~> 0.3.0' + gem 'signet', '~> 0.4.0' require 'signet/oauth_1/client' # NOTE: Do not rely on this default value, as it may change new_authorization = Signet::OAuth1::Client.new( @@ -136,7 +136,7 @@ module Google :two_legged => true ) when :oauth_2 - gem 'signet', '~> 0.3.0' + gem 'signet', '~> 0.4.0' require 'signet/oauth_2/client' # NOTE: Do not rely on this default value, as it may change new_authorization = Signet::OAuth2::Client.new( diff --git a/lib/google/api_client/reference.rb b/lib/google/api_client/reference.rb index 42dee0445..f95761fca 100644 --- a/lib/google/api_client/reference.rb +++ b/lib/google/api_client/reference.rb @@ -13,7 +13,7 @@ # limitations under the License. -gem 'faraday', '~> 0.7.0' +gem 'faraday', '~> 0.8.1' require 'faraday' require 'faraday/utils' require 'multi_json' diff --git a/spec/google/api_client/discovery_spec.rb b/spec/google/api_client/discovery_spec.rb index 4e8fc1ac1..c4c8bfedf 100644 --- a/spec/google/api_client/discovery_spec.rb +++ b/spec/google/api_client/discovery_spec.rb @@ -17,12 +17,12 @@ require 'spec_helper' -gem 'faraday', '~> 0.7.0' +gem 'faraday', '~> 0.8.1' require 'faraday' require 'faraday/utils' require 'multi_json' -gem 'signet', '~> 0.3.0' +gem 'signet', '~> 0.4.0' require 'signet/oauth_1/client' require 'google/api_client' diff --git a/spec/google/api_client_spec.rb b/spec/google/api_client_spec.rb index dbd772c9d..92ed09091 100644 --- a/spec/google/api_client_spec.rb +++ b/spec/google/api_client_spec.rb @@ -14,11 +14,11 @@ require 'spec_helper' -gem 'faraday', '~> 0.7.0' +gem 'faraday', '~> 0.8.1' require 'faraday' require 'faraday/utils' -gem 'signet', '~> 0.3.0' +gem 'signet', '~> 0.4.0' require 'signet/oauth_1/client' require 'google/api_client' diff --git a/tasks/gem.rake b/tasks/gem.rake index ab07b52f1..0192db8d9 100644 --- a/tasks/gem.rake +++ b/tasks/gem.rake @@ -24,10 +24,10 @@ namespace :gem do s.rdoc_options.concat ['--main', 'README.md'] # Dependencies used in the main library - s.add_runtime_dependency('signet', '>= 0.3.4') + s.add_runtime_dependency('signet', '>= 0.4.0') s.add_runtime_dependency('addressable', '>= 2.2.3') s.add_runtime_dependency('autoparse', '>= 0.3.1') - s.add_runtime_dependency('faraday', '~> 0.7.0') + s.add_runtime_dependency('faraday', '~> 0.8.1') s.add_runtime_dependency('multi_json', '>= 1.3.0') s.add_runtime_dependency('extlib', '>= 0.9.15') s.add_runtime_dependency('uuidtools', '>= 2.1.0') diff --git a/tasks/spec.rake b/tasks/spec.rake index 7e58adfbd..1a2402e12 100644 --- a/tasks/spec.rake +++ b/tasks/spec.rake @@ -5,6 +5,9 @@ CLOBBER.include('coverage', 'specdoc') namespace :spec do RSpec::Core::RakeTask.new(:all) do |t| + t.pattern = FileList['spec/**/*_spec.rb'] + t.rspec_opts = ['--color', '--format', 'documentation'] + t.rcov = false end desc 'Generate HTML Specdocs for all specs.'