aslakhellesoy-cucumber 0.3.7.4 → 0.3.7.5

data/History.txt

@@ -3,7 +3,7 @@
 === New Features
 * Rails cucumber generator sets up default gem dependencies in cucumber environment.
 * Better error if RSpec's option parser is "accidentally" loaded. (Aslak Hellesøy)
-* Most formatters now report how long a run took (#228 Aslak Hellesøy)
+* The duration of a run is reported by formatters - same format as the Linux time command (#228 Aslak Hellesøy)
 * Scenario and ExampleRow objects (passed to Before and After hooks) have #name and #line methods (#316 Aslak Hellesøy)
 * Rails generator creates a cucumber environment file to avoid potential cache_classes conflicts in test.rb (#165, Ben Mabey)
 * HTML formatter renders @tags (but the CSS is still ugly)
@@ -12,6 +12,7 @@
 * The Cucumber Rake task will again fork by default (as before 0.3.4). Forking must be turned off explicitly. (Aslak Hellesøy)
 
 === Bugfixes
+* Better coexistence with RSpec - Cucumber now *neuters* the part of RSpec that tries to parse ARGV.
 * The differ= exception is gone (#325, #340 Aslak Hellesøy)
 
 == 0.3.7 2009-05-22

data/Manifest.txt

@@ -326,7 +326,7 @@ lib/cucumber/platform.rb
 lib/cucumber/rails/rspec.rb
 lib/cucumber/rails/world.rb
 lib/cucumber/rake/task.rb
-lib/cucumber/rspec_option_parser_detector.rb
+lib/cucumber/rspec_neuter.rb
 lib/cucumber/step_definition.rb
 lib/cucumber/step_match.rb
 lib/cucumber/step_mother.rb

data/bin/cucumber

@@ -2,7 +2,7 @@
 # Add '.rb' to work around a bug in IronRuby's File#dirname
 $:.unshift(File.dirname(__FILE__ + '.rb') + '/../lib') unless $:.include?(File.dirname(__FILE__ + '.rb') + '/../lib')
 
-require 'cucumber/rspec_option_parser_detector'
+require 'cucumber/rspec_neuter'
 require 'cucumber/cli/main'
 begin
   # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.

data/features/html_formatter/a.html

@@ -444,7 +444,7 @@ Then I should have '&lt;count&gt;' cukes              </div>
               <td class="skipped" id="row_10_0">10</td>
             </tr>
             <tr>
-              <td colspan="1" class="failed">
+              <td class="failed" colspan="1">
                 <pre>
 FAIL (RuntimeError)
 ./features/step_definitions/sample_steps.rb:2:in `flunker'
@@ -716,7 +716,7 @@ Given &lt;other_state&gt; without a table              </div>
               <td class="skipped" id="row_10_1">passing</td>
             </tr>
             <tr>
-              <td colspan="2" class="failed">
+              <td class="failed" colspan="2">
                 <pre>
 Undefined step: "missing without a table" (Cucumber::Undefined)
 features/outline_sample.feature:6:in `Given <state> without a table'                </pre>
@@ -731,7 +731,7 @@ features/outline_sample.feature:6:in `Given <state> without a table'
               <td class="skipped" id="row_12_1">passing</td>
             </tr>
             <tr>
-              <td colspan="2" class="failed">
+              <td class="failed" colspan="2">
                 <pre>
 FAIL (RuntimeError)
 ./features/step_definitions/sample_steps.rb:2:in `flunker'
@@ -864,7 +864,7 @@ Given &lt;state&gt; without a table              </div>
               <td class="failed" id="row_16_0">failing</td>
             </tr>
             <tr>
-              <td colspan="1" class="failed">
+              <td class="failed" colspan="1">
                 <pre>
 FAIL (RuntimeError)
 ./features/step_definitions/sample_steps.rb:2:in `flunker'
@@ -918,7 +918,7 @@ Given &lt;state&gt; without a table              </div>
               <td class="failed" id="row_32_0">failing</td>
             </tr>
             <tr>
-              <td colspan="1" class="failed">
+              <td class="failed" colspan="1">
                 <pre>
 FAIL (RuntimeError)
 ./features/step_definitions/sample_steps.rb:2:in `flunker'

data/lib/cucumber/rspec_neuter.rb

@@ -0,0 +1,23 @@
+require 'optparse'
+
+module Spec
+  module Runner
+    # Neuters RSpec's option parser.
+    # (RSpec's option parser tries to parse ARGV, which
+    # will fail when running cucumber)
+    class OptionParser < ::OptionParser
+      NEUTERED_RSPEC = Object.new
+      def NEUTERED_RSPEC.method_missing(m, *args); self; end
+      
+      def self.method_added(m)
+        unless @__neutering_rspec
+          @__neutering_rspec = true
+          define_method(m) do |*a|
+            NEUTERED_RSPEC
+          end
+          @__neutering_rspec = false
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 3
     TINY  = 7
-    PATCH = 4 # Set to nil for official release
+    PATCH = 5 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
     STABLE_STRING = [MAJOR, MINOR, TINY].join('.')

data/rails_generators/cucumber/templates/cucumber_environment.rb

@@ -15,7 +15,7 @@ config.action_controller.allow_forgery_protection    = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
-config.gem "cucumber",    :lib => false, :version => ">=<%= Cucumber::VERSION::STABLE_STRING %>"
-config.gem "webrat",      :lib => false, :version => ">=0.4.4"  
-config.gem "rspec",       :lib => false, :version => ">=1.2.6"  
-config.gem "rspec-rails", :lib => false, :version => ">=1.2.6"  
+config.gem "cucumber",    :lib => false,        :version => ">=<%= Cucumber::VERSION::STABLE_STRING %>"
+config.gem "webrat",      :lib => false,        :version => ">=0.4.4"
+config.gem "rspec",       :lib => false,        :version => ">=1.2.6"
+config.gem "rspec-rails", :lib => 'spec/rails', :version => ">=1.2.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.7.4
+  version: 0.3.7.5
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -403,7 +403,7 @@ files:
 - lib/cucumber/rails/rspec.rb
 - lib/cucumber/rails/world.rb
 - lib/cucumber/rake/task.rb
-- lib/cucumber/rspec_option_parser_detector.rb
+- lib/cucumber/rspec_neuter.rb
 - lib/cucumber/step_definition.rb
 - lib/cucumber/step_match.rb
 - lib/cucumber/step_mother.rb

data/lib/cucumber/rspec_option_parser_detector.rb

@@ -1,40 +0,0 @@
-require 'optparse'
-
-module Spec
-  module Runner
-    # Detects if RSpec's option parser is loaded and raises an error
-    # if it is. (RSpec's option parser tries to parse ARGV, which
-    # will fail when running cucumber)
-    class OptionParser < ::OptionParser
-      def self.bail
-        raise <<-EOM
-
-RSpec's 'spec/runner/option_parser' should *not* be loaded when you're running
-Cucumber, but it seems it was loaded anyway. This is *not* a Cucumber bug.
-Some other code is loading more RSpec code than it should. There can be several 
-reasons for this. The most common ones are:
-
-1) Some of your own code does require 'spec'. 
-   Use require 'spec/expectations' instead.
-2) Some of your own code does require 'spec/rails'.
-   Use require 'spec/rails/expectations' instead.
-3) Your Rails app's gem configuration is bad. Use
-   config.gem 'rspec', :lib => false  
-   config.gem 'rspec-rails', :lib => false  
-4) Some other library you're using (indirectly)
-   does require 'spec/runner/option_parser'.
-   Analyze the stack trace below and get rid of it.
-
-          EOM
-      end
-
-      if method_defined?(:options)
-        bail
-      end
-      
-      def self.method_added(*args)
-        bail
-      end
-    end
-  end
-end