Skip to content
This repository
Browse code

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...
commit d51eb836ea3b8ce3cd8ee61a6ebe62abb81eef2e 2 parents 450a3b1 + b13d0f1
David Chelimsky dchelimsky authored

Showing 3 changed files with 2 additions and 27 deletions. Show diff stats Hide diff stats

  1. +1 1  .travis.yml
  2. +1 14 Rakefile
  3. +0 12 gem-info.txt
2  .travis.yml
... ... @@ -1,4 +1,4 @@
1   -script: "rake"
  1 +script: "bundle exec rake"
2 2 rvm:
3 3 - 1.8.6
4 4 - 1.8.7
15 Rakefile
@@ -23,21 +23,9 @@ require "rake/rdoctask"
23 23 require "rspec/core/rake_task"
24 24 require "rspec/core/version"
25 25
26   -cucumber_loaded = false
27   -
28 26 begin
29 27 require "cucumber/rake/task"
30   -
31 28 Cucumber::Rake::Task.new(:cucumber)
32   -
33   - class Cucumber::Rake::Task::ForkedCucumberRunner
34   - # When cucumber shells out, we still need it to run in the context of our
35   - # bundle.
36   - def run
37   - sh "bundle exec #{RUBY} " + args.join(" ")
38   - end
39   - end
40   - cucumber_loaded = true
41 29 rescue LoadError => e
42 30 puts "unable to load cucumber, some tasks unavailable"
43 31 task :cucumber do
@@ -52,7 +40,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
52 40 t.verbose = false
53 41 end
54 42
55   -
56 43 namespace :rcov do
57 44 task :cleanup do
58 45 rm_rf 'coverage.data'
@@ -64,7 +51,7 @@ namespace :rcov do
64 51 t.rcov_opts << %[--no-html --aggregate coverage.data]
65 52 end
66 53
67   - if cucumber_loaded
  54 + if defined?(Cucumber)
68 55 Cucumber::Rake::Task.new :cucumber do |t|
69 56 t.cucumber_opts = %w{--format progress}
70 57 t.rcov = true
12 gem-info.txt
... ... @@ -1,12 +0,0 @@
1   -build | read | status
2   -1.3.7 | 1.3.7 | ok
3   -1.3.7 | 1.6.2 | ok
4   -1.3.7 | 1.7.2 | ok
5   -1.3.7 | 1.8.3 | ok
6   -
7   -1.8.3 | 1.8.3 | ok
8   -1.8.3 | 1.7.2 | ok
9   -1.8.3 | 1.6.2 | ok
10   -1.8.3 | 1.3.7 | ok
11   -
12   -1.7.2

0 comments on commit d51eb83

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