cucumber 0.6.0 → 0.6.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.1 2010-01-03
+
+=== Bugfixes
+* Fixed broken console handling on Windows/JRuby that was introduced in 0.6.0. (Aslak Hellesøy)
+
 == 0.6.0 2010-01-03
 
 Bumping to 0.6.0 for this release since we're breaking backwards compatibility with tags.

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:patch: 1
+:build: 
 :major: 0
 :minor: 6
-:patch: 0
-:build: 

data/cucumber.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aslak Helles\303\270y"]
@@ -547,7 +547,7 @@ Gem::Specification.new do |s|
 
                      (::)   U P G R A D I N G    (::)
 
-Thank you for installing cucumber-0.6.0.
+Thank you for installing cucumber-0.6.1.
 Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
 for important information about this release. Happy cuking!
 

data/lib/cucumber/formatter/ansicolor.rb

@@ -18,7 +18,7 @@ if Cucumber::WINDOWS_MRI
   end
 end
 
-Term::ANSIColor.coloring = false if !STDOUT.tty? and not ENV.has_key?("AUTOTEST")
+Term::ANSIColor.coloring = false if !STDOUT.tty? && !ENV.has_key?("AUTOTEST")
 
 module Cucumber
   module Formatter

data/lib/cucumber/formatter/unicode.rb

@@ -4,9 +4,15 @@ require 'cucumber/formatter/ansicolor'
 $KCODE='u' unless Cucumber::RUBY_1_9
 
 if Cucumber::WINDOWS
+  if Cucumber::WINDOWS_MRI
+    Cucumber::CODEPAGE = "cp#{Win32::Console::OutputCP()}"
+  elsif `cmd /c chcp` =~ /(\d+)/
+    Cucumber::CODEPAGE = "cp#{$1.to_i}"
+  else
+    raise "Cucumber couldn't detect the output codepage"
+  end
+
   require 'iconv'
-  require 'Win32/Console/ANSI'
-  Cucumber::CODEPAGE = "cp#{Win32::Console::OutputCP()}"
 
   module Cucumber
     module WindowsOutput #:nodoc:
@@ -32,9 +38,9 @@ if Cucumber::WINDOWS
         end
       end
 
-      Kernel.extend(self) if STDOUT.tty?
-      STDOUT.extend(self) if STDOUT.tty?
-      STDERR.extend(self) if STDERR.tty?
+      Kernel.extend(self)
+      STDOUT.extend(self)
+      STDERR.extend(self)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -653,7 +653,7 @@ post_install_message: |+
   
                        (::)   U P G R A D I N G    (::)
   
-  Thank you for installing cucumber-0.6.0.
+  Thank you for installing cucumber-0.6.1.
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
   for important information about this release. Happy cuking!