Rudimentary Ruby 1.9 support

History.txt

@@ -2,6 +2,7 @@
 
 === New features
 * Pretty formatter shows number of scenarios (#139 Joseph Wilk)
+* Rudimentary support for Ruby 1.9. Now it's ok to file Ruby 1.9-related bugs.
 
 === Bugfixes
 * Fixed "No such file or directory -- cucumber (LoadError)" bug with AutoTest (Aslak Hellesøy)

config/hoe.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'cucumber/version'
 
 AUTHOR = 'Aslak Hellesøy'  # can also be an array of Authors

examples/i18n/Rakefile

@@ -4,13 +4,29 @@ task :i18n do
   Dir["#{dir}/*"].each do |f|
     if File.directory?(f)
       lang = f[dir.length+1..-1]
-      Dir.chdir(f) do
-        rake("features")
+      if supported?(lang)
+        Dir.chdir(f) do
+          rake("features")
+        end
+      else
+        STDERR.puts %{
+!!!!!
+!!!!! SKIPPING #{lang} (Haven't made it work on Ruby 1.9 yet)
+!!!!!
+}
       end
     end
   end
 end
 
+def supported?(lang)
+  if RUBY_VERSION =~ /^1\.9/
+    !%w{ar ja}.index(lang)
+  else
+    true
+  end
+end
+
 def rake(args)
   ruby(File.join(Gem.bindir, 'rake'), args)
 end

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

examples/i18n/no/features/step_definitons/kalkulator_steps.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec/expectations'
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/formatters/unicode'

gem_tasks/treetop.rake

@@ -3,7 +3,7 @@ class FeatureCompiler
     require 'yaml'
     require 'erb'
 
-    @tt = PLATFORM =~ /mswin|mingw/ ? 'tt.bat' : 'tt'
+    @tt = RUBY_PLATFORM =~ /mswin|mingw/ ? 'tt.bat' : 'tt'
 
     @template = ERB.new(IO.read(File.dirname(__FILE__) + '/../lib/cucumber/treetop_parser/feature.treetop.erb'))
     @langs = YAML.load_file(File.dirname(__FILE__) + '/../lib/cucumber/languages.yml')

lib/autotest/cucumber_mixin.rb

@@ -122,6 +122,6 @@ def make_cucumber_cmd(scenarios_to_run, dirty_scenarios_filename)
     else
       scenario_args = scenarios_to_run.map { |s| "-s '#{s}'" }.join(' ')
     end
-    return "#{Cucumber::RUBY} #{Cucumber::BINARY} #{args} #{scenario_args}"
+    return "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} #{args} #{scenario_args}"
   end
 end

lib/cucumber/core_ext/string.rb

@@ -20,7 +20,7 @@ def gzub(regexp, format=nil, &proc)
     s
   end
 
-  if (Cucumber::JRUBY && Cucumber::RAILS)
+  if (Cucumber::JRUBY && Cucumber::RAILS) || Cucumber::RUBY_1_9
     # Workaround for http://tinyurl.com/55uu3u 
     alias jlength length
   else

lib/cucumber/formatters/unicode.rb

@@ -2,7 +2,7 @@
 require 'cucumber/platform'
 require 'cucumber/formatters/ansicolor'
 
-$KCODE='u'
+$KCODE='u' unless Cucumber::RUBY_1_9
 
 if Cucumber::WINDOWS_MRI && `chcp` =~ /Active code page: (\d+)/
   codepage = $1.to_i

lib/cucumber/platform.rb

@@ -10,7 +10,8 @@ module Cucumber
   WINDOWS       = Config::CONFIG['host_os'] =~ /mswin|mingw/
   WINDOWS_MRI   = WINDOWS && !JRUBY && !IRONRUBY
   RAILS         = defined?(Rails)
-  RUBY          = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+  RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+  RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
 
   class << self
     attr_reader :language

lib/cucumber/treetop_parser/feature.treetop.erb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_ar.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_cy.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_da.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_de.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_en-lol.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_en-tx.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_en.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_es.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_et.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_fr.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_id.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_it.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_ja.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_lt.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_nl.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_no.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_parser.rb

@@ -20,7 +20,9 @@ class << self
       end
 
       def parse_feature(file)
-        ast = parse(IO.read(file))
+        gherkin = IO.read(file)
+        gherkin = gherkin.force_encoding('utf-8') if Cucumber::RUBY_1_9
+        ast = parse(gherkin)
         if ast.nil?
           raise SyntaxError.new(file, self)
         else

lib/cucumber/treetop_parser/feature_pl.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_pt.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_ro.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_ro2.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_ru.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_se.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

lib/cucumber/treetop_parser/feature_zh-CN.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser