Ruby2.0support

.travis.yml

 patch

diff --git .travis.yml .travis.yml

index 661dd2b..a3297f0 100644

--- .travis.yml

&＃043;&＃043;&＃043; .travis.yml

&＃064;&＃064; -1,4 &＃043;1,5 &＃064;&＃064;

 rvm:

&＃043;  - 2.0.0

   - 1.9.3

   - 1.9.2



diff --git cucumber.yml cucumber.yml

index b081270..52e3727 100644

--- cucumber.yml

&＃043;&＃043;&＃043; cucumber.yml

&＃064;&＃064; -15,6 &＃043;15,7 &＃064;&＃064; jruby:  --tags ~ --tags ~

 jruby_win:  --tags ~ --tags ~ CUCUMBER_FORWARD_SLASH_PATHS&＃061;true

 windows_mri:  --tags ~ --tags ~ --tags ~ --tags ~-many-fonts CUCUMBER_FORWARD_SLASH_PATHS&＃061;true

 ruby_1_9:  --tags ~ --tags ~

&＃043;ruby_2_0:  --tags ~ --tags ~

 wip: --tags :3 --wip features

 none: --format pretty

 rerun:  --format rerun --out rerun.txt --strict --tags ~

diff --git fixtures/self_test/features/support/env.rb fixtures/self_test/features/support/env.rb

index 1ce0d3a..2dc9ff5 100644

--- fixtures/self_test/features/support/env.rb

&＃043;&＃043;&＃043; fixtures/self_test/features/support/env.rb

&＃064;&＃064; -1,6 &＃043;1,6 &＃064;&＃064;

 require &＃039;base64&＃039;

 begin require &＃039;rspec/expectations&＃039;; rescue LoadError; require &＃039;spec/expectations&＃039;; end

-$KCODE &＃061; &＃039;u&＃039; unless Cucumber::RUBY_1_9

&＃043;$KCODE &＃061; &＃039;u&＃039; if Cucumber::RUBY_2_0



 Before(&＃039;&＃039;) do

   raise "Should never run"

diff --git gem_tasks/cucumber.rake gem_tasks/cucumber.rake

index 2789906..8bcfc82 100644

--- gem_tasks/cucumber.rake

&＃043;&＃043;&＃043; gem_tasks/cucumber.rake

&＃064;&＃064; -3,12 &＃043;3,14 &＃064;&＃064; require &＃039;cucumber/platform&＃039;



 class Cucumber::Rake::Task

   def set_profile_for_current_ruby

-    self.profile &＃061; if(Cucumber::JRUBY)

&＃043;    self.profile &＃061; if Cucumber::JRUBY

       Cucumber::WINDOWS ? &＃039;jruby_win&＃039; : &＃039;jruby&＃039;

-    elsif(Cucumber::WINDOWS_MRI)

&＃043;    elsif Cucumber::WINDOWS_MRI

       &＃039;windows_mri&＃039;

-    elsif(Cucumber::RUBY_1_9)

&＃043;    elsif Cucumber::RUBY_1_9

       &＃039;ruby_1_9&＃039;

&＃043;    elsif Cucumber::RUBY_2_0

&＃043;      &＃039;ruby_2_0&＃039;

     end

   end

 end

diff --git legacy_features/support/env.rb legacy_features/support/env.rb

index 8a3d848..a70afef 100644

--- legacy_features/support/env.rb

&＃043;&＃043;&＃043; legacy_features/support/env.rb

&＃064;&＃064; -101,7 &＃043;101,7 &＃064;&＃064; class CucumberWorld

     stderr_file &＃061; Tempfile.new(&＃039;cucumber&＃039;)

     stderr_file.close

     in_current_dir do

-      mode &＃061; Cucumber::RUBY_1_9 ? {:external_encoding&＃061;>"UTF-8"} : &＃039;r&＃039;

&＃043;      mode &＃061; Cucumber::RUBY_1_8_7 ? &＃039;r&＃039; : {:external_encoding&＃061;>"UTF-8"}

       IO.popen("#{command} 2> #{stderr_file.path}", mode) do |io|

          &＃061; io.read

       end

diff --git lib/cucumber/core_ext/instance_exec.rb lib/cucumber/core_ext/instance_exec.rb

index 0346a34..d76c21e 100644

--- lib/cucumber/core_ext/instance_exec.rb

&＃043;&＃043;&＃043; lib/cucumber/core_ext/instance_exec.rb

&＃064;&＃064; -54,7 &＃043;54,7 &＃064;&＃064; class Object #:nodoc:



   def cucumber_arity(block)

     a &＃061; block.arity

-    Cucumber::RUBY_1_9 ? a : (a &＃061;&＃061; -1 ? 0 : a)

&＃043;    Cucumber::RUBY_1_8_7 ? (a &＃061;&＃061; -1 ? 0 : a) : a

   end



   def cucumber_compatible_arity?(args, block)

&＃064;&＃064; -74,7 &＃043;74,7 &＃064;&＃064; class Object #:nodoc:

     end

   end



-  INSTANCE_EXEC_OFFSET &＃061; (Cucumber::RUBY_1_9 || Cucumber::RUBY_1_8_7 || Cucumber::JRUBY) ? -3 : -4

&＃043;  INSTANCE_EXEC_OFFSET &＃061; (Cucumber::RUBY_2_0 || Cucumber::RUBY_1_9 || Cucumber::RUBY_1_8_7 || Cucumber::JRUBY) ? -3 : -4



   def replace_instance_exec_invocation_line!(backtrace, instance_exec_invocation_line, pseudo_method)

     return if Cucumber.use_full_backtrace

diff --git lib/cucumber/formatter/unicode.rb lib/cucumber/formatter/unicode.rb

index 61fe#..0105d5e 100644

--- lib/cucumber/formatter/unicode.rb

&＃043;&＃043;&＃043; lib/cucumber/formatter/unicode.rb

&＃064;&＃064; -2,10 &＃043;2,10 &＃064;&＃064;

 # Tips for improvement - esp. ruby 1.9: http://www.ruby-forum.com/topic/184730

 require &＃039;cucumber/platform&＃039;

 require &＃039;cucumber/formatter/ansicolor&＃039;

-$KCODE&＃061;&＃039;u&＃039; unless Cucumber::RUBY_1_9

&＃043;$KCODE&＃061;&＃039;u&＃039; if Cucumber::RUBY_2_0



 if Cucumber::WINDOWS

-  require &＃039;iconv&＃039; unless Cucumber::RUBY_1_9

&＃043;  require &＃039;iconv&＃039; if Cucumber::RUBY_2_0



   if ENV[&＃039;CUCUMBER_OUTPUT_ENCODING&＃039;]

     Cucumber::CODEPAGE &＃061; ENV[&＃039;CUCUMBER_OUTPUT_ENCODING&＃039;]

&＃064;&＃064; -27,14 &＃043;27,7 &＃064;&＃064; if Cucumber::WINDOWS

         o.instance_eval do

           alias cucumber_print print

           def print(*a)

-            if Cucumber::RUBY_1_9

-              begin

-                cucumber_print(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})

-              rescue Encoding::UndefinedConversionError &＃061;> e

-                STDERR.cucumber_puts("WARNING: #{e.message}")

-                cucumber_print(*a)

-              end

-            else

&＃043;            if Cucumber::RUBY_1_8_7

               begin

                 cucumber_print(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))

               rescue Iconv::InvalidEncoding &＃061;> e

&＃064;&＃064; -44,19 &＃043;37,19 &＃064;&＃064; if Cucumber::WINDOWS

                 STDERR.cucumber_puts("WARNING: #{e.message}")

                 cucumber_print(*a)

               end

&＃043;            else

&＃043;              begin

&＃043;                cucumber_print(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})

&＃043;              rescue Encoding::UndefinedConversionError &＃061;> e

&＃043;                STDERR.cucumber_puts("WARNING: #{e.message}")

&＃043;                cucumber_print(*a)

&＃043;              end

             end

           end



           alias cucumber_puts puts

           def puts(*a)

-            if Cucumber::RUBY_1_9

-              begin

-                cucumber_puts(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})

-              rescue Encoding::UndefinedConversionError &＃061;> e

-                STDERR.cucumber_puts("WARNING: #{e.message}")

-                cucumber_puts(*a)

-              end

-            else

&＃043;            if Cucumber::RUBY_1_8_7

               begin

                 cucumber_puts(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))

               rescue Iconv::InvalidEncoding &＃061;> e

&＃064;&＃064; -66,6 &＃043;59,13 &＃064;&＃064; if Cucumber::WINDOWS

                 STDERR.cucumber_puts("WARNING: #{e.message}")

                 cucumber_puts(*a)

               end

&＃043;            else

&＃043;              begin

&＃043;                cucumber_puts(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})

&＃043;              rescue Encoding::UndefinedConversionError &＃061;> e

&＃043;                STDERR.cucumber_puts("WARNING: #{e.message}")

&＃043;                cucumber_puts(*a)

&＃043;              end

             end

           end

         end

diff --git lib/cucumber/platform.rb lib/cucumber/platform.rb

index a71eea4..9b99f62 100644

--- lib/cucumber/platform.rb

&＃043;&＃043;&＃043; lib/cucumber/platform.rb

&＃064;&＃064; -14,6 &＃043;14,7 &＃064;&＃064; unless defined?(Cucumber::VERSION)

   WINDOWS_MRI   &＃061; WINDOWS && !JRUBY && !IRONRUBY

   RAILS         &＃061; defined?(Rails)

   RUBY_BINARY   &＃061; File.join(RbConfig::CONFIG[&＃039;bindir&＃039;], RbConfig::CONFIG[&＃039;ruby_install_name&＃039;])

&＃043;  RUBY_2_0      &＃061; RUBY_VERSION &＃061;~ /^2\.0/

   RUBY_1_9      &＃061; RUBY_VERSION &＃061;~ /^1\.9/

   RUBY_1_8_7    &＃061; RUBY_VERSION &＃061;~ /^1\.8\.7/



&＃064;&＃064; -21,7 &＃043;22,7 &＃064;&＃064; unless defined?(Cucumber::VERSION)

     attr_accessor :use_full_backtrace



     def file_mode(m, encoding&＃061;"UTF-8") #:nodoc:

-      RUBY_1_9 ? "#{m}:#{encoding}" : m

&＃043;      RUBY_1_8_7 ? m : "#{m}:#{encoding}"

     end

   end

   self.use_full_backtrace &＃061; false

diff --git lib/cucumber/rake/task.rb lib/cucumber/rake/task.rb

index 6596c7f..c5583ec 100644

--- lib/cucumber/rake/task.rb

&＃043;&＃043;&＃043; lib/cucumber/rake/task.rb

&＃064;&＃064; -143,7 &＃043;143,7 &＃064;&＃064; module Cucumber

       # true, &＃043;fork&＃043; is implicit.

       attr_accessor :rcov

       def rcov&＃061;(flag)

-        if(flag && Cucumber::RUBY_1_9)

&＃043;        if flag && !Cucumber::RUBY_1_8_7

           raise failed &＃043; "RCov only works on Ruby 1.8.x. You may want to use SimpleCov: https://github.com/colszowka/simplecov" &＃043; reset

         end

          &＃061; flag

diff --git spec/cucumber/cli/configuration_spec.rb spec/cucumber/cli/configuration_spec.rb

index 88894ed..60293ae 100644

--- spec/cucumber/cli/configuration_spec.rb

&＃043;&＃043;&＃043; spec/cucumber/cli/configuration_spec.rb

&＃064;&＃064; -8,9 &＃043;8,13 &＃064;&＃064; module Cli

       attr_reader :options

     end



&＃043;    def convert_hash_to_yaml_erb(hash)

&＃043;      ["---", *hash.map { |k,v| "#{k}: #{v}" }].join "\n"

&＃043;    end

&＃043;

     def given_cucumber_yml_defined_as(hash_or_string)

       File.stub!(:exist?).and_return(true)

-      cucumber_yml &＃061; hash_or_string.is_a?(Hash) ? hash_or_string.to_yaml : hash_or_string

&＃043;      cucumber_yml &＃061; hash_or_string.is_a?(Hash) ? convert_hash_to_yaml_erb(hash_or_string) : hash_or_string

       IO.stub!(:read).with(&＃039;cucumber.yml&＃039;).and_return(cucumber_yml)

     end



diff --git spec/cucumber/core_ext/proc_spec.rb spec/cucumber/core_ext/proc_spec.rb

index f5fcb48..fc9fc44 100644

--- spec/cucumber/core_ext/proc_spec.rb

&＃043;&＃043;&＃043; spec/cucumber/core_ext/proc_spec.rb

&＃064;&＃064; -35,20 &＃043;35,20 &＃064;&＃064; describe Proc do

     }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 2 arguments, but the Regexp matched 1 argument.")

   end



-  if Cucumber::RUBY_1_9

-    it "should allow varargs (expecting 0&＃043;)" do

&＃043;  if Cucumber::RUBY_1_8_7

&＃043;    # Ruby 1.8

&＃043;    it "should not allow varargs 0&＃043; because Ruby 1.8 reports same arity as with no args, so we can&＃039;t really tell the difference." do

       lambda {

         Object.new.cucumber_instance_exec(true, &＃039;foo&＃039;, 1) do |*args|

         end

-      }.should_not raise_error(Cucumber::ArityMismatchError)

&＃043;      }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 0 arguments, but the Regexp matched 1 argument.")

     end

   else

-    # Ruby 1.8

-    it "should not allow varargs 0&＃043; because Ruby 1.8 reports same arity as with no args, so we can&＃039;t really tell the difference." do

&＃043;    it "should allow varargs (expecting 0&＃043;)" do

       lambda {

         Object.new.cucumber_instance_exec(true, &＃039;foo&＃039;, 1) do |*args|

         end

-      }.should raise_error(Cucumber::ArityMismatchError, "Your block takes 0 arguments, but the Regexp matched 1 argument.")

&＃043;      }.should_not raise_error(Cucumber::ArityMismatchError)

     end

   end



diff --git spec/cucumber/step_match_spec.rb spec/cucumber/step_match_spec.rb

index fb42702..35ce644 100644

--- spec/cucumber/step_match_spec.rb

&＃043;&＃043;&＃043; spec/cucumber/step_match_spec.rb

&＃064;&＃064; -7,7 &＃043;7,7 &＃064;&＃064; module Cucumber

   describe StepMatch do

     include RSpec::WorkInProgress



-    WORD &＃061; Cucumber::RUBY_1_9 ? &＃039;[[:word:]]&＃039; : &＃039;\w&＃039;

&＃043;    WORD &＃061; Cucumber::RUBY_1_8_7 ? &＃039;\w&＃039; : &＃039;[[:word:]]&＃039;



     before do

        &＃061; RbSupport::RbLanguage.new(nil)

diff --git spec/spec_helper.rb spec/spec_helper.rb

index fe145ae..f7e773d 100644

--- spec/spec_helper.rb

&＃043;&＃043;&＃043; spec/spec_helper.rb

&＃064;&＃064; -13,7 &＃043;13,7 &＃064;&＃064; require &＃039;bundler&＃039;

 Bundler.setup



 require &＃039;cucumber&＃039;

-$KCODE&＃061;&＃039;u&＃039; unless Cucumber::RUBY_1_9

&＃043;$KCODE&＃061;&＃039;u&＃039; if Cucumber::RUBY_1_8_7



 RSpec.configure do |c|

   c.before do