aslakhellesoy-cucumber 0.3.11.1 → 0.3.11.3

data/features/support/env.rb

@@ -4,7 +4,7 @@ require 'spec/expectations'
 require 'fileutils'
 require 'forwardable'
 begin
-  require 'spork'
+  gem "spork", ">= 0.5.1" # Ensure correct spork version number to avoid false-negatives.
 rescue Gem::LoadError => ex
   warn "WARNING: #{ex.message} You need to have the spork gem installed to run the DRb feature properly!"
 end

data/gem_tasks/sass.rake

@@ -0,0 +1,4 @@
+desc 'Generate the css for the html formatter from sass'
+task :sass do
+  sh 'sass -t expanded lib/cucumber/formatter/cucumber.sass > lib/cucumber/formatter/cucumber.css'
+end

data/lib/cucumber/cli/drb_client.rb

@@ -3,18 +3,17 @@ require "drb/drb"
 
 module Cucumber
   module Cli
+    class DRbClientError < StandardError
+    end
     # Runs features on a DRB server, originally created with Spork compatibility in mind.
     class DRbClient
       def self.run(args, error_stream, out_stream)
-        begin
-          # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
-          DRb.start_service("druby://localhost:0")
-          feature_server = DRbObject.new_with_uri("druby://127.0.0.1:8990")
-          feature_server.run(args, error_stream, out_stream)
-          true
-        rescue DRb::DRbConnError
-          false
-        end
+        # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
+        DRb.start_service("druby://localhost:0")
+        feature_server = DRbObject.new_with_uri("druby://127.0.0.1:8990")
+        feature_server.run(args, error_stream, out_stream)
+      rescue DRb::DRbConnError
+        raise DRbClientError, "No DRb server is running."
       end
     end
   end

data/lib/cucumber/cli/main.rb

@@ -34,10 +34,10 @@ module Cucumber
       
       def execute!(step_mother)
         if configuration.drb?
-          if DRbClient.run(@args, @error_stream, @out_stream)
-            return false
-          else
-            @error_stream.puts "WARNING: No DRb server is running. Running features locally:"
+          begin
+            return DRbClient.run(@args, @error_stream, @out_stream)
+          rescue DRbClientError => e
+            @error_stream.puts "WARNING: #{e.message} Running features locally:"
             configuration.parse!(@args)
           end
         end

data/lib/cucumber/formatter/cucumber.css

@@ -1,74 +1,127 @@
+
+
 .cucumber {
-  background: black;
-  color: white;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 0.7em;
+  background: white;
   padding: 1em;
 }
-.cucumber .passed {
-  color: #008800;
+.cucumber .stats {
+  margin: 2em;
 }
-.cucumber .undefined {
-  color: #888800;
+.cucumber .summary ul.features li {
+  display: inline;
 }
-.cucumber .pending {
-  color: #888800;
+.cucumber .backtrace {
+  margin-top: 0;
+  margin-bottom: 0;
+  margin-left: 1em;
 }
-.cucumber .failed {
-  color: #880000;
+.cucumber a {
+  text-decoration: none;
+  color: inherit;
 }
-.cucumber .skipped {
-  color: #008888;
+.cucumber a:hover {
+  text-decoration: underline;
 }
-.cucumber .outline {
-  color: #008888;
+.cucumber a:visited {
+  font-weight: normal;
 }
-
-.cucumber .passed_param {
-  font-weight: bold;
-  color: #00ff00;
+.cucumber div.background, .cucumber div.scenario {
+  border: 1px solid;
+  padding: 2px;
+  margin: 4px;
 }
-.cucumber .undefined_param {
-  font-weight: bold;
-  color: #ffff00;
+.cucumber div.background h3, .cucumber div.background h4, .cucumber div.scenario h3, .cucumber div.scenario h4 {
+  padding: 0px;
+  margin: 0px;
 }
-.cucumber .pending_param {
-  font-weight: bold;
-  color: #ffff00;
+.cucumber div.background div.examples, .cucumber div.scenario div.examples {
+  border: 1px solid;
+  padding: 2px;
+  margin: 4px;
 }
-.cucumber .failed_param {
-  font-weight: bold;
-  font-weight: bold;
-  color: #ff0000;
+.cucumber table {
+  border-collapse: collapse;
 }
-.cucumber .skipped_param {
-  font-weight: bold;
-  color: #00ffff;
+.cucumber table td, .cucumber table th {
+  font-size: 0.7em;
+  border: 1px solid #AAAAAA;
 }
-.cucumber .outline_param {
-  font-weight: bold;
-  color: #00ffff;
+.cucumber table td.failed {
+  background: #FFC0CB;
+  color: #8B0000;
 }
-
-.cucumber a {
-  text-decoration: none;
-  color: inherit;
+.cucumber table td.passed {
+  background: #98FB98;
+  color: #001111;
 }
-.cucumber a:hover {
-  text-decoration: underline;
+.cucumber table td.skipped {
+  background: #e0ffff;
+  color: #001111;
 }
-.cucumber a:visited {
-  font-weight: normal;
+.cucumber table td.pending {
+  background: #FFFFE0;
+  color: #111100;
+}
+.cucumber table td.undefined {
+  background: #FFFFE0;
+  color: #111100;
 }
 .cucumber ol {
   list-style: none;
+  margin-left: 0;
+  padding-left: 0;
 }
-.cucumber .stats {
-  margin: 2em;
+.cucumber ol li {
+  margin: 5px 0 5px 5px;
+  padding: 0.3em;
 }
-.cucumber .summary ul.features li {
-  display: inline;
+.cucumber ol li span.param {
+  font-weight: bold;
 }
-.cucumber .backtrace {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-left: 1em;
+.cucumber ol li.failed {
+  border-left: 5px solid #ff0000;
+  border-bottom: 1px solid #ff0000;
+  background: #ffc0cb;
+  color: #8b0000;
+}
+.cucumber ol li.failed span.param {
+  background: !failed_dark;
+}
+.cucumber ol li.passed {
+  border-left: 5px solid #00ff00;
+  border-bottom: 1px solid #00ff00;
+  background: #98fb98;
+  color: #001111;
+}
+.cucumber ol li.passed span.param {
+  background: #00ff00;
+}
+.cucumber ol li.skipped {
+  border-left: 5px solid #00ffff;
+  border-bottom: 1px solid #00ffff;
+  background: #e0ffff;
+  color: #001111;
+}
+.cucumber ol li.skipped span.param {
+  background: #00ffff;
+}
+.cucumber ol li.pending {
+  border-left: 5px solid #ff8000;
+  border-bottom: 1px solid #ff8000;
+  background: #ffff00;
+  color: #2a1b0a;
+}
+.cucumber ol li.pending span.param {
+  background: #ff8000;
+}
+.cucumber ol li.undefined {
+  border-left: 5px solid #ff8000;
+  border-bottom: 1px solid #ff8000;
+  background: #ffff00;
+  color: #2a1b0a;
+}
+.cucumber ol li.undefined span.param {
+  background: #ff8000;
 }

data/lib/cucumber/formatter/cucumber.sass

@@ -1,39 +1,34 @@
 # cucumber.css is generated from cucumber.sass
-# Regenerate with the following command:
-#
-#   sass -t expanded lib/cucumber/formatter/cucumber.sass > lib/cucumber/formatter/cucumber.css
-#
-.cucumber
-  :background black
-  :color white
-  :padding 1em
+# Regenerate with rake sass
 
-  .passed
-    :color green
-  .undefined
-    :color yellow
-  .pending
-    :color yellow
-  .failed
-    :color red
-  .skipped
-    :color cyan
-  .outline
-    :color cyan
-  .param
-    :font-weight bold
+!step_left   = 5px solid
+!step_bottom = 1px solid
 
-  a
-    :text-decoration none
-    :color inherit
+!failed         = #FFC0CB
+!failed_dark    = #FF0000
+!failed_text    = #8B0000
 
-    &:hover
-      :text-decoration underline
-    &:visited
-      :font-weight normal
+!passed         = #98FB98
+!passed_dark    = #00FF00
+!passed_text    = #001111
 
-  ol
-    :list-style none
+!skipped        = #E0FFFF
+!skipped_dark   = #00FFFF
+!skipped_text   = #001111
+
+!pending        = #FFFF00
+!pending_dark   = #FF8000
+!pending_text   = #2A1B0A
+
+!undefined      = #FFFF00
+!undefined_dark = #FF8000
+!undefined_text = #2A1B0A
+
+.cucumber
+  :font-family "Lucida Grande", Helvetica, sans-serif
+  :font-size 0.7em
+  :background white
+  :padding 1em
 
   .stats
     :margin 2em
@@ -47,3 +42,93 @@
     :margin-top 0
     :margin-bottom 0
     :margin-left 1em
+
+  a
+    :text-decoration none
+    :color inherit
+
+    &:hover
+      :text-decoration underline
+    &:visited
+      :font-weight normal
+
+  div.background, div.scenario
+    :border 1px solid 
+    :padding 2px
+    :margin 4px
+    
+    h3, h4
+      :padding 0px
+      :margin 0px
+    div.examples
+      :border 1px solid 
+      :padding 2px
+      :margin 4px
+
+  table
+    :border-collapse collapse
+
+    td, th
+      :font-size 0.7em
+      :border 1px solid #AAAAAA
+    td.failed
+      :background #FFC0CB
+      :color #8B0000
+    td.passed
+      :background #98FB98
+      :color= !passed_text
+    td.skipped
+      :background= !skipped
+      :color= !skipped_text
+    td.pending
+      :background #FFFFE0
+      :color #111100
+    td.undefined
+      :background #FFFFE0
+      :color #111100
+
+  ol
+    :list-style none
+    :margin-left 0
+    :padding-left 0
+  
+    li
+      :margin 5px 0 5px 5px
+      :padding 0.3em
+      span.param
+        :font-weight bold
+    li.failed
+      :border-left= !step_left !failed_dark
+      :border-bottom= !step_bottom !failed_dark
+      :background= !failed
+      :color= !failed_text
+      span.param
+        :background !failed_dark
+    li.passed
+      :border-left= !step_left !passed_dark
+      :border-bottom= !step_bottom !passed_dark
+      :background= !passed
+      :color= !passed_text
+      span.param
+        :background= !passed_dark
+    li.skipped
+      :border-left= !step_left !skipped_dark
+      :border-bottom= !step_bottom !skipped_dark
+      :background= !skipped
+      :color= !skipped_text
+      span.param
+        :background= !skipped_dark
+    li.pending
+      :border-left= !step_left !pending_dark
+      :border-bottom= !step_bottom !pending_dark
+      :background= !pending
+      :color= !pending_text
+      span.param
+        :background= !pending_dark
+    li.undefined
+      :border-left= !step_left !undefined_dark
+      :border-bottom= !step_bottom !undefined_dark
+      :background= !undefined
+      :color= !undefined_text
+      span.param
+        :background= !undefined_dark

data/lib/cucumber/formatter/html.rb

@@ -20,7 +20,7 @@ module Cucumber
       end
       
       def create_builder(io)
-        Builder::XmlMarkup.new(:target => io, :indent => 2)
+        Builder::XmlMarkup.new(:target => io, :indent => 0)
       end
       
       def visit_features(features)

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/templates/spork_env.rb

@@ -3,7 +3,7 @@ require 'spork'
  
 Spork.prefork do
   # Sets up the Rails environment for Cucumber
-  ENV["RAILS_ENV"] ||= "cucumber"
+  ENV["RAILS_ENV"] = "cucumber"
   require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
  
   require 'webrat'

data/spec/cucumber/cli/drb_client_spec.rb

@@ -28,13 +28,14 @@ module Cucumber
         DRbClient.run(@args, @error_stream, @out_stream)
       end
 
-      it "returns false when it can't connect to the server" do
+      it "returns raises an error when it can't connect to the server" do
         DRbObject.stub!(:new_with_uri).and_raise(DRb::DRbConnError)
-        DRbClient.run(@args, @error_stream, @out_stream).should be_false
+        running { DRbClient.run(@args, @error_stream, @out_stream) }.should raise_error(DRbClientError, "No DRb server is running.")
       end
 
-      it "returns true when it connects to the server and runs the features" do
-        DRbClient.run(@args, @error_stream, @out_stream).should be_true
+      it "returns the result from the DRb server call" do
+        @drb_object.should_receive(:run).and_return('foo')
+        DRbClient.run(@args, @error_stream, @out_stream).should == 'foo'
       end
 
     end

data/spec/cucumber/cli/main_spec.rb

@@ -110,6 +110,12 @@ module Cucumber
           @cli.execute!(@step_mother)
         end
 
+        it "returns the result from the DRbClient" do
+          DRbClient.stub!(:run).and_return('foo')
+          @cli.execute!(@step_mother).should == 'foo'
+        end
+
+
         it "ceases execution if the DrbClient is able to perform the execution" do
           DRbClient.stub!(:run).and_return(true)
           @configuration.should_not_receive(:load_language)
@@ -117,11 +123,11 @@ module Cucumber
         end
 
         context "when the DrbClient is unable to perfrom the execution" do
-          before { DRbClient.stub!(:run).and_return(false) }
+          before { DRbClient.stub!(:run).and_raise(DRbClientError.new('error message.')) }
 
           it "alerts the user that execution will be performed locally" do
             @cli.execute!(@step_mother)
-            @err.string.should include("WARNING: No DRb server is running. Running features locally:")
+            @err.string.should include("WARNING: error message. Running features locally:")
           end
 
           it "reparses the configuration since the --drb flag causes the initial parsing to short circuit" do

data/spec/spec_helper.rb

@@ -10,3 +10,5 @@ Cucumber.load_language('en')
 $:.unshift(File.dirname(__FILE__))
 
 ::Term::ANSIColor.coloring = true
+
+alias running lambda

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.11.1
+  version: 0.3.11.3
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 -07:00
+date: 2009-06-07 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -349,6 +349,7 @@ files:
 - gem_tasks/flog.rake
 - gem_tasks/gemspec.rake
 - gem_tasks/rspec.rake
+- gem_tasks/sass.rake
 - gem_tasks/yard.rake
 - lib/autotest/cucumber.rb
 - lib/autotest/cucumber_mixin.rb
@@ -450,11 +451,6 @@ files:
 - spec/cucumber/formatter/ansicolor_spec.rb
 - spec/cucumber/formatter/color_io_spec.rb
 - spec/cucumber/formatter/duration_spec.rb
-- spec/cucumber/formatter/html/cucumber.css
-- spec/cucumber/formatter/html/cucumber.js
-- spec/cucumber/formatter/html/index.html
-- spec/cucumber/formatter/html/jquery-1.3.min.js
-- spec/cucumber/formatter/html/jquery.uitableedit.js
 - spec/cucumber/formatter/progress_spec.rb
 - spec/cucumber/parser/feature_parser_spec.rb
 - spec/cucumber/parser/table_parser_spec.rb
@@ -480,7 +476,7 @@ files:
 - spec/cucumber/world/pending_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://cukes.info
 post_install_message: 
 rdoc_options: 
@@ -505,7 +501,7 @@ requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Executable Feature scenarios
 test_files: []
 

data/spec/cucumber/formatter/html/cucumber.css

@@ -1,37 +0,0 @@
-body {
-  background: #000000;
-  color: #FFFFFF;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 10px;
-}
- 
-td
-{
-  border-color: #FFFFFF;
-  border-width: 0 0.15em 0 0.15em;
-  border-style: solid;
-  padding: 0 0.5em 0 0.5em;
-}
-
-.multiline_table {
-  padding-left: 4em;
-}
- 
-.missing {
-  color: yellow;
-}
-
-.pending {
-  color: yellow;
-}
-
-.passed {
-  color: green;
-}
-
-.failed {
-  color: red;
-}

data/spec/cucumber/formatter/html/cucumber.js

@@ -1,13 +0,0 @@
-jQuery.fn.status = function(s) {
-  this.removeClass('idle').addClass(s);
-  this.next('span.multiline').addClass(s);
-  this.parent().addClass(s);
-  this.parent().parent().children('span.feature').addClass(s);
-}
-
-jQuery.fn.failed = function(message, backtrace) {
-  this.status('failed');
-  var indentedMessage   =   message.replace(/^/gm, '      ');
-  var indentedBacktrace = backtrace.replace(/^/gm, '      ');
-  this.append("\n<span>" + indentedMessage + "</span>").append("\n<span>" + indentedBacktrace + "</span>");
-}

data/spec/cucumber/formatter/html/index.html

@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<title>Cucumber results</title>
-  <link rel="stylesheet" href="cucumber.css" type="text/css" charset="utf-8" />
-	<script type="text/javascript" src="jquery-1.3.min.js"></script>
-	<script type="text/javascript" src="jquery.uitableedit.js"></script>
-	<script type="text/javascript" src="cucumber.js"></script>
-</head>
-
-<body>
-<pre>
-<span><span class="feature">Feature: Sample</span>
-
-<span class="scenario">  Scenario: Missing
-<span id="step_1">    Given missing</span></span>
-
-<span class="scenario">  Scenario: Passing
-<span id="step_2">    Given passing</span><div class="multiline_table"><table>
-  <tr>
-    <td class="passed">1</td>
-    <td class="passed">22</td>
-  </tr>
-  <tr>
-    <td class="failed">4444</td>
-    <td class="failed">333</td>
-  </tr>
-</table></div></span>
-<span class="scenario">  Scenario: Failing
-<span id="step_3">    Given failing</span>
-<span class="multiline">      """
-      Aslak
-      Hellesøy
-      """</span></span></span>
-</pre>
-
-<script type="text/javascript">$('#step_1').failed('error message', "line1\nline2\nline3")</script>
-<script type="text/javascript">$('#step_2').status('pending')</script>
-<script type="text/javascript">$('#step_3').status('passed')</script>
-
-</body>
-</html>