projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0020c0d
)
Updating dependencies.
author
Bob Aman <bobaman@google.com>
Sat, 21 Jul 2012 09:19:16 +0000
(12:19 +0300)
committer
Bob Aman <bobaman@google.com>
Sat, 21 Jul 2012 10:51:23 +0000
(13:51 +0300)
Gemfile
patch
|
blob
|
history
Rakefile
patch
|
blob
|
history
bin/google-api
patch
|
blob
|
history
google-api-client.gemspec
patch
|
blob
|
history
lib/google/api_client.rb
patch
|
blob
|
history
lib/google/api_client/reference.rb
patch
|
blob
|
history
spec/google/api_client/discovery_spec.rb
patch
|
blob
|
history
spec/google/api_client_spec.rb
patch
|
blob
|
history
tasks/gem.rake
patch
|
blob
|
history
tasks/spec.rake
patch
|
blob
|
history
diff --git
a/Gemfile
b/Gemfile
index f040924215e8d2ee8aad22a6344e66160db3797c..3cb397121238a8d715cd83777ba72867362df13d 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-2,11
+2,11
@@
source :rubygems
gemspec
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 '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
gem 'multi_json', '>= 1.3.0'
gem 'extlib', '>= 0.9.15'
gem 'jruby-openssl', :platforms => :jruby
diff --git
a/Rakefile
b/Rakefile
index 04a09f46dc4c0039edb410cf06071a9c2b04f565..12f2767570259af00ec6edc59221f7c59acc9292 100644
(file)
--- a/
Rakefile
+++ b/
Rakefile
@@
-29,7
+29,7
@@
PKG_FILES = FileList[
'[A-Z]*', 'Rakefile'
].exclude(/database\.yml/).exclude(/[_\.]git$/)
'[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
if RCOV_ENABLED
task :default => 'spec:rcov'
else
diff --git
a/bin/google-api
b/bin/google-api
index c1d61ae3a6e9dadfcc1c56c602bcf8bd3a22f74a..136960485fa1178287be04cbefc936cebd047644 100755
(executable)
--- a/
bin/google-api
+++ b/
bin/google-api
@@
-11,7
+11,7
@@
OAUTH_SERVER_PORT = 12736
require 'rubygems'
require 'optparse'
require 'rubygems'
require 'optparse'
-gem 'faraday', '~> 0.
7.0
'
+gem 'faraday', '~> 0.
8.1
'
require 'faraday'
require 'faraday/utils'
require 'faraday'
require 'faraday/utils'
@@
-187,7
+187,7
@@
HTML
end
def client
end
def client
- gem 'signet', '~> 0.
3
.0'
+ gem 'signet', '~> 0.
4
.0'
require 'signet/oauth_1/client'
require 'yaml'
require 'irb'
require 'signet/oauth_1/client'
require 'yaml'
require 'irb'
@@
-281,7
+281,7
@@
HTML
]
def oauth_1_login
]
def oauth_1_login
- gem 'signet', '~> 0.
3
.0'
+ gem 'signet', '~> 0.
4
.0'
require 'signet/oauth_1/client'
require 'launchy'
require 'yaml'
require 'signet/oauth_1/client'
require 'launchy'
require 'yaml'
@@
-349,7
+349,7
@@
HTML
end
def oauth_2_login
end
def oauth_2_login
- gem 'signet', '~> 0.
3
.0'
+ gem 'signet', '~> 0.
4
.0'
require 'signet/oauth_2/client'
require 'launchy'
require 'yaml'
require 'signet/oauth_2/client'
require 'launchy'
require 'yaml'
diff --git
a/google-api-client.gemspec
b/google-api-client.gemspec
index 7f726b60e016b096263ef7de7fc88e6aa75c098e..f29d2fa5e0b7d5df25d00a91fdb1c4b77227177e 100644
(file)
--- 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.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Bob Aman"]
- s.date = "2012-06-1
4
"
+ s.date = "2012-06-1
9
"
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"]
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.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
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<signet>, [">= 0.3.4"])
s.add_runtime_dependency(%q<addressable>, [">= 2.2.3"])
s.add_runtime_dependency(%q<autoparse>, [">= 0.3.1"])
s.add_runtime_dependency(%q<signet>, [">= 0.3.4"])
s.add_runtime_dependency(%q<addressable>, [">= 2.2.3"])
s.add_runtime_dependency(%q<autoparse>, [">= 0.3.1"])
- s.add_runtime_dependency(%q<faraday>, ["~> 0.
7.0
"])
+ s.add_runtime_dependency(%q<faraday>, ["~> 0.
8.1
"])
s.add_runtime_dependency(%q<multi_json>, [">= 1.3.0"])
s.add_runtime_dependency(%q<extlib>, [">= 0.9.15"])
s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.0"])
s.add_runtime_dependency(%q<multi_json>, [">= 1.3.0"])
s.add_runtime_dependency(%q<extlib>, [">= 0.9.15"])
s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.0"])
@@
-37,7
+37,7
@@
Gem::Specification.new do |s|
s.add_dependency(%q<signet>, [">= 0.3.4"])
s.add_dependency(%q<addressable>, [">= 2.2.3"])
s.add_dependency(%q<autoparse>, [">= 0.3.1"])
s.add_dependency(%q<signet>, [">= 0.3.4"])
s.add_dependency(%q<addressable>, [">= 2.2.3"])
s.add_dependency(%q<autoparse>, [">= 0.3.1"])
- s.add_dependency(%q<faraday>, ["~> 0.
7.0
"])
+ s.add_dependency(%q<faraday>, ["~> 0.
8.1
"])
s.add_dependency(%q<multi_json>, [">= 1.3.0"])
s.add_dependency(%q<extlib>, [">= 0.9.15"])
s.add_dependency(%q<uuidtools>, [">= 2.1.0"])
s.add_dependency(%q<multi_json>, [">= 1.3.0"])
s.add_dependency(%q<extlib>, [">= 0.9.15"])
s.add_dependency(%q<uuidtools>, [">= 2.1.0"])
@@
-50,7
+50,7
@@
Gem::Specification.new do |s|
s.add_dependency(%q<signet>, [">= 0.3.4"])
s.add_dependency(%q<addressable>, [">= 2.2.3"])
s.add_dependency(%q<autoparse>, [">= 0.3.1"])
s.add_dependency(%q<signet>, [">= 0.3.4"])
s.add_dependency(%q<addressable>, [">= 2.2.3"])
s.add_dependency(%q<autoparse>, [">= 0.3.1"])
- s.add_dependency(%q<faraday>, ["~> 0.
7.0
"])
+ s.add_dependency(%q<faraday>, ["~> 0.
8.1
"])
s.add_dependency(%q<multi_json>, [">= 1.3.0"])
s.add_dependency(%q<extlib>, [">= 0.9.15"])
s.add_dependency(%q<uuidtools>, [">= 2.1.0"])
s.add_dependency(%q<multi_json>, [">= 1.3.0"])
s.add_dependency(%q<extlib>, [">= 0.9.15"])
s.add_dependency(%q<uuidtools>, [">= 2.1.0"])
diff --git
a/lib/google/api_client.rb
b/lib/google/api_client.rb
index b07264741ff9446d6add9a58836d883e0d3b99a1..399dfdaee7197329ab9f3d3b75b4a6e3f7af8f44 100644
(file)
--- a/
lib/google/api_client.rb
+++ b/
lib/google/api_client.rb
@@
-13,7
+13,7
@@
# limitations under the License.
# limitations under the License.
-gem 'faraday', '~> 0.
7.0
'
+gem 'faraday', '~> 0.
8.1
'
require 'faraday'
require 'faraday/utils'
require 'multi_json'
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
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(
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
: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(
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
: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(
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 42dee0445ffa36f33391e4eb870c2fb723976c47..f95761fcaa852dfaf7464465af12d219d575c3ac 100644
(file)
--- a/
lib/google/api_client/reference.rb
+++ b/
lib/google/api_client/reference.rb
@@
-13,7
+13,7
@@
# limitations under the License.
# limitations under the License.
-gem 'faraday', '~> 0.
7.0
'
+gem 'faraday', '~> 0.
8.1
'
require 'faraday'
require 'faraday/utils'
require 'multi_json'
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 4e8fc1ac118e3eba635a1a012bc38f1ce4aa0913..c4c8bfedfa762f65d1211842a7dcdbc8f731c155 100644
(file)
--- a/
spec/google/api_client/discovery_spec.rb
+++ b/
spec/google/api_client/discovery_spec.rb
@@
-17,12
+17,12
@@
require 'spec_helper'
require 'spec_helper'
-gem 'faraday', '~> 0.
7.0
'
+gem 'faraday', '~> 0.
8.1
'
require 'faraday'
require 'faraday/utils'
require 'multi_json'
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'
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 dbd772c9dd10496f38f141b2958ab1f9ff7dc6bb..92ed090914c85f94788e6c58ca3b87e972d36c20 100644
(file)
--- a/
spec/google/api_client_spec.rb
+++ b/
spec/google/api_client_spec.rb
@@
-14,11
+14,11
@@
require 'spec_helper'
require 'spec_helper'
-gem 'faraday', '~> 0.
7.0
'
+gem 'faraday', '~> 0.
8.1
'
require 'faraday'
require 'faraday/utils'
require 'faraday'
require 'faraday/utils'
-gem 'signet', '~> 0.
3
.0'
+gem 'signet', '~> 0.
4
.0'
require 'signet/oauth_1/client'
require 'google/api_client'
require 'signet/oauth_1/client'
require 'google/api_client'
diff --git
a/tasks/gem.rake
b/tasks/gem.rake
index ab07b52f1b620a04d7614c0caf3c2f3344696b43..0192db8d94636cf15929814dd1d3fbe10cbb4185 100644
(file)
--- 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.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('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')
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 7e58adfbde7b82079e029da1d3ac08dcafbbb33e..1a2402e12b8c3413f6975c24f090ea5cb9da0cdc 100644
(file)
--- 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|
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.'
end
desc 'Generate HTML Specdocs for all specs.'