Browse files

updated gem dependencies; upgraded rspec

  • Loading branch information...
1 parent d79053c commit cfa263ea1da836d49f18b6012b3d45af0dc2f999 @jlong committed Nov 3, 2010
Showing with 29 additions and 32 deletions.
  1. +1 −0 .rspec
  2. +5 −5 Gemfile
  3. +14 −4 Gemfile.lock
  4. +1 −3 Rakefile
  5. +0 −1 spec/spec.opts
  6. +1 −6 spec/spec_helper.rb
  7. +2 −5 tasks/jeweler.rake
  8. +5 −8 tasks/rspec.rake
View
1 .rspec
@@ -0,0 +1 @@
+--color
View
10 Gemfile
@@ -9,10 +9,10 @@ gem 'rack', '~> 1.2.1'
# activesupport 3.0.x
gem 'activesupport', '~> 3.0.1'
gem 'tzinfo', '~> 0.3.23'
-gem 'i18n', '~> 0.4.1'
+gem 'i18n', '~> 0.4.2'
group :development do
- gem 'jeweler', '~> 1.4.0'
- gem 'haml'
- gem 'rspec', '~> 1.3.1'
-end
+ gem 'jeweler', '~> 1.4.0'
+ gem 'haml', '~> 3.0.23'
+ gem 'rspec', '~> 2.0.1'
+end
View
18 Gemfile.lock
@@ -2,6 +2,7 @@ GEM
remote: http://rubygems.org/
specs:
activesupport (3.0.1)
+ diff-lcs (1.1.2)
gemcutter (0.6.1)
git (1.2.5)
haml (3.0.23)
@@ -13,7 +14,16 @@ GEM
json_pure (1.4.6)
rack (1.2.1)
rake (0.8.7)
- rspec (1.3.1)
+ rspec (2.0.1)
+ rspec-core (~> 2.0.1)
+ rspec-expectations (~> 2.0.1)
+ rspec-mocks (~> 2.0.1)
+ rspec-core (2.0.1)
+ rspec-expectations (2.0.1)
+ diff-lcs (>= 1.1.2)
+ rspec-mocks (2.0.1)
+ rspec-core (~> 2.0.1)
+ rspec-expectations (~> 2.0.1)
rubyforge (2.0.4)
json_pure (>= 1.1.7)
tzinfo (0.3.23)
@@ -23,10 +33,10 @@ PLATFORMS
DEPENDENCIES
activesupport (~> 3.0.1)
- haml
- i18n (~> 0.4.1)
+ haml (~> 3.0.23)
+ i18n (~> 0.4.2)
jeweler (~> 1.4.0)
rack (~> 1.2.1)
rake (~> 0.8.7)
- rspec (~> 1.3.1)
+ rspec (~> 2.0.1)
tzinfo (~> 0.3.23)
View
4 Rakefile
@@ -6,6 +6,4 @@ load 'tasks/rdoc.rake'
load 'tasks/rspec.rake'
load 'tasks/undefine.rake'
-#Dir['tasks/**/*.rake'].each { |rake| load rake }
-
-task :default => :spec
+task :default => :spec
View
1 spec/spec.opts
@@ -1 +0,0 @@
---colour
View
7 spec/spec_helper.rb
@@ -4,9 +4,4 @@
gem 'activesupport'
require 'serve'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-
-end
+require 'rspec'
View
7 tasks/jeweler.rake
@@ -6,17 +6,14 @@ begin
gem.description = %Q{Serve is a small Rack-based web server that makes it easy to serve ERB or HAML from any directory. Serve is an ideal tool for building HTML prototypes of Rails applications. Serve can also handle SASS, Textile, and Markdown if the appropriate gems are installed.}
gem.email = "me@johnwlong.com"
gem.homepage = "http://github.com/jlong/serve"
- gem.authors = ["John W. Long", "Adam I. Williams"]
-
+ gem.authors = ["John W. Long", "Adam I. Williams", "Robert Evans"]
gem.add_dependency 'rack', '~> 1.2.1'
gem.add_dependency 'activesupport', '~> 3.0.1'
gem.add_dependency 'tzinfo', '~> 0.3.23'
gem.add_dependency 'i18n', '~> 0.4.1'
- gem.add_development_dependency "rspec", "~> 1.3.1"
-
-
+ gem.add_development_dependency "rspec", "~> 2.0.1"
gem.files = FileList["[A-Z]*", "{bin,lib,rails,spec}/**/*"].exclude("tmp")
# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
View
13 tasks/rspec.rake
@@ -1,16 +1,13 @@
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
-Spec::Rake::SpecTask.new(:spec) do |spec|
- spec.libs << 'lib' << 'spec'
- spec.spec_opts = ['--options', "spec/spec.opts"]
- spec.spec_files = FileList['spec/**/*_spec.rb']
+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
# Check dependencies before running specs
-task :spec => :check_dependencies
+task :spec => :check_dependencies

0 comments on commit cfa263e

Please sign in to comment.