Don't include Rake::DSL at the top level, but in the task itself.

dandeguzman · Jun 20, 2011 · 33c851b · 33c851b
1 parent e198713
commit 33c851b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/lib/cucumber/platform.rb b/lib/cucumber/platform.rb
@@ -4,7 +4,7 @@
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '0.10.7'
+  VERSION       = '1.0.0'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

diff --git a/lib/cucumber/rake/task.rb b/lib/cucumber/rake/task.rb
@@ -1,13 +1,6 @@
 require 'cucumber/platform'
 require 'gherkin/formatter/ansi_escapes'
 
-begin
-  # Support Rake > 0.8.7
-  require 'rake/dsl_definition'
-  include Rake::DSL
-rescue LoadError
-end
-
 module Cucumber
   module Rake
     # Defines a Rake task for running features.
@@ -35,6 +28,13 @@ module Rake
     class Task
       include Gherkin::Formatter::AnsiEscapes
 
+      begin
+        # Support Rake > 0.8.7
+        require 'rake/dsl_definition'
+        include ::Rake::DSL if defined?(::Rake::DSL)
+      rescue LoadError
+      end
+
       class InProcessCucumberRunner #:nodoc:
         attr_reader :args
 

diff --git a/spec/cucumber/rake/forked_spec.rb b/spec/cucumber/rake/forked_spec.rb
@@ -24,7 +24,7 @@ module Rake
         end
 
         it "uses bundle exec to find cucumber and libraries" do
-          subject.cmd.should == [RUBY,
+          subject.cmd.should == [Cucumber::RUBY_BINARY,
                                  '-S',
                                  'bundle',
                                  'exec',
@@ -46,7 +46,7 @@ module Rake
         end
 
         it "uses well known cucumber location and specified libraries" do
-          subject.cmd.should == [RUBY,
+          subject.cmd.should == [Cucumber::RUBY_BINARY,
                                  "-I",
                                  "\"lib\"",
                                  "\"#{Cucumber::BINARY }\"",

diff --git a/spec/cucumber/rake/rcov_spec.rb b/spec/cucumber/rake/rcov_spec.rb
@@ -26,7 +26,7 @@ module Rake
         end
 
         it "uses bundle exec to find cucumber and libraries" do
-          subject.cmd.should == [RUBY,
+          subject.cmd.should == [Cucumber::RUBY_BINARY,
                                  '-S',
                                  'bundle',
                                  'exec',
@@ -51,7 +51,7 @@ module Rake
         end
 
         it "uses well known cucumber location and specified libraries" do
-          subject.cmd.should == [RUBY,
+          subject.cmd.should == [Cucumber::RUBY_BINARY,
                                  '-I',
                                  '"lib"',
                                  '-S',