Permalink
Browse files

paths, deps, etc

  • Loading branch information...
1 parent 9846dd8 commit 9773a34fa1686b9f939f3affcf426b518fdaaed3 @dchelimsky dchelimsky committed Mar 2, 2010
Showing with 12 additions and 18 deletions.
  1. +8 −14 Rakefile
  2. +3 −3 lib/rspec/core.rb
  3. +1 −1 lib/rspec/core/rake_task.rb
View
@@ -20,16 +20,15 @@ begin
gem.homepage = "http://github.com/rspec/core"
gem.authors = ["Chad Humphries", "David Chelimsky"]
gem.rubyforge_project = "rspec"
- # TODO - make this a dev dep when the dep on rspec-expectations becomes configurable
- gem.add_dependency "rspec-expectations", ">= #{Rspec::Core::Version::STRING}"
+ gem.add_development_dependency "rspec-expectations", ">= #{Rspec::Core::Version::STRING}"
gem.add_development_dependency "rspec-mocks", ">= #{Rspec::Core::Version::STRING}"
gem.add_development_dependency('cucumber', '>= 0.5.3')
gem.post_install_message = <<-EOM
#{"*"*50}
Thank you for installing #{gem.summary}
- The 'a' in #{gem.version} means this is alpha software.
+ The 'b' in #{gem.version} means this is beta software.
If you are looking for a supported production release,
please "gem install rspec" (without --pre).
@@ -40,17 +39,13 @@ rescue LoadError
puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
end
-begin
- Rspec::Core::RakeTask.new :spec
+Rspec::Core::RakeTask.new(:spec)
- desc "Run all examples using rcov"
- Rspec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
- t.rcov = true
- t.rcov_opts = %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
- t.rcov_opts << %[--no-html --aggregate coverage.data]
- end
-rescue LoadError
- puts "Rspec core or one of its dependencies is not installed. Install it with: gem install rspec-meta"
+desc "Run all examples using rcov"
+Rspec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
+ t.rcov = true
+ t.rcov_opts = %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
+ t.rcov_opts << %[--no-html --aggregate coverage.data]
end
task :cleanup_rcov_files do
@@ -80,7 +75,6 @@ else
task :default => [:check_dependencies, :rcov, :features]
end
-
Rake::RDocTask.new do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.title = "rspec-core #{Rspec::Core::Version::STRING}"
View
@@ -16,9 +16,6 @@
require 'rspec/core/backward_compatibility'
require 'rspec/core/version'
-# TODO - make this configurable with default 'on'
-require 'rspec/expectations'
-
module Rspec
module Core
@@ -45,3 +42,6 @@ def self.configure
yield Core.configuration if block_given?
end
end
+
+# TODO - make this configurable with default 'on'
+require 'rspec/expectations'
@@ -51,7 +51,7 @@ def initialize(*args)
def define # :nodoc:
actual_name = Hash === name ? name.keys.first : name
- desc("Run all examples") unless ::Rake.application.last_comment
+ desc("Run Rspec code examples") unless ::Rake.application.last_comment
task name do
RakeFileUtils.send(:verbose, verbose) do

0 comments on commit 9773a34

Please sign in to comment.