updating deps

Oshuma · May 19, 2011 · cbb40d2 · cbb40d2
1 parent 2cd79de
commit cbb40d2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.rvmrc
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,7 @@
+source :rubygems
+
 gem 'json'
 
 group :test do
-  gem 'rspec', :require => 'spec'
+  gem 'rspec', '>= 2.6.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,20 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    json (1.5.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.0)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  json
+  rspec (>= 2.6.0)
diff --git a/Rakefile b/Rakefile
@@ -1,11 +1,11 @@
-require 'spec/rake/spectask'
+require 'bundler'
+require 'rspec/core/rake_task'
 
 task :default => :spec
 
 desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--color']
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--color']
 end
 
 desc 'Start a console loaded with the library'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,6 +1,7 @@
-require 'spec'
+require 'rspec'
 require "#{File.dirname(__FILE__)}/../lib/grooveshark"
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   include Grooveshark
+  config.mock_with :rspec
 end