aslakhellesoy-cucumber 0.2.2.1 → 0.2.2.2

data/History.txt

@@ -1,6 +1,11 @@
 == 0.2.3 (In Git)
 
 === New features
+* Added new Then /^I should be on (.+)$/ do |page_name| step (Grant Hollingworth)
+* Use skipped_param color for examples table header (#266 Eugene Naydanov)
+* Added new Cucumber::Ast::Table#rows_hash method (Torbjørn Vatn)
+* Windows/JRuby users can now enjoy colourful output (via http://aslakhellesoy.github.com/ansicolor) (Aslak Hellesøy)
+* Ambiguous step errors hint about --guess (unless --guess already on) (Aslak Hellesøy)
 * Updated language for Dutch (Bart Zonneveld)
 * Updated language for Italian (Alessandro Baroni)
 * Updated language for Japanese (KAKUTANI Shintaro)
@@ -72,7 +77,7 @@ for multiline arguments are some of the highlights.
 * Can't use an empty string as a table value in a scenario outline (#172 Aslak Hellesøy)
 * Really skip skipped steps (#90 Aslak Hellesøy)
 * No output for multi-line strings (#71 Aslak Hellesøy)
-* Fix cucumber/formatters/unicode flaws on Windows (#145 Michael)
+* Fix cucumber/formatter/unicode flaws on Windows (#145 Michael)
 * Autotest-related Bugs: YAML missing (#136 Tobias Pape)
 * Overeager "rescue LoadError" hides lots of errors (#137 Jonathan del Strother)
 * Nested steps don't show mismatch (#116 Aslak Hellesøy)

data/bin/cucumber

@@ -3,4 +3,4 @@
 $:.unshift(File.dirname(__FILE__ + '.rb') + '/../lib') unless $:.include?(File.dirname(__FILE__ + '.rb') + '/../lib')
 
 require 'cucumber/cli/main'
-Cucumber::Cli::Main.execute(ARGV.dup)
+Cucumber::Cli::Main.execute(ARGV.dup) # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.

data/examples/i18n/Rakefile

@@ -4,14 +4,16 @@ task :i18n do
   Dir["#{dir}/*"].each do |f|
     if File.directory?(f)
       lang = f[dir.length+1..-1]
-      if supported?(lang)
+      if examples_working?(lang)
         Dir.chdir(f) do
           rake("features")
         end
       else
         STDERR.puts %{
 !!!!!
-!!!!! SKIPPING #{lang} (Still needs some work)
+!!!!!
+!!!!! SKIPPING #{lang} (The examples are out of date - please help update them)
+!!!!!
 !!!!!
 }
       end
@@ -19,12 +21,8 @@ task :i18n do
   end
 end
 
-def supported?(lang)
-  if RUBY_VERSION =~ /^1\.9/
-    !%w{ar ko zh-CN}.index(lang)
-  else
-    !%w{ar ko}.index(lang)
-  end
+def examples_working?(lang)
+  !%w{ro ko li lt}.index(lang)
 end
 
 def rake(args)

data/examples/i18n/ar/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/ar/lib/calculator.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Calculator
   def push(n)
     @args ||= []

data/examples/i18n/da/features/step_definitons/kalkulator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'kalkulator'
 
 Before do

data/examples/i18n/de/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/en/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/es/features/step_definitons/calculador_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculador'
 
 Before do

data/examples/i18n/et/features/step_definitions/kalkulaator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'kalkulaator'
 
 Before do

data/examples/i18n/fi/features/step_definitons/laskin_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'laskin'
 
 Before do

data/examples/i18n/fr/features/step_definitions/calculatrice_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculatrice'
 
 Soit /^une calculatrice$/ do

data/examples/i18n/id/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/it/features/step_definitons/calcolatrice_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calcolatrice'
 
 Before do

data/examples/i18n/ja/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/ko/features/addition.feature

@@ -9,7 +9,7 @@
     만일 내가 add를 누르면
     그러면 화면에 출력된 결과는 120이다
 
-  다른 예:
+  예:
     | 입력1 | 입력2 | 버튼 | 결과 |
     | 20    | 30    | add  | 50 |
     | 2     | 5     | add  | 7  |

data/examples/i18n/ko/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/lt/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/no/features/support/env.rb

@@ -2,5 +2,5 @@
 $KCODE='u' unless Cucumber::RUBY_1_9
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'kalkulator'

data/examples/i18n/pt/features/step_definitions/calculadora_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculadora'
 
 Before do

data/examples/i18n/ro/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/ru/features/support/env.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 $KCODE='u' unless Cucumber::RUBY_1_9

data/examples/i18n/se/features/step_definitons/kalkulator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'kalkulator'
 
 Before do

data/examples/i18n/zh-CN/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/examples/i18n/zh-TW/features/step_definitons/calculator_steps.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
-require 'cucumber/formatters/unicode'
+require 'cucumber/formatter/unicode'
 require 'calculator'
 
 Before do

data/features/cucumber_cli_outlines.feature

@@ -62,7 +62,7 @@ Feature: Cucumber command line
     When I run cucumber -q --format progress features/outline_sample.feature
     Then it should fail with
       """
-      ----U-..F---..
+      --U-..F-..
 
       (::) failed steps (::)
 

data/lib/cucumber/ast/outline_table.rb

@@ -53,7 +53,7 @@ module Cucumber
         def accept(visitor)
           if header?
             @cells.each do |cell|
-              cell.status = :skipped
+              cell.status = :skipped_param
               visitor.visit_table_cell(cell)
             end
           else

data/lib/cucumber/ast/table.rb

@@ -60,6 +60,23 @@ module Cucumber
           row.to_hash
         end
       end
+      
+      # Converts this table into a Hash where the first column is
+      # used as keys and the second column is used as values
+      #
+      #   | a | 2 |
+      #   | b | 3 |
+      #
+      # Gets converted into the following:
+      #
+      #   {'a' => '2', 'b' => '3'}
+      #
+      # The table must be exactly two columns wide 
+      #
+      def rows_hash
+        verify_table_width(2)
+        @rows_hash = self.transpose.hashes[0]
+      end
 
       # Gets the raw data of this table. For example, a Table built from
       # the following plain text:
@@ -160,6 +177,10 @@ module Cucumber
       def verify_column(column_name)
         raise %{The column named "#{column_name}" does not exist} unless @raw[0].include?(column_name)
       end
+      
+      def verify_table_width(width)
+        raise %{The table must have exactly #{width} columns} unless @raw[0].size == width
+      end
 
       def arguments_replaced(arguments) #:nodoc:
         raw_with_replaced_args = raw.map do |row|

data/lib/cucumber/formatter/ansicolor.rb

@@ -6,12 +6,20 @@ if Cucumber::WINDOWS_MRI
     gem 'win32console', '>= 1.2.0'
     require 'Win32/Console/ANSI'
   rescue LoadError
-    STDERR.puts "*** WARNING: You must gem install win32console (1.2.0 or higher) to get coloured output on MRI/Windows"
+    STDERR.puts %{*** WARNING: You must "gem install win32console" (1.2.0 or higher) to get coloured output on MRI/Windows}
+    Term::ANSIColor.coloring = false
+  end
+elsif Cucumber::WINDOWS && Cucumber::JRUBY
+  begin
+    gem 'aslakhellesoy-ansicolor', '>= 1.0'
+    require 'ansicolor'
+  rescue LoadError
+    STDERR.puts %{*** WARNING: You must "gem install aslakhellesoy-ansicolor --source http://gems.github.com" (1.0 or higher) to get coloured output on JRuby/Windows}
     Term::ANSIColor.coloring = false
   end
 end
 
-Term::ANSIColor.coloring = false if !STDOUT.tty? || (Cucumber::WINDOWS && !Cucumber::WINDOWS_MRI)
+Term::ANSIColor.coloring = false if !STDOUT.tty?
 
 module Cucumber
   module Formatter

data/lib/cucumber/languages.yml

@@ -198,6 +198,7 @@
   native: Bahasa Indonesia
   encoding: UTF-8
   feature: Fitur
+  background: Dasar
   scenario: Skenario
   scenario_outline: Skenario konsep
   examples: Contoh
@@ -386,7 +387,6 @@
   scenario: 시나리오
   scenario_outline: 시나리오 개요
   examples: 예
-  more_examples: 다른 예
   given: 조건
   when: 만일
   then: 그러면

data/lib/cucumber/step_mother.rb

@@ -26,10 +26,11 @@ module Cucumber
 
   # Raised when a step matches 2 or more StepDefinition
   class Ambiguous < StandardError
-    def initialize(step_name, step_definitions)
+    def initialize(step_name, step_definitions, used_guess)
       message = "Ambiguous match of \"#{step_name}\":\n\n"
       message << step_definitions.map{|sd| sd.backtrace_line}.join("\n")
       message << "\n\n"
+      message << "You can run again with --guess to make Cucumber be more smart about it\n" unless used_guess
       super(message)
     end
   end
@@ -118,7 +119,7 @@ module Cucumber
       matches = step_definitions.map { |d| d.step_match(step_name, formatted_step_name) }.compact
       raise Undefined.new(step_name) if matches.empty?
       matches = best_matches(step_name, matches) if matches.size > 1 && options[:guess]
-      raise Ambiguous.new(step_name, matches) if matches.size > 1
+      raise Ambiguous.new(step_name, matches, options[:guess]) if matches.size > 1
       matches[0]
     end
 

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/templates/env.rb

@@ -2,7 +2,7 @@
 ENV["RAILS_ENV"] ||= "test"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
-require 'cucumber/formatters/unicode' # Comment out this line if you don't want Cucumber Unicode support
+require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
 Cucumber::Rails.use_transactional_fixtures
 Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling 
                               # (e.g. rescue_action_in_public / rescue_responses / rescue_from)

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -113,3 +113,11 @@ Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
   assert field_labeled(label).checked?
 <% end -%>
 end
+
+Then /^I should be on (.+)$/ do |page_name|
+<% if framework == :rspec -%>
+  URI.parse(current_url).path.should == path_to(page_name)
+<% else -%>
+  assert_equal path_to(page_name), URI.parse(current_url).path
+<% end -%>
+end

data/spec/cucumber/ast/table_spec.rb

@@ -69,6 +69,27 @@ module Cucumber
           @table.transpose.hashes[0].should == {'one' => '1111', 'two' => '22222'}
         end
       end
+      
+      describe ".rows_hash" do
+                
+        it "should return a hash of the rows" do
+          table = Table.new([
+            %w{one 1111},
+            %w{two 22222}
+          ])
+          table.rows_hash.should == {'one' => '1111', 'two' => '22222'}
+        end
+        
+        it "should fail if the table doesn't have two columns" do
+          faulty_table = Table.new([
+            %w{one 1111 abc},
+            %w{two 22222 def}
+          ])
+          lambda {
+            faulty_table.rows_hash
+          }.should raise_error('The table must have exactly 2 columns')
+        end
+      end
         
       it "should allow renaming columns" do
         table2 = @table.map_headers('one' => :three)

data/spec/cucumber/step_mother_spec.rb

@@ -19,7 +19,7 @@ module Cucumber
       format.should == "it [snows] in [april]"
     end
 
-    it "should raise Ambiguous error when multiple step definitions match" do
+    it "should raise Ambiguous error with guess hint when multiple step definitions match" do
       @step_mother.Given(/Three (.*) mice/) {|disability|}
       @step_mother.Given(/Three blind (.*)/) {|animal|}
 
@@ -30,6 +30,22 @@ module Cucumber
 spec/cucumber/step_mother_spec.rb:23:in `/Three (.*) mice/'
 spec/cucumber/step_mother_spec.rb:24:in `/Three blind (.*)/'
 
+You can run again with --guess to make Cucumber be more smart about it
+})
+    end
+
+    it "should not show --guess hint when --guess is used" do
+      @step_mother.options = {:guess => true}
+      @step_mother.Given(/Three (.*) mice/) {|disability|}
+      @step_mother.Given(/Three cute (.*)/) {|animal|}
+
+      lambda do
+        @step_mother.step_match("Three cute mice")
+      end.should raise_error(Ambiguous, %{Ambiguous match of "Three cute mice":
+
+spec/cucumber/step_mother_spec.rb:39:in `/Three (.*) mice/'
+spec/cucumber/step_mother_spec.rb:40:in `/Three cute (.*)/'
+
 })
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.2.1
+  version: 0.2.2.2
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-26 00:00:00 -07:00
+date: 2009-03-28 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -333,7 +333,6 @@ files:
 - lib/cucumber/formatter/rerun.rb
 - lib/cucumber/formatter/unicode.rb
 - lib/cucumber/formatter/usage.rb
-- lib/cucumber/formatters/unicode.rb
 - lib/cucumber/languages.yml
 - lib/cucumber/parser.rb
 - lib/cucumber/parser/basic.rb

data/lib/cucumber/formatters/unicode.rb

@@ -1,2 +0,0 @@
-# This is for backwards compatibility
-require 'cucumber/formatter/unicode'