Remove multiple specifications of gem 'rspec'
We should take advantage of bundler. Use gemspec in the Gemfile to merge the Gemfile with the dependencies in the .gemspec file. This solution requires rcov to be removed from .gemspec because RCov only works in MRI 1.8 and there's no way to specify platforms in the .gemspec.
This commit is contained in:
parent
b7430aeb8c
commit
5858999045
3
Gemfile
3
Gemfile
|
@ -1,5 +1,7 @@
|
||||||
source :rubygems
|
source :rubygems
|
||||||
|
|
||||||
|
gemspec
|
||||||
|
|
||||||
gem 'signet', '>= 0.3.4'
|
gem 'signet', '>= 0.3.4'
|
||||||
gem 'addressable', '>= 2.2.3'
|
gem 'addressable', '>= 2.2.3'
|
||||||
gem 'uuidtools', '>= 2.1.0'
|
gem 'uuidtools', '>= 2.1.0'
|
||||||
|
@ -21,7 +23,6 @@ end
|
||||||
|
|
||||||
group :test, :development do
|
group :test, :development do
|
||||||
gem 'rake', '>= 0.9.0'
|
gem 'rake', '>= 0.9.0'
|
||||||
gem 'rspec', '~> 2.10.0'
|
|
||||||
gem 'rcov', '>= 0.9.9', :platform => :mri_18
|
gem 'rcov', '>= 0.9.9', :platform => :mri_18
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
9
Rakefile
9
Rakefile
|
@ -5,15 +5,6 @@ $LOAD_PATH.uniq!
|
||||||
require 'rubygems'
|
require 'rubygems'
|
||||||
require 'rake'
|
require 'rake'
|
||||||
|
|
||||||
gem 'rspec', '~> 2.10.0'
|
|
||||||
begin
|
|
||||||
require 'rspec/core/rake_task'
|
|
||||||
rescue LoadError
|
|
||||||
STDERR.puts "Please install rspec:"
|
|
||||||
STDERR.puts "sudo gem install rspec"
|
|
||||||
exit(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
require File.join(File.dirname(__FILE__), 'lib/google/api_client', 'version')
|
require File.join(File.dirname(__FILE__), 'lib/google/api_client', 'version')
|
||||||
|
|
||||||
PKG_DISPLAY_NAME = 'Google API Client'
|
PKG_DISPLAY_NAME = 'Google API Client'
|
||||||
|
|
|
@ -6,16 +6,16 @@ Gem::Specification.new do |s|
|
||||||
|
|
||||||
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
||||||
s.authors = ["Bob Aman"]
|
s.authors = ["Bob Aman"]
|
||||||
s.date = "2012-06-07"
|
s.date = "2012-06-14"
|
||||||
s.description = "The Google API Ruby Client makes it trivial to discover and access supported\nAPIs.\n"
|
s.description = "The Google API Ruby Client makes it trivial to discover and access supported\nAPIs.\n"
|
||||||
s.email = "bobaman@google.com"
|
s.email = "bobaman@google.com"
|
||||||
s.executables = ["google-api"]
|
s.executables = ["google-api"]
|
||||||
s.extra_rdoc_files = ["README.md"]
|
s.extra_rdoc_files = ["README.md"]
|
||||||
s.files = ["lib/google", "lib/google/api_client", "lib/google/api_client/batch.rb", "lib/google/api_client/client_secrets.rb", "lib/google/api_client/discovery", "lib/google/api_client/discovery/api.rb", "lib/google/api_client/discovery/media.rb", "lib/google/api_client/discovery/method.rb", "lib/google/api_client/discovery/resource.rb", "lib/google/api_client/discovery/schema.rb", "lib/google/api_client/discovery.rb", "lib/google/api_client/environment.rb", "lib/google/api_client/errors.rb", "lib/google/api_client/media.rb", "lib/google/api_client/reference.rb", "lib/google/api_client/result.rb", "lib/google/api_client/service_account.rb", "lib/google/api_client/version.rb", "lib/google/api_client.rb", "lib/google/api_client.rb.orig", "lib/google/inflection.rb", "spec/fixtures", "spec/fixtures/files", "spec/fixtures/files/sample.txt", "spec/google", "spec/google/api_client", "spec/google/api_client/batch_spec.rb", "spec/google/api_client/discovery_spec.rb", "spec/google/api_client/media_spec.rb", "spec/google/api_client/result_spec.rb", "spec/google/api_client/service_account_spec.rb", "spec/google/api_client_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/gem.rake", "tasks/git.rake", "tasks/metrics.rake", "tasks/spec.rake", "tasks/wiki.rake", "tasks/yard.rake", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE", "Rakefile", "README.md", "bin/google-api"]
|
s.files = ["lib/google", "lib/google/api_client", "lib/google/api_client/batch.rb", "lib/google/api_client/client_secrets.rb", "lib/google/api_client/discovery", "lib/google/api_client/discovery/api.rb", "lib/google/api_client/discovery/media.rb", "lib/google/api_client/discovery/method.rb", "lib/google/api_client/discovery/resource.rb", "lib/google/api_client/discovery/schema.rb", "lib/google/api_client/discovery.rb", "lib/google/api_client/environment.rb", "lib/google/api_client/errors.rb", "lib/google/api_client/media.rb", "lib/google/api_client/reference.rb", "lib/google/api_client/result.rb", "lib/google/api_client/service_account.rb", "lib/google/api_client/version.rb", "lib/google/api_client.rb", "lib/google/inflection.rb", "spec/fixtures", "spec/fixtures/files", "spec/fixtures/files/sample.txt", "spec/google", "spec/google/api_client", "spec/google/api_client/batch_spec.rb", "spec/google/api_client/discovery_spec.rb", "spec/google/api_client/media_spec.rb", "spec/google/api_client/result_spec.rb", "spec/google/api_client/service_account_spec.rb", "spec/google/api_client_spec.rb", "spec/spec_helper.rb", "tasks/gem.rake", "tasks/git.rake", "tasks/metrics.rake", "tasks/spec.rake", "tasks/wiki.rake", "tasks/yard.rake", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE", "Rakefile", "README.md", "bin/google-api"]
|
||||||
s.homepage = "http://code.google.com/p/google-api-ruby-client/"
|
s.homepage = "http://code.google.com/p/google-api-ruby-client/"
|
||||||
s.rdoc_options = ["--main", "README.md"]
|
s.rdoc_options = ["--main", "README.md"]
|
||||||
s.require_paths = ["lib"]
|
s.require_paths = ["lib"]
|
||||||
s.rubygems_version = "1.8.10"
|
s.rubygems_version = "1.8.24"
|
||||||
s.summary = "Package Summary"
|
s.summary = "Package Summary"
|
||||||
|
|
||||||
if s.respond_to? :specification_version then
|
if s.respond_to? :specification_version then
|
||||||
|
@ -32,8 +32,7 @@ Gem::Specification.new do |s|
|
||||||
s.add_runtime_dependency(%q<launchy>, [">= 2.0.0"])
|
s.add_runtime_dependency(%q<launchy>, [">= 2.0.0"])
|
||||||
s.add_development_dependency(%q<sinatra>, [">= 1.2.0"])
|
s.add_development_dependency(%q<sinatra>, [">= 1.2.0"])
|
||||||
s.add_development_dependency(%q<rake>, [">= 0.9.0"])
|
s.add_development_dependency(%q<rake>, [">= 0.9.0"])
|
||||||
s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
|
s.add_development_dependency(%q<rspec>, ["~> 2.10.0"])
|
||||||
s.add_development_dependency(%q<rcov>, [">= 0.9.9"])
|
|
||||||
else
|
else
|
||||||
s.add_dependency(%q<signet>, [">= 0.3.4"])
|
s.add_dependency(%q<signet>, [">= 0.3.4"])
|
||||||
s.add_dependency(%q<addressable>, [">= 2.2.3"])
|
s.add_dependency(%q<addressable>, [">= 2.2.3"])
|
||||||
|
@ -45,8 +44,7 @@ Gem::Specification.new do |s|
|
||||||
s.add_dependency(%q<launchy>, [">= 2.0.0"])
|
s.add_dependency(%q<launchy>, [">= 2.0.0"])
|
||||||
s.add_dependency(%q<sinatra>, [">= 1.2.0"])
|
s.add_dependency(%q<sinatra>, [">= 1.2.0"])
|
||||||
s.add_dependency(%q<rake>, [">= 0.9.0"])
|
s.add_dependency(%q<rake>, [">= 0.9.0"])
|
||||||
s.add_dependency(%q<rspec>, ["~> 1.2.9"])
|
s.add_dependency(%q<rspec>, ["~> 2.10.0"])
|
||||||
s.add_dependency(%q<rcov>, [">= 0.9.9"])
|
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
s.add_dependency(%q<signet>, [">= 0.3.4"])
|
s.add_dependency(%q<signet>, [">= 0.3.4"])
|
||||||
|
@ -59,7 +57,6 @@ Gem::Specification.new do |s|
|
||||||
s.add_dependency(%q<launchy>, [">= 2.0.0"])
|
s.add_dependency(%q<launchy>, [">= 2.0.0"])
|
||||||
s.add_dependency(%q<sinatra>, [">= 1.2.0"])
|
s.add_dependency(%q<sinatra>, [">= 1.2.0"])
|
||||||
s.add_dependency(%q<rake>, [">= 0.9.0"])
|
s.add_dependency(%q<rake>, [">= 0.9.0"])
|
||||||
s.add_dependency(%q<rspec>, ["~> 1.2.9"])
|
s.add_dependency(%q<rspec>, ["~> 2.10.0"])
|
||||||
s.add_dependency(%q<rcov>, [">= 0.9.9"])
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -40,7 +40,6 @@ namespace :gem do
|
||||||
|
|
||||||
s.add_development_dependency('rake', '>= 0.9.0')
|
s.add_development_dependency('rake', '>= 0.9.0')
|
||||||
s.add_development_dependency('rspec', '~> 2.10.0')
|
s.add_development_dependency('rspec', '~> 2.10.0')
|
||||||
s.add_development_dependency('rcov', '>= 0.9.9')
|
|
||||||
|
|
||||||
s.require_path = 'lib'
|
s.require_path = 'lib'
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
require 'rake/clean'
|
require 'rake/clean'
|
||||||
|
require 'rspec/core/rake_task'
|
||||||
|
|
||||||
CLOBBER.include('coverage', 'specdoc')
|
CLOBBER.include('coverage', 'specdoc')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue