Permalink
Browse files

Upgraded to rspec 2.0.0.

  • Loading branch information...
1 parent 95d273b commit 75325901c43c6e2f79503dc83c931125af2eb072 @postmodern committed Oct 11, 2010
Showing with 22 additions and 28 deletions.
  1. +1 −0 .rspec
  2. +0 −1 .specopts
  3. +1 −1 Gemfile
  4. +12 −2 Gemfile.lock
  5. +2 −7 Rakefile
  6. +5 −5 shodan.gemspec
  7. +1 −12 spec/spec_helper.rb
View
1 .rspec
@@ -0,0 +1 @@
+--colour --format documentation
View
@@ -1 +0,0 @@
---colour --format specdoc
View
@@ -19,4 +19,4 @@ group(:doc) do
gem 'yard', '~> 0.6.0'
end
-gem 'rspec', '~> 1.3.0', :group => [:development, :test]
+gem 'rspec', '~> 2.0.0', :group => [:development, :test]
View
@@ -1,6 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
+ diff-lcs (1.1.2)
git (1.2.5)
jeweler (1.5.0.pre2)
bundler (>= 1.0.0.rc.5)
@@ -11,7 +12,16 @@ GEM
nokogiri (1.4.3.1)
rake (0.8.7)
rdiscount (1.6.5)
- rspec (1.3.0)
+ rspec (2.0.0)
+ rspec-core (= 2.0.0)
+ rspec-expectations (= 2.0.0)
+ rspec-mocks (= 2.0.0)
+ rspec-core (2.0.0)
+ rspec-expectations (2.0.0)
+ diff-lcs (>= 1.1.2)
+ rspec-mocks (2.0.0)
+ rspec-core (= 2.0.0)
+ rspec-expectations (= 2.0.0)
uri-query_params (0.4.0)
yard (0.6.1)
@@ -23,6 +33,6 @@ DEPENDENCIES
mechanize (~> 1.0.0)
rake (~> 0.8.7)
rdiscount (~> 1.6.3)
- rspec (~> 1.3.0)
+ rspec (~> 2.0.0)
uri-query_params (~> 0.4.0)
yard (~> 0.6.0)
View
@@ -29,13 +29,8 @@ Jeweler::Tasks.new do |gem|
end
Jeweler::GemcutterTasks.new
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
- spec.libs += ['lib', 'spec']
- spec.spec_files = FileList['spec/**/*_spec.rb']
- spec.spec_opts = ['--options', '.specopts']
-end
-
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
task :default => :spec
require 'yard'
View
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Postmodern"]
- s.date = %q{2010-09-07}
+ s.date = %q{2010-10-10}
s.description = %q{A Ruby interface to SHODAN, a computer search engine.}
s.email = %q{postmodern.mod3@gmail.com}
s.extra_rdoc_files = [
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
]
s.files = [
".gitignore",
- ".specopts",
+ ".rspec",
".yardopts",
"COPYING.txt",
"ChangeLog.md",
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<mechanize>, ["~> 1.0.0"])
s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre"])
- s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
+ s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
s.add_development_dependency(%q<yard>, [">= 0.5.3"])
@@ -79,7 +79,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<mechanize>, ["~> 1.0.0"])
s.add_dependency(%q<rake>, ["~> 0.8.7"])
s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre"])
- s.add_dependency(%q<rspec>, ["~> 1.3.0"])
+ s.add_dependency(%q<rspec>, ["~> 2.0.0"])
s.add_dependency(%q<mechanize>, [">= 1.0.0"])
s.add_dependency(%q<rspec>, [">= 1.3.0"])
s.add_dependency(%q<yard>, [">= 0.5.3"])
@@ -89,7 +89,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<mechanize>, ["~> 1.0.0"])
s.add_dependency(%q<rake>, ["~> 0.8.7"])
s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre"])
- s.add_dependency(%q<rspec>, ["~> 1.3.0"])
+ s.add_dependency(%q<rspec>, ["~> 2.0.0"])
s.add_dependency(%q<mechanize>, [">= 1.0.0"])
s.add_dependency(%q<rspec>, [">= 1.3.0"])
s.add_dependency(%q<yard>, [">= 0.5.3"])
View
@@ -1,15 +1,4 @@
-require 'rubygems'
-require 'bundler'
-
-begin
- Bundler.setup(:default, :test)
-rescue Bundler::BundlerError => e
- STDERR.puts e.message
- STDERR.puts "Run `bundle install` to install missing gems"
- exit e.status_code
-end
-
-require 'spec'
+require 'rspec'
require 'shodan/version'
include Shodan

0 comments on commit 7532590

Please sign in to comment.