Skip to content
Browse files

Merge branch 'master' into classes_and_methods

* master:
  ci: bundle exec rake (to ensure compatibility w/ downstream deps)
  dev: remove unnecessary monkey patch of Cucumber
  remove accidental file
  • Loading branch information...
2 parents 450a3b1 + b13d0f1 commit d51eb836ea3b8ce3cd8ee61a6ebe62abb81eef2e @dchelimsky dchelimsky committed May 23, 2011
Showing with 2 additions and 27 deletions.
  1. +1 −1 .travis.yml
  2. +1 −14 Rakefile
  3. +0 −12 gem-info.txt
View
2 .travis.yml
@@ -1,4 +1,4 @@
-script: "rake"
+script: "bundle exec rake"
rvm:
- 1.8.6
- 1.8.7
View
15 Rakefile
@@ -23,21 +23,9 @@ require "rake/rdoctask"
require "rspec/core/rake_task"
require "rspec/core/version"
-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
@@ -52,7 +40,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
t.verbose = false
end
-
namespace :rcov do
task :cleanup do
rm_rf 'coverage.data'
@@ -64,7 +51,7 @@ namespace :rcov do
t.rcov_opts << %[--no-html --aggregate coverage.data]
end
- if cucumber_loaded
+ if defined?(Cucumber)
Cucumber::Rake::Task.new :cucumber do |t|
t.cucumber_opts = %w{--format progress}
t.rcov = true
View
12 gem-info.txt
@@ -1,12 +0,0 @@
-build | read | status
-1.3.7 | 1.3.7 | ok
-1.3.7 | 1.6.2 | ok
-1.3.7 | 1.7.2 | ok
-1.3.7 | 1.8.3 | ok
-
-1.8.3 | 1.8.3 | ok
-1.8.3 | 1.7.2 | ok
-1.8.3 | 1.6.2 | ok
-1.8.3 | 1.3.7 | ok
-
-1.7.2

0 comments on commit d51eb83

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