cucumber 0.4.4 → 0.4.5.rc1

data/features/language_help.feature

@@ -6,20 +6,18 @@ Feature: Language help
     When I run cucumber -l pt help
     Then it should pass with
       """
-      | name                | 'Portuguese'                                |
-      | native              | 'português'                                 |
-      | encoding            | 'UTF-8'                                     |
-      | space_after_keyword | 'true'                                      |
-      | feature             | 'Funcionalidade'                            |
-      | background          | 'Contexto'                                  |
-      | scenario            | 'Cenário' / 'Cenario'                       |
-      | scenario_outline    | 'Esquema do Cenário' / 'Esquema do Cenario' |
-      | examples            | 'Exemplos'                                  |
-      | given               | 'Dado'                                      |
-      | when                | 'Quando'                                    |
-      | then                | 'Então' / 'Entao'                           |
-      | and                 | 'E'                                         |
-      | but                 | 'Mas'                                       |
+      | name             | Portuguese                              |
+      | native           | português                               |
+      | feature          | Funcionalidade                          |
+      | background       | Contexto                                |
+      | scenario         | Cenário / Cenario                       |
+      | scenario_outline | Esquema do Cenário / Esquema do Cenario |
+      | examples         | Exemplos                                |
+      | given            | * / Dado                                |
+      | when             | * / Quando                              |
+      | then             | * / Então / Entao                       |
+      | and              | * / E                                   |
+      | but              | * / Mas                                 |
 
       """
   Scenario: List languages

data/features/support/env.rb

@@ -111,7 +111,7 @@ class CucumberWorld
         exec cmd
       end
     end
-    sleep (ENV["RUN_CODE_RUN"] ? 5.0 : 1.0)
+    sleep 1.0
   end
 
   def terminate_background_jobs

data/features/transform.feature

@@ -30,6 +30,10 @@ Feature: transform
       Then /^I should not transform ('\d+') to an Integer$/ do |string|
         string.should be_kind_of(String)
       end
+
+      Then /^I should transform ((?:nothing|'\d+') to an optional Integer)$/ do |integer|
+        integer.should be_nil
+      end
       """
     And a file named "features/support/env.rb" with:
       """
@@ -37,6 +41,10 @@ Feature: transform
         /'(\d+)' to an Integer/.match(step_arg).captures[0].to_i
       end
 
+      Transform /^(?:nothing|'(\d+)') to an optional Integer$/ do |str|
+        str ? str.to_i : nil
+      end
+
       Transform /^'(\d+)' to a Float$/ do |integer_string|
         Transform("'#{integer_string}' to an Integer").to_f
       end
@@ -82,8 +90,11 @@ Feature: transform
 
         Scenario: transform without matches
           Then I should not transform '10' to an Integer
+
+        Scenario: transform with optional arguments not given
+          Then I should transform nothing to an optional Integer
       """
-    When I run cucumber -s features
+    When I run cucumber --backtrace -s features
     Then it should pass with
       """
       Feature: Step argument transformations
@@ -106,8 +117,11 @@ Feature: transform
         Scenario: transform without matches
           Then I should not transform '10' to an Integer
 
-      6 scenarios (6 passed)
-      6 steps (6 passed)
+        Scenario: transform with optional arguments not given
+          Then I should transform nothing to an optional Integer
+
+      7 scenarios (7 passed)
+      7 steps (7 passed)
     
       """
 

data/gem_tasks/features.rake

@@ -3,7 +3,9 @@ require 'cucumber/rake/task'
 require 'cucumber/platform'
 
 Cucumber::Rake::Task.new do |t|
-  if(Cucumber::JRUBY)
+  if(ENV["RUN_CODE_RUN"])
+    t.profile = 'run_code_run'
+  elsif(Cucumber::JRUBY)
     t.profile = 'jruby'
   elsif(Cucumber::WINDOWS_MRI)
     t.profile = 'windows_mri'

data/lib/cucumber/ast/scenario_outline.rb

@@ -73,7 +73,7 @@ module Cucumber
 
       def visit_scenario_name(visitor, row)
         visitor.visit_scenario_name(
-          @feature.language.scenario_keyword,
+          @feature.language.scenario_keywords[0] + ":",
           row.name, 
           file_colon_line(row.line), 
           source_indent(first_line_length)

data/lib/cucumber/ast/step_invocation.rb

@@ -106,7 +106,7 @@ module Cucumber
 
       def filter_backtrace(e)
         return e if Cucumber.use_full_backtrace
-        pwd = /#{Dir.pwd}\//m
+        pwd = /#{Regexp.escape(Dir.pwd)}\//m
         (e.backtrace || []).each{|line| line.gsub!(pwd, "./")}
         
         filtered = (e.backtrace || []).reject do |line|
@@ -142,7 +142,7 @@ module Cucumber
       end
 
       def actual_keyword
-        repeat_keywords = [language.but_keywords, language.and_keywords].flatten
+        repeat_keywords = [language.but_keywords(false), language.and_keywords(false)].flatten
         if repeat_keywords.index(@step.keyword) && previous
           previous.actual_keyword
         else

data/lib/cucumber/cli/configuration.rb

@@ -130,25 +130,10 @@ module Cucumber
         return [Formatter::Pretty.new(step_mother, nil, @options)] if @options[:autoformat]
         @options[:formats].map do |format_and_out|
           format = format_and_out[0]
-          out    = format_and_out[1]
-          if String === out # file name
-            unless File.directory?(out)
-              out = File.open(out, Cucumber.file_mode('w'))
-              at_exit do
-                
-                # Since Spork "never" actually exits, I want to flush and close earlier...
-                unless out.closed?
-                  out.flush
-                  out.close
-                end
-                
-              end
-            end
-          end
-
+          path_or_io = format_and_out[1]
           begin
             formatter_class = formatter_class(format)
-            formatter_class.new(step_mother, out, @options)
+            formatter_class.new(step_mother, path_or_io, @options)
           rescue Exception => e
             e.message << "\nError creating formatter: #{format}"
             raise e

data/lib/cucumber/cli/language_help_formatter.rb

@@ -31,7 +31,7 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
         def list_keywords(io, lang)
           language = Parser::NaturalLanguage.get(nil, lang)
           raw = Parser::NaturalLanguage::KEYWORD_KEYS.map do |key|
-            [key, language.keywords(key)]
+            [key, language.keywords(key).join(" / ")]
           end
           
           print_table io, raw, :incomplete => language.incomplete?

data/lib/cucumber/cli/options.rb

@@ -101,7 +101,7 @@ module Cucumber
             "Examples:",
             "cucumber examples/i18n/en/features",
             "cucumber @features.txt (See --format rerun)",
-            "cucumber --language it examples/i18n/it/features/somma.feature:6:98:113",
+            "cucumber examples/i18n/it/features/somma.feature:6:98:113",
             "cucumber -s -i http://rubyurl.com/eeCl", "", "",
           ].join("\n")
           opts.on("-r LIBRARY|DIR", "--require LIBRARY|DIR",
@@ -115,15 +115,16 @@ module Cucumber
             "This option can be specified multiple times.") do |v|
             @options[:require] << v
           end
-          opts.on("-l LANG", "--language LANG",
+          opts.on("-l LANG", "--language LANG (DEPRECATED)",
             "Specify language for features (Default: #{@options[:lang]})",
             %{Run with "--language help" to see all languages},
             %{Run with "--language LANG help" to list keywords for LANG}) do |v|
             if v == 'help'
               list_languages_and_exit
-            elsif args==['help'] # I think this conditional is just cruft and can be removed
+            elsif args==['help']
               list_keywords_and_exit(v)
             else
+              warn("\nWARNING: --language is deprecated and will be removed in version 0.5.\nSee http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages")
               @options[:lang] = v
             end
           end
@@ -188,7 +189,7 @@ module Cucumber
             @options[:dry_run] = true
             @options[:snippets] = false
           end
-          opts.on("-a", "--autoformat DIRECTORY",
+          opts.on("-a", "--autoformat DIR",
             "Reformats (pretty prints) feature files and write them to DIRECTORY.",
             "Be careful if you choose to overwrite the originals.",
             "Implies --dry-run --formatter pretty.") do |directory|

data/lib/cucumber/formatter/cucumber.css

@@ -1,132 +1,248 @@
+/* cucumber.css is generated from cucumber.sass */
+/* Regenerate with rake sass */
+body {
+  font-size: 0px;
+  color: #FFFFFF;
+  margin: 0px;
+  padding: 0px;
+}
 
-
-.cucumber {
-  font-family: "Lucida Grande", Helvetica, sans-serif;
-  font-size: 0.7em;
+.cucumber, td, th {
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
   background: white;
-  padding: 1em;
+  color: #000000;
+}
+.cucumber #cucumber-header, td #cucumber-header, th #cucumber-header {
+  background: #65C400;
+  color: #FFFFFF;
+  height: 5em;
+}
+.cucumber .scenario h3, td .scenario h3, th .scenario h3 {
+  font-size: 11px;
+  padding: 3px;
+  margin: 0;
+  background: #65C400;
+  color: #FFFFFF;
+  font-weight: bold;
 }
-.cucumber h1, .cucumber h2, .cucumber h3, .cucumber h4, .cucumber ol, .cucumber li, .cucumber pre, .cucumber p {
-  font-size: 1em;
-  padding: 0px;
-  margin: 0px;
+.cucumber h1, td h1, th h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+  position: absolute;
 }
-.cucumber div.feature {
-  border: 1px solid;
-  padding: 2px;
-  margin: 4px;
+.cucumber h4, td h4, th h4 {
+  margin-bottom: 2px;
 }
-.cucumber div.feature div.background, .cucumber div.feature div.scenario, .cucumber div.feature p {
-  padding: 0em 0em 0em 1em;
+.cucumber div.feature, td div.feature, th div.feature {
+  padding: 2px;
+  margin: 0px 10px 5px 10px;
 }
-.cucumber div.feature div.background div.examples, .cucumber div.feature div.scenario div.examples, .cucumber div.feature p div.examples {
+.cucumber div.examples, td div.examples, th div.examples {
   padding: 0em 0em 0em 1em;
 }
-.cucumber .stats {
+.cucumber .stats, td .stats, th .stats {
   margin: 2em;
 }
-.cucumber .summary ul.features li {
+.cucumber .summary ul.features li, td .summary ul.features li, th .summary ul.features li {
   display: inline;
 }
-.cucumber .backtrace {
+.cucumber .tag, td .tag, th .tag {
+  font-weight: bold;
+  color: #246AC1;
+}
+.cucumber .backtrace, td .backtrace, th .backtrace {
   margin-top: 0;
   margin-bottom: 0;
   margin-left: 1em;
+  color: #000000;
 }
-.cucumber a {
+.cucumber a, td a, th a {
   text-decoration: none;
-  color: inherit;
+  color: #BE5C00;
 }
-.cucumber a:hover {
+.cucumber a:hover, td a:hover, th a:hover {
   text-decoration: underline;
 }
-.cucumber a:visited {
+.cucumber a:visited, td a:visited, th a:visited {
   font-weight: normal;
 }
-.cucumber a div.examples {
-  border: 1px solid;
-  padding: 2px;
-  margin: 4px;
+.cucumber a div.examples, td a div.examples, th a div.examples {
+  margin: 5px 0px 5px 15px;
+  color: #000000;
 }
-.cucumber table {
+.cucumber .outline table, td .outline table, th .outline table {
+  margin: 0px 0px 5px 10px;
+}
+.cucumber table, td table, th table {
   border-collapse: collapse;
 }
-.cucumber table td, .cucumber table th {
-  font-size: 0.7em;
-  border: 1px solid #AAAAAA;
+.cucumber table td, td table td, th table td {
+  padding: 3px 3px 3px 5px;
 }
-.cucumber table td.failed {
-  background: #FFC0CB;
-  color: #8B0000;
+.cucumber table td.failed, .cucumber table td.passed, .cucumber table td.skipped, .cucumber table td.pending, .cucumber table td.undefined, td table td.failed, td table td.passed, td table td.skipped, td table td.pending, td table td.undefined, th table td.failed, th table td.passed, th table td.skipped, th table td.pending, th table td.undefined {
+  padding-left: 18px;
+  padding-right: 10px;
 }
-.cucumber table td.passed {
-  background: #98FB98;
-  color: #001111;
+.cucumber table td.failed, td table td.failed, th table td.failed {
+  border-left: 5px solid #c20000;
+  border-bottom: 1px solid #c20000;
+  background: #fffbd3;
+  color: #c20000;
+}
+.cucumber table td.passed, td table td.passed, th table td.passed {
+  border-left: 5px solid #65c400;
+  border-bottom: 1px solid #65c400;
+  background: #dbffb4;
+  color: #3d7700;
 }
-.cucumber table td.skipped {
+.cucumber table td.skipped, td table td.skipped, th table td.skipped {
+  border-left: 5px solid aqua;
+  border-bottom: 1px solid aqua;
   background: #e0ffff;
   color: #001111;
 }
-.cucumber table td.pending {
-  background: #FFFFE0;
-  color: #111100;
+.cucumber table td.pending, td table td.pending, th table td.pending {
+  border-left: 5px solid #faf834;
+  border-bottom: 1px solid #faf834;
+  background: #fcfb98;
+  color: #131313;
 }
-.cucumber table td.undefined {
-  background: #FFFFE0;
-  color: #111100;
+.cucumber table td.undefined, td table td.undefined, th table td.undefined {
+  border-left: 5px solid #faf834;
+  border-bottom: 1px solid #faf834;
+  background: #fcfb98;
+  color: #131313;
 }
-.cucumber ol {
+.cucumber ol, td ol, th ol {
   list-style: none;
+  margin: 0px;
+  padding: 0px;
+}
+.cucumber ol li.step, td ol li.step, th ol li.step {
+  padding: 3px 3px 3px 18px;
+  margin: 5px 0px 5px 5px;
 }
-.cucumber ol li {
+.cucumber ol li, td ol li, th ol li {
   margin: 0em 0em 0em 1em;
   padding: 0em 0em 0em 0.2em;
 }
-.cucumber ol li span.param {
+.cucumber ol li span.param, td ol li span.param, th ol li span.param {
   font-weight: bold;
 }
-.cucumber ol li.failed {
-  border-left: 5px solid #ff0000;
-  border-bottom: 1px solid #ff0000;
-  background: #ffc0cb;
-  color: #8b0000;
+.cucumber ol li.failed, td ol li.failed, th ol li.failed {
+  border-left: 5px solid #c20000;
+  border-bottom: 1px solid #c20000;
+  background: #fffbd3;
+  color: #c20000;
+}
+.cucumber ol li.passed, td ol li.passed, th ol li.passed {
+  border-left: 5px solid #65c400;
+  border-bottom: 1px solid #65c400;
+  background: #dbffb4;
+  color: #3d7700;
+}
+.cucumber ol li.skipped, td ol li.skipped, th ol li.skipped {
+  border-left: 5px solid aqua;
+  border-bottom: 1px solid aqua;
+  background: #e0ffff;
+  color: #001111;
 }
-.cucumber ol li.failed span.param {
-  background: !failed_dark;
+.cucumber ol li.pending, td ol li.pending, th ol li.pending {
+  border-left: 5px solid #faf834;
+  border-bottom: 1px solid #faf834;
+  background: #fcfb98;
+  color: #131313;
 }
-.cucumber ol li.passed {
-  border-left: 5px solid #00ff00;
-  border-bottom: 1px solid #00ff00;
-  background: #98fb98;
-  color: #001111;
+.cucumber ol li.undefined, td ol li.undefined, th ol li.undefined {
+  border-left: 5px solid #faf834;
+  border-bottom: 1px solid #faf834;
+  background: #fcfb98;
+  color: #131313;
 }
-.cucumber ol li.passed span.param {
-  background: #00ff00;
+.cucumber #summary, td #summary, th #summary {
+  margin: 0px;
+  padding: 5px 10px;
+  text-align: right;
+  top: 0px;
+  right: 0px;
+  float: right;
 }
-.cucumber ol li.skipped {
-  border-left: 5px solid #00ffff;
-  border-bottom: 1px solid #00ffff;
-  background: #e0ffff;
-  color: #001111;
+.cucumber #summary p, td #summary p, th #summary p {
+  margin: 0 0 0 2px;
+}
+.cucumber #summary #totals, td #summary #totals, th #summary #totals {
+  font-size: 1.2em;
+}
+
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background: black;
+  padding: 0.1em 0 0.2em 0;
+}
+.ruby .keyword {
+  color: #FF6600;
+}
+.ruby .constant {
+  color: #339999;
+}
+.ruby .attribute {
+  color: white;
+}
+.ruby .global {
+  color: white;
+}
+.ruby .module {
+  color: white;
+}
+.ruby .class {
+  color: white;
+}
+.ruby .string {
+  color: #66FF00;
+}
+.ruby .ident {
+  color: white;
+}
+.ruby .method {
+  color: #FFCC00;
+}
+.ruby .number {
+  color: white;
+}
+.ruby .char {
+  color: white;
+}
+.ruby .comment {
+  color: #9933CC;
+}
+.ruby .symbol {
+  color: white;
+}
+.ruby .regex {
+  color: #44B4CC;
+}
+.ruby .punct {
+  color: white;
 }
-.cucumber ol li.skipped span.param {
-  background: #00ffff;
+.ruby .escape {
+  color: white;
 }
-.cucumber ol li.pending {
-  border-left: 5px solid #ff8000;
-  border-bottom: 1px solid #ff8000;
-  background: #ffff00;
-  color: #2a1b0a;
+.ruby .interp {
+  color: white;
 }
-.cucumber ol li.pending span.param {
-  background: #ff8000;
+.ruby .expr {
+  color: white;
 }
-.cucumber ol li.undefined {
-  border-left: 5px solid #ff8000;
-  border-bottom: 1px solid #ff8000;
-  background: #ffff00;
-  color: #2a1b0a;
+.ruby .offending {
+  background: #333333;
 }
-.cucumber ol li.undefined span.param {
-  background: #ff8000;
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background: #FFFBD3;
 }