Skip to content
Browse files

RSpec 2.1 + some fixes to the gemspec

  • Loading branch information...
1 parent 00952e7 commit a900325fa7a7deceaf84a9a7634eef64c368f5a0 freeformz committed
Showing with 31 additions and 31 deletions.
  1. +0 −7 Gemfile
  2. +11 −3 Gemfile.lock
  3. +6 −11 Rakefile
  4. +14 −10 cloudkit.gemspec
View
7 Gemfile
@@ -5,10 +5,3 @@ gemspec 'cloudkit'
gem 'ruby-openid', '~> 2.1', :require => 'openid'
#gem 'sinatra', '~> 0.9'
-#gem 'formatador', '0.0.10'
-#gem 'redis', '0.1.2'
-
-group :test do
- gem 'rake'
- gem 'rspec', '~> 1.3', :require => 'spec'
-end
View
14 Gemfile.lock
@@ -17,6 +17,7 @@ GEM
specs:
bson (1.1.2)
bson_ext (1.1.2)
+ diff-lcs (1.1.2)
formatador (0.0.10)
json (1.4.6)
macaddr (1.0.0)
@@ -25,7 +26,14 @@ GEM
oauth (0.4.3)
rack (1.2.1)
rake (0.8.7)
- rspec (1.3.1)
+ rspec (2.1.0)
+ rspec-core (~> 2.1.0)
+ rspec-expectations (~> 2.1.0)
+ rspec-mocks (~> 2.1.0)
+ rspec-core (2.1.0)
+ rspec-expectations (2.1.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.1.0)
ruby-openid (2.1.8)
uuid (2.0.1)
macaddr (~> 1.0)
@@ -42,7 +50,7 @@ DEPENDENCIES
mongo (~> 1.1.2)
oauth (~> 0.3)
rack (~> 1.1)
- rake
- rspec (~> 1.3)
+ rake (~> 0.8.7)
+ rspec (~> 2.1.0)
ruby-openid (~> 2.1)
uuid (= 2.0.1)
View
17 Rakefile
@@ -1,20 +1,15 @@
require 'rake/clean'
-require 'spec/rake/spectask'
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
CLEAN.include 'doc/api'
task :default => :spec
-desc "Run all examples (or a specific spec with TASK=xxxx)"
-Spec::Rake::SpecTask.new('spec') do |t|
- t.spec_opts = ["-c"]
- t.spec_files = begin
- if ENV["TASK"]
- ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
- else
- FileList['spec/**/*_spec.rb']
- end
- end
+desc "Run all specs in spec directory"
+RSpec::Core::RakeTask.new do |task|
+ task.rspec_opts = ["-c"]
end
desc 'Generate rdoc'
View
24 cloudkit.gemspec
@@ -17,7 +17,7 @@ EOD
s.email = "jon@joncrosby.me"
s.homepage = "http://getcloudkit.com"
- s.files = Dir["#{dir}/lib/**/*.rb"] + Dir["#{dir}/examples/**/*"] + Dir["#{dir}/doc/**/*"]
+ s.files = Dir["#{dir}/lib/**/*.rb"] + Dir["#{dir}/examples/**/*"] + Dir["#{dir}/doc/**/*"] + %w{README CHANGES COPYING TODO Gemfile Rakefile}
s.require_paths = ["lib"]
s.test_files = Dir["#{dir}/spec/**/*.rb"]
@@ -25,13 +25,17 @@ EOD
s.rubyforge_project = "cloudkit"
- s.add_dependency 'rack', '~> 1.1'
- s.add_dependency 'uuid', '= 2.0.1'
- s.add_dependency 'oauth', '~> 0.3'
- s.add_dependency 'ruby-openid', '~> 2.1'
- s.add_dependency 'json', '~> 1.4.6'
- s.add_dependency 'formatador', '0.0.10'
- s.add_dependency 'mongo', '~> 1.1.2'
- s.add_dependency 'bson', '~> 1.1.2'
- s.add_dependency 'bson_ext', '~> 1.1.2'
+ s.add_runtime_dependency 'rack', '~> 1.1'
+ s.add_runtime_dependency 'uuid', '= 2.0.1'
+ s.add_runtime_dependency 'oauth', '~> 0.3'
+ s.add_runtime_dependency 'ruby-openid', '~> 2.1'
+ s.add_runtime_dependency 'json', '~> 1.4.6'
+ s.add_runtime_dependency 'formatador', '0.0.10'
+ s.add_runtime_dependency 'mongo', '~> 1.1.2'
+ s.add_runtime_dependency 'bson', '~> 1.1.2'
+ s.add_runtime_dependency 'bson_ext', '~> 1.1.2'
+
+ s.add_development_dependency 'rake', '~>0.8.7'
+ s.add_development_dependency 'rspec', '~> 2.1.0'
+
end

0 comments on commit a900325

Please sign in to comment.
Something went wrong with that request. Please try again.