Format tables including full width characters properly

cucumber.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coveralls', '~> 0.7'
   s.add_development_dependency 'syntax', '>= 1.0.0'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'unicode'
 
   # For Documentation:
   s.add_development_dependency 'bcat', '~> 0.6.2'

lib/cucumber.rb

@@ -9,6 +9,7 @@
 module Cucumber
   class << self
     attr_accessor :wants_to_quit
+    attr_accessor :treats_ambiguous_as_fullwidth
 
     def logger
       return @log if @log

lib/cucumber/formatter/pretty.rb

@@ -203,7 +203,8 @@ def table_cell_value(value, status)
         status ||= @status || :passed
         width = @table.col_width(@col_index)
         cell_text = escape_cell(value.to_s || '')
-        padded = cell_text + (' ' * (width - cell_text.unpack('U*').length))
+        text_width = defined?(Unicode) ? Unicode.width(cell_text, Cucumber.treats_ambiguous_as_fullwidth) : cell_text.unpack('U*').length
+        padded = cell_text + (' ' * (width - text_width))
         prefix = cell_prefix(status)
         @io.print(' ' + format_string("#{prefix}#{padded}", status) + ::Cucumber::Term::ANSIColor.reset(" |"))
         @io.flush

lib/cucumber/multiline_argument/data_table.rb

@@ -692,7 +692,18 @@ def index
         end
 
         def width
-          map{|cell| cell.value ? escape_cell(cell.value.to_s).unpack('U*').length : 0}.max
+          map {|cell|
+            if cell.value
+              escaped = escape_cell(cell.value.to_s)
+              if defined?(Unicode)
+                Unicode.width(escaped, Cucumber.treats_ambiguous_as_fullwidth)
+              else
+                escaped.unpack('U*').length
+              end
+            else
+              0
+            end
+          }.max
         end
       end
 

spec/cucumber/formatter/unicode_pretty_spec.rb

@@ -0,0 +1,85 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'cucumber/formatter/spec_helper'
+require 'cucumber/formatter/pretty'
+require 'cucumber/cli/options'
+
+unless Cucumber::JRUBY
+  require 'unicode'
+
+  module Cucumber
+    module Formatter
+      describe Pretty do
+        extend SpecHelperDsl
+        include SpecHelper
+
+        before(:each) do
+          Cucumber::Term::ANSIColor.coloring = false
+          @out = StringIO.new
+          @formatter = Pretty.new(runtime, @out, {})
+        end
+
+        describe "with a multiline step arg including fullwidth characters" do
+          define_feature <<-FEATURE
+                  Feature: Traveling circus
+
+                    Scenario: Monkey goes to town
+                      Given there are monkeys:
+                       | 名前 |
+                       | キュウリ |
+                       | Cucumber |
+          FEATURE
+
+          it "displays the multiline string" do
+            run_defined_feature
+
+            expect(@out.string).to include <<OUTPUT
+    Given there are monkeys:
+      | 名前     |
+      | キュウリ |
+      | Cucumber |
+OUTPUT
+          end
+        end
+
+        describe "with a multiline step arg including ambiguous width characters" do
+          define_feature <<-FEATURE
+                  Feature: Traveling circus
+
+                    Scenario: Monkey goes to town
+                      Given there are monkeys:
+                       | ∀ |
+                       | forall |
+          FEATURE
+
+          after :each do
+            Cucumber.treats_ambiguous_as_fullwidth = nil
+          end
+
+          it "prints as fullwidth" do
+            Cucumber.treats_ambiguous_as_fullwidth = true
+            run_defined_feature
+
+            expect(@out.string).to include <<OUTPUT
+    Given there are monkeys:
+      | ∀     |
+      | forall |
+OUTPUT
+          end
+
+          it "prints as halfwidth" do
+            Cucumber.treats_ambiguous_as_fullwidth = false
+            run_defined_feature
+
+            expect(@out.string).to include <<OUTPUT
+    Given there are monkeys:
+      | ∀      |
+      | forall |
+OUTPUT
+          end
+        end
+      end
+    end
+  end
+end