Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

prep for 2.6.0.rc1

  • Loading branch information...
commit f10e8bbc3c9b97c190c7f5a8dab355d44c1ebac0 1 parent 57fe719
@dchelimsky dchelimsky authored
Showing with 30 additions and 13 deletions.
  1. +29 −12 Rakefile
  2. +1 −1  lib/rspec/core/version.rb
View
41 Rakefile
@@ -8,13 +8,25 @@ require "yaml"
require "rake/rdoctask"
require "rspec/core/rake_task"
require "rspec/core/version"
-require "cucumber/rake/task"
-class Cucumber::Rake::Task::ForkedCucumberRunner
- # When cucumber shells out, we still need it to run in the context of our
- # bundle.
- def run
- sh "bundle exec #{RUBY} " + args.join(" ")
+cucumber_loaded = false
+begin
+ require "cucumber/rake/task"
+
+ Cucumber::Rake::Task.new(:cucumber)
+
+ class Cucumber::Rake::Task::ForkedCucumberRunner
+ # When cucumber shells out, we still need it to run in the context of our
+ # bundle.
+ def run
+ sh "bundle exec #{RUBY} " + args.join(" ")
+ end
+ end
+ cucumber_loaded = true
+rescue LoadError => e
+ puts "unable to load cucumber, some tasks unavailable"
+ task :cucumber do
+ # no-op
end
end
@@ -25,7 +37,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
t.verbose = false
end
-Cucumber::Rake::Task.new(:cucumber)
namespace :rcov do
task :cleanup do
@@ -38,11 +49,17 @@ namespace :rcov do
t.rcov_opts << %[--no-html --aggregate coverage.data]
end
- Cucumber::Rake::Task.new :cucumber do |t|
- t.cucumber_opts = %w{--format progress}
- t.rcov = true
- t.rcov_opts = %[-Ilib -Ispec --exclude "gems/*,features"]
- t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
+ if cucumber_loaded
+ Cucumber::Rake::Task.new :cucumber do |t|
+ t.cucumber_opts = %w{--format progress}
+ t.rcov = true
+ t.rcov_opts = %[-Ilib -Ispec --exclude "gems/*,features"]
+ t.rcov_opts << %[--text-report --sort coverage --aggregate coverage.data]
+ end
+ else
+ task :cucumber do
+ # no-op
+ end
end
end
View
2  lib/rspec/core/version.rb
@@ -1,7 +1,7 @@
module RSpec # :nodoc:
module Core # :nodoc:
module Version # :nodoc:
- STRING = '2.5.1'
+ STRING = '2.6.0.rc1'
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.