Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update nokogiri dependency to ~> 1.5, update rspec.

Fix rakefile and ensure specs pass.
  • Loading branch information...
commit 042ac0738960087a47fc6dccc544e6debff997dc 1 parent 6835091
@hypomodern hypomodern authored
Showing with 16 additions and 20 deletions.
  1. +1 −1  .rspec
  2. +8 −12 Rakefile
  3. +2 −2 opengraph.gemspec
  4. +5 −5 spec/spec_helper.rb
View
2  .rspec
@@ -1,2 +1,2 @@
--colour
---format=nested
+--format nested
View
20 Rakefile
@@ -11,9 +11,9 @@ begin
gem.homepage = "http://github.com/intridea/opengraph"
gem.authors = ["Michael Bleigh"]
gem.add_dependency 'hashie'
- gem.add_dependency 'nokogiri', '~> 1.4.0'
+ gem.add_dependency 'nokogiri', '~> 1.5.0'
gem.add_dependency 'rest-client', '~> 1.6.0'
- gem.add_development_dependency "rspec", ">= 1.2.9"
+ gem.add_development_dependency "rspec", ">= 2.0.0"
gem.add_development_dependency 'webmock'
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
end
@@ -22,24 +22,20 @@ rescue LoadError
puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
end
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
- spec.libs << 'lib' << 'spec'
- spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+ spec.pattern = 'spec/**/*_spec.rb'
end
-Spec::Rake::SpecTask.new(:rcov) do |spec|
- spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
spec.pattern = 'spec/**/*_spec.rb'
spec.rcov = true
end
-task :spec => :check_dependencies
-
task :default => :spec
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
version = File.exist?('VERSION') ? File.read('VERSION') : ""
rdoc.rdoc_dir = 'rdoc'
View
4 opengraph.gemspec
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<hashie>, [">= 0"])
- s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4.0"])
+ s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0"])
s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.0"])
s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
s.add_development_dependency(%q<webmock>, [">= 0"])
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<hashie>, [">= 0"])
s.add_dependency(%q<nokogiri>, ["~> 1.4.0"])
s.add_dependency(%q<rest-client>, ["~> 1.6.0"])
- s.add_dependency(%q<rspec>, [">= 1.2.9"])
+ s.add_dependency(%q<rspec>, [">= 2.0.0"])
s.add_dependency(%q<webmock>, [">= 0"])
end
else
View
10 spec/spec_helper.rb
@@ -3,12 +3,12 @@
require 'rubygems'
require 'opengraph'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
require 'webmock/rspec'
-include WebMock
+include WebMock::API
+
+RSpec.configure do |config|
-Spec::Runner.configure do |config|
-
end
Please sign in to comment.
Something went wrong with that request. Please try again.