aslakhellesoy-cucumber 0.1.99.21 → 0.1.99.22

data/lib/cucumber/ast/tags.rb

@@ -12,14 +12,14 @@ module Cucumber
       end
 
       def among?(tag_names)
-        no_tags, yes_tags = tag_names.partition{|tag| tag =~ /^\!/}
+        no_tags, yes_tags = tag_names.partition{|tag| tag =~ /^~/}
         no_tags = no_tags.map{|tag| tag[1..-1]}
 
         # Strip @
         yes_tags = yes_tags.map{|tag| tag =~ /^@(.*)/ ? $1 : tag}
         no_tags = no_tags.map{|tag| tag =~ /^@(.*)/ ? $1 : tag}
 
-        (@tag_names & yes_tags).any? && (@tag_names & no_tags).empty?
+        (yes_tags.empty? || (@tag_names & yes_tags).any?) && (no_tags.empty? || (@tag_names & no_tags).empty?)
       end
 
       def at_lines?(lines)

data/lib/cucumber/cli/configuration.rb

@@ -49,7 +49,7 @@ module Cucumber
             if v == 'help'
               list_languages
             elsif args==['help']
-              list_keywords(v)
+              list_keywords_and_exit(v)
             else
               @options[:lang] = v
             end
@@ -73,7 +73,7 @@ module Cucumber
           end
           opts.on("-t TAGS", "--tags TAGS", 
             "Only execute the features or scenarios with the specified tags.",
-            "TAGS must be comma-separated without spaces. Prefix tags with ! to",
+            "TAGS must be comma-separated without spaces. Prefix tags with ~ to",
             "exclude features or scenarios having that tag. tags can be specified",
             "with or without the @ prefix.") do |v|
             @options[:tags] = v.split(",")
@@ -134,6 +134,12 @@ module Cucumber
           opts.on("-g", "--guess", "Guess best match for Ambiguous steps.") do
             @options[:guess] = true
           end
+          opts.on("--no-diff", "Disable diff output on failing expectations.") do
+            @options[:diff_enabled] = false
+          end
+          opts.on("-S", "--step-definitions", "Print the regexp and line of all step definitions, then exit.") do
+            @options[:print_step_definitions] = true
+          end
           opts.on_tail("--version", "Show version.") do
             @out_stream.puts VERSION::STRING
             Kernel.exit
@@ -166,14 +172,22 @@ module Cucumber
       end
       
       def guess?
-        !!@options[:guess]
+        @options[:guess]
       end
     
+      def diff_enabled?
+        @options[:diff_enabled]
+      end
+
+      def print_step_definitions?
+        @options[:print_step_definitions]
+      end
+
       def load_language
-        Cucumber.load_language(@options[:lang])
-      
-        if Cucumber.language_incomplete?
-          list_keywords(Cucumber.lang)
+        if Cucumber.language_incomplete?(@options[:lang])
+          list_keywords_and_exit(@options[:lang])
+        else
+          Cucumber.load_language(@options[:lang])
         end
       end
     
@@ -219,7 +233,9 @@ module Cucumber
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           File.directory?(path) ? Dir["#{path}/**/*.rb"] : path
         end.flatten.uniq
-        files.sort { |a,b| (b =~ %r{/support/} || -1) <=>  (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
+        sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=>  (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
+        env_files = sorted_files.select {|f| f =~ %r{/support/env.rb} }
+        env_files + sorted_files.reject {|f| f =~ %r{/support/env.rb} }
       end
     
       def feature_files
@@ -299,7 +315,7 @@ Defined profiles in cucumber.yml:
         return @cucumber_yml
       end
     
-      def list_keywords(lang)
+      def list_keywords_and_exit(lang)
         unless Cucumber::LANGUAGES[lang]
           exit_with_error("No language with key #{lang}")
         end
@@ -321,7 +337,8 @@ Defined profiles in cucumber.yml:
           :formats  => {},
           :excludes => [],
           :tags     => [],
-          :scenario_names => []
+          :scenario_names => [],
+          :diff_enabled => true
         }
       end
     
@@ -336,4 +353,4 @@ Defined profiles in cucumber.yml:
     end
   
   end
-end
+end

data/lib/cucumber/cli/language_help_formatter.rb

@@ -48,7 +48,7 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
           end
           status = :comment 
         elsif @incomplete
-          status = :failed
+          status = :undefined
         end
         
         @col += 1

data/lib/cucumber/cli/main.rb

@@ -32,6 +32,13 @@ module Cucumber
         step_mother.options = configuration.options
 
         require_files
+
+        if(configuration.print_step_definitions?)
+          step_mother.print_step_definitions(@out_stream)
+          Kernel.exit(0)
+          return # In specs, exit is stubbed
+        end
+        
         enable_diffing
       
         features = load_plain_text_features
@@ -86,7 +93,7 @@ module Cucumber
       end
 
       def enable_diffing
-        if defined?(::Spec)
+        if configuration.diff_enabled? && defined?(::Spec)
           require 'spec/expectations/differs/default'
           options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
           ::Spec::Expectations.differ = ::Spec::Expectations::Differs::Default.new(options)

data/lib/cucumber/formatter/color_io.rb

@@ -12,6 +12,12 @@ module Cucumber
         @kernel = Kernel
         @stdout = STDOUT
       end
+
+      # Ensure using << still gets colours in win32console
+      def <<(output)
+        print(output)
+        self
+      end
     end
   end
 end

data/lib/cucumber/languages.yml

@@ -161,10 +161,11 @@
   native: français
   encoding: UTF-8
   feature: Fonctionnalité
+  background: Contexte
   scenario: Scénario
-  scenario_outline: Scénario esquisse
+  scenario_outline: Plan du Scénario
   examples: Exemples
-  given: Etant donné
+  given: Soit
   when: Lorsque
   then: Alors
   and: Et
@@ -197,10 +198,12 @@
 "ja":
   name: Japanese
   native: 日本語
-  encoding: Shift_JIS
+  encoding: UTF-8
   feature: フィーチャ
+  background: 背景
   scenario: シナリオ
-  more_examples: 他のサンプル
+  scenario_outline: シナリオテンプレート|テンプレ|シナリオテンプレ
+  examples: 例|サンプル
   given: 前提
   when: もし
   then: ならば
@@ -292,15 +295,18 @@
   but: Dar
 "ru":
   name: Russian
-  native: русский язык
+  native: русский
   encoding: UTF-8
   feature: Функционал
+  background: Предыстория
   scenario: Сценарий
-  given: Сначала
+  scenario_outline: Структура сценария
+  examples: Значения
+  given: Допустим
   when: Если
   then: То
-  and: И
-  but: Но
+  and: И|К тому же
+  but: Но|А
 "se":
   name: Swedish
   native: Svenska
@@ -317,21 +323,42 @@
   but: Men
 "zh-CN":
   name: Chinese simplified
-  native: 中文
+  native: 简体中文
   encoding: UTF-8
   feature: 功能
+  background: 背景
   scenario: 场景
+  scenario_outline: 场景大纲
+  examples: 例子
   given: 假如
   when: 当
   then: 那么
   and: 而且
   but: 但是
+"zh-TW":
+  name: Chinese traditional
+  native: 繁體中文
+  encoding: UTF-8
+  feature: 功能
+  background: 背景
+  scenario: 場景|劇本
+  scenario_outline: 場景大綱|劇本大綱
+  examples: 例子
+  given: 假設
+  when: 當
+  then: 那麼
+  and: 而且|並且
+  but: 但是
 "ko":
   name: Korean
   native: 한국어
   encoding: UTF-8
+  background: 배경
   feature: 기능
-  scenario: 예
+  scenario: 시나리오
+  scenario_outline: 시나리오 개요
+  examples: 예
+  more_examples: 다른 예
   given: 조건
   when: 만일
   then: 그러면

data/lib/cucumber/parser/feature.rb

@@ -311,7 +311,7 @@ module Cucumber
         if r1
           s2, i2 = [], index
           loop do
-            if input.index(Regexp.new('[a-z0-9]'), index) == index
+            if input.index(Regexp.new('[^@\\n\\t ]'), index) == index
               r3 = (SyntaxNode).new(input, index...(index + 1))
               @index += 1
             else

data/lib/cucumber/parser/feature.tt

@@ -40,7 +40,7 @@ module Cucumber
       end
 
       rule tag
-        '@' tag_name:([a-z0-9])+
+        '@' tag_name:([^@\n\t ])+
       end
 
       rule comment

data/lib/cucumber/rake/task.rb

@@ -2,21 +2,54 @@ require 'cucumber/platform'
 
 module Cucumber
   module Rake
-    # Defines a task for running features.
+    # Defines a Rake task for running features.
+    #
+    # The simplest use of it goes something like:
+    #
+    #   Cucumber::Rake::Task.new
+    #
+    # This will create a task named 'features' described as 'Run Features with 
+    # Cucumber'. It will use steps from 'features/**/*.rb' and features in 'features/**/*.feature'.
+    #
+    # To further configure the task, you can pass a block:
+    #
+    #   Cucumber::Rake::Task.new do |t|
+    #     t.libs << 'lib'
+    #     t.cucumber_opts = "--format progress"
+    #   end
+    #
+    # This task can also be configured to be run with RCov:
+    #
+    #   Cucumber::Rake::Task.new do |t|
+    #     t.rcov = true
+    #   end
+    # 
+    # See the attributes for additional configuration possibilities.
     class Task
-      LIB    = File.expand_path(File.dirname(__FILE__) + '/../..')
+      LIB    = File.expand_path(File.dirname(__FILE__) + '/../..') # :nodoc:
 
+      # Directories to add to the load path
       attr_accessor :libs
+      # Name of the cucumber binary to use for running features. Defaults to Cucumber::BINARY
       attr_accessor :binary
+      # Array of paths to specific steps to use
       attr_accessor :step_list
+      # File pattern for finding step definitions. Defaults to 
+      # 'features/**/*.rb'. Can be overriden by the SPEC environment variable.
       attr_accessor :step_pattern
+      # Array of paths to specific features to run. 
       attr_accessor :feature_list
+      # File pattern for finding features to run. Defaults to 
+      # 'features/**/*.feature'. Can be overriden by the FEATURE environment variable.
       attr_accessor :feature_pattern
+      # Extra options to pass to the cucumber binary. Can be overridden by the CUCUMBER_OPTS environment variable.
       attr_accessor :cucumber_opts
+      # Run cucumber with RCov?
       attr_accessor :rcov
+      # Extra options to pass to rcov
       attr_accessor :rcov_opts
 
-      # Define a task
+      # Define a Rake
       def initialize(task_name = "features", desc = "Run Features with Cucumber")
         @task_name, @desc = task_name, desc
         @libs = []
@@ -33,14 +66,14 @@ module Cucumber
         define_task
       end
 
-      def define_task
+      def define_task # :nodoc:
         desc @desc
         task @task_name do
           ruby(arguments_for_ruby_execution.join(" ")) # ruby(*args) is broken on Windows
         end
       end
 
-      def arguments_for_ruby_execution(task_args = nil)
+      def arguments_for_ruby_execution(task_args = nil) # :nodoc:
         lib_args     = ['"%s"' % libs.join(File::PATH_SEPARATOR)]
         cucumber_bin = ['"%s"' % binary]
         cuc_opts     = [(ENV['CUCUMBER_OPTS'] || cucumber_opts)]
@@ -89,7 +122,7 @@ module Cucumber
         super(task_name, desc)
       end
 
-      def define_task
+      def define_task # :nodoc:
         desc @desc
         task @task_name, :feature_name do |t, args|
           ruby(arguments_for_ruby_execution(args).join(" ")) # ruby(*args) is broken on Windows

data/lib/cucumber/step_definition.rb

@@ -83,5 +83,12 @@ module Cucumber
       @proc.file_colon_line
     end
 
+    def text_length
+      @regexp.inspect.jlength
+    end
+
+    def to_s(indent = 0)
+      @regexp.inspect + (' # ').indent(indent) + file_colon_line
+    end
   end
 end

data/lib/cucumber/step_mother.rb

@@ -136,9 +136,20 @@ module Cucumber
     def snippet_text(step_keyword, step_name)
       @snippet_generator.snippet_text(step_keyword, step_name)
     end
+    
+    def print_step_definitions(out)
+      step_definitions.each do |step_definition|
+        indent = max_step_definition_length - step_definition.text_length
+        out.puts(step_definition.to_s(indent))
+      end
+    end
 
     private
-    
+
+    def max_step_definition_length
+      @max_step_definition_length ||= step_definitions.map{|step_definition| step_definition.text_length}.max
+    end
+
     def options
       @options || {}
     end

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/cucumber_generator.rb

@@ -4,13 +4,16 @@ require 'rbconfig'
 class CucumberGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
+
+  attr_accessor :framework
+
   def manifest
     record do |m|
       m.directory 'features/step_definitions'
-      m.file      'webrat_steps.rb', 'features/step_definitions/webrat_steps.rb'
+      m.template  'webrat_steps.rb', 'features/step_definitions/webrat_steps.rb'
 
       m.directory 'features/support'
-      m.file      'env.rb',           'features/support/env.rb'
+      m.template  'env.rb',           'features/support/env.rb'
       m.file      'paths.rb',         'features/support/paths.rb'
 
       m.directory 'lib/tasks'
@@ -22,10 +25,26 @@ class CucumberGenerator < Rails::Generator::Base
     end
   end
 
+  def framework
+    options[:framework] || :rspec
+  end
+
 protected
 
   def banner
     "Usage: #{$0} cucumber"
   end
 
-end
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on('--rspec', 'Setup cucumber for use with RSpec (default)') do |value|
+      options[:framework] = :rspec
+    end
+
+    opt.on('--testunit', 'Setup cucumber for use with test/unit') do |value|
+      options[:framework] = :testunit
+    end
+  end
+
+end

data/rails_generators/cucumber/templates/cucumber.rake

@@ -1,7 +1,15 @@
-$:.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
-require 'cucumber/rake/task'
+$LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
 
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty"
+begin
+  require 'cucumber/rake/task'
+
+  Cucumber::Rake::Task.new(:features) do |t|
+    t.cucumber_opts = "--format pretty"
+  end
+  task :features => 'db:test:prepare'
+rescue LoadError
+  desc 'Cucumber rake task not available'
+  task :features do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
 end
-task :features => 'db:test:prepare'

data/rails_generators/cucumber/templates/env.rb

@@ -10,7 +10,8 @@ require 'webrat'
 Webrat.configure do |config|
   config.mode = :rails
 end
+<% if framework == :rspec -%>
 
-# Comment out the next two lines if you're not using RSpec's matchers (should / should_not) in your steps.
 require 'cucumber/rails/rspec'
 require 'webrat/core/matchers'
+<% end -%>

data/rails_generators/cucumber/templates/paths.rb

@@ -1,12 +1,19 @@
-def path_to(page_name)
-  case page_name
-  
-  when /the homepage/i
-    root_path
-  
-  # Add more page name => path mappings here
-  
-  else
-    raise "Can't find mapping from \"#{page_name}\" to a path."
+module NavigationHelpers
+  def path_to(page_name)
+    case page_name
+    
+    when /the homepage/i
+      root_path
+    
+    # Add more page name => path mappings here
+    
+    else
+      raise "Can't find mapping from \"#{page_name}\" to a path."
+    end
   end
-end
+end
+
+World do |world|
+  world.extend NavigationHelpers
+  world
+end

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -3,6 +3,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "pat
 # Commonly used webrat steps
 # http://github.com/brynary/webrat
 
+Given /^I am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
 When /^I go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
@@ -31,10 +35,10 @@ end
 
 # Use this step when using multiple datetime_select helpers on a page or 
 # you want to specify which datetime to select. Given the following view:
-#   <%= f.label :preferred %><br />
-#   <%= f.datetime_select :preferred %>
-#   <%= f.label :alternative %><br />
-#   <%= f.datetime_select :alternative %>
+#   <%%= f.label :preferred %><br />
+#   <%%= f.datetime_select :preferred %>
+#   <%%= f.label :alternative %><br />
+#   <%%= f.datetime_select :alternative %>
 # The following steps would fill out the form:
 # When I select "November 23, 2004 11:20" as the "Preferred" data and time
 # And I select "November 25, 2004 10:30" as the "Alternative" data and time
@@ -42,7 +46,7 @@ When /^I select "(.*)" as the "(.*)" date and time$/ do |datetime, datetime_labe
   select_datetime(datetime, :from => datetime_label)
 end
 
-# Use this step in conjuction with Rail's time_select helper. For example:
+# Use this step in conjunction with Rail's time_select helper. For example:
 # When I select "2:20PM" as the time
 # Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
 # will convert the 2:20PM to 14:20 and then select it. 
@@ -57,7 +61,7 @@ When /^I select "(.*)" as the "(.*)" time$/ do |time, time_label|
   select_time(time, :from => time_label)
 end
 
-# Use this step in conjuction with Rail's date_select helper.  For example:
+# Use this step in conjunction with Rail's date_select helper.  For example:
 # When I select "February 20, 1981" as the date
 When /^I select "(.*)" as the date$/ do |date|
   select_date(date)
@@ -82,18 +86,30 @@ When /^I choose "(.*)"$/ do |field|
   choose(field)
 end
 
-When /^I attach the file at "(.*)" to "(.*)" $/ do |path, field|
+When /^I attach the file at "(.*)" to "(.*)"$/ do |path, field|
   attach_file(field, path)
 end
 
 Then /^I should see "(.*)"$/ do |text|
+<% if framework == :rspec -%>
   response.should contain(text)
+<% else -%>
+  assert_contain text
+<% end -%>
 end
 
 Then /^I should not see "(.*)"$/ do |text|
+<% if framework == :rspec -%>
   response.should_not contain(text)
+<% else -%>
+  assert_not_contain text
+<% end -%>
 end
 
 Then /^the "(.*)" checkbox should be checked$/ do |label|
+<% if framework == :rspec -%>
   field_labeled(label).should be_checked
+<% else -%>
+  assert field_labeled(label).checked?
+<% end -%>
 end

data/spec/cucumber/ast/table_spec.rb

@@ -6,7 +6,7 @@ module Cucumber
     describe Table do
       before do
         @table = Table.new([
-          %w{1 22 333},
+          %w{one four seven},
           %w{4444 55555 666666}
         ])
         @table.extend(Module.new{
@@ -17,11 +17,11 @@ module Cucumber
       end
 
       it "should have rows" do
-        @table.cells_rows[0].map{|cell| cell.value}.should == %w{1 22 333}
+        @table.cells_rows[0].map{|cell| cell.value}.should == %w{one four seven}
       end
 
       it "should have columns" do
-        @table.columns[1].map{|cell| cell.value}.should == %w{22 55555}
+        @table.columns[1].map{|cell| cell.value}.should == %w{four 55555}
       end
 
       it "should have same cell objects in rows and columns" do
@@ -35,10 +35,31 @@ module Cucumber
 
       it "should be convertible to an array of hashes" do
         @table.hashes.should == [
-          {'1' => '4444', '22' => '55555', '333' => '666666'}
+          {'one' => '4444', 'four' => '55555', 'seven' => '666666'}
         ]
       end
 
+      it "should accept symbols as keys for the hashes" do
+        @table.hashes.first[:one].should == '4444'
+      end
+
+      it "should allow map'ing columns" do
+        @table.map_column!('one') { |v| v.to_i }
+        @table.hashes.first['one'].should == 4444
+      end
+
+      it "should pass silently if a mapped column does not exist in non-strict mode" do
+        lambda {
+          @table.map_column!('two', false) { |v| v.to_i }
+        }.should_not raise_error
+      end
+
+      it "should fail if a mapped column does not exist in strict mode" do
+        lambda {
+          @table.map_column!('two', true) { |v| v.to_i }
+        }.should raise_error('The column named "two" does not exist')
+      end
+
       describe "replacing arguments" do
 
         before(:each) do
@@ -54,10 +75,16 @@ module Cucumber
           table_with_replaced_args.hashes[0]['book'].should == 'Unbearable lightness of being'
           table_with_replaced_args.hashes[0]['qty'].should == '5'
         end
-      
+
+        it "should replace nil values with nil" do
+          table_with_replaced_args = @table.arguments_replaced({'<book>' => nil})
+
+          table_with_replaced_args.hashes[0]['book'].should == nil
+        end
+
         it "should not change the original table" do
           table_with_replaced_args = @table.arguments_replaced({'<book>' => 'Unbearable lightness of being'})
-          
+
           @table.hashes[0]['book'].should_not == 'Unbearable lightness of being'
         end
 
@@ -67,9 +94,9 @@ module Cucumber
         @table.to_sexp.should == 
           [:table, 
             [:row, 
-              [:cell, "1"], 
-              [:cell, "22"],
-              [:cell, "333"]
+              [:cell, "one"], 
+              [:cell, "four"],
+              [:cell, "seven"]
             ],
             [:row, 
               [:cell, "4444"],