thor 0.15.0 → 0.15.1

data/lib/thor/shell.rb

@@ -62,8 +62,8 @@ class Thor
     # Common methods that are delegated to the shell.
     SHELL_DELEGATED_METHODS.each do |method|
       module_eval <<-METHOD, __FILE__, __LINE__
-        def #{method}(*args)
-          shell.#{method}(*args)
+        def #{method}(*args,&block)
+          shell.#{method}(*args,&block)
         end
       METHOD
     end

data/lib/thor/shell/basic.rb

@@ -125,10 +125,15 @@ class Thor
 
         maximas = []
 
-        start.upto(colcount - 2) do |i|
+        start.upto(colcount - 1) do |i|
           maxima = table.map {|row| row[i] ? row[i].to_s.size : 0 }.max
           maximas << maxima
-          formats << "%-#{maxima + 2}s"
+          if i == colcount -1
+            # Don't output 2 trailing spaces when printing the last column
+            formats << "%-s"
+          else
+            formats << "%-#{maxima + 2}s"
+          end
         end
 
         formats[0] = formats[0].insert(0, " " * indent)
@@ -141,7 +146,12 @@ class Thor
             maxima = maximas[i]
 
             if column.is_a?(Numeric)
-              f = "%#{maxima}s  "
+              if i == row.size - 1
+                # Don't output 2 trailing spaces when printing the last column
+                f = "%#{maxima}s"
+              else
+                f = "%#{maxima}s  "
+              end
             else
               f = formats[i]
             end
@@ -316,10 +326,27 @@ HELP
         end
 
         def truncate(string, width)
-          if string.length <= width
-            string
-          else
-            ( string[0, width-3] || "" ) + "..."
+          as_unicode do
+            chars = string.chars.to_a
+
+            if chars.length <= width
+              chars.join
+            else
+              ( chars[0, width-3].join ) + "..."
+            end
+          end
+        end
+
+        if "".respond_to?(:encode)
+          def as_unicode
+            yield
+          end
+        else
+          def as_unicode
+            old, $KCODE = $KCODE, "U"
+            yield
+          ensure
+            $KCODE = old
           end
         end
 

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

data/spec/shell/basic_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Thor::Shell::Basic do
@@ -145,12 +147,16 @@ TABLE
     end
 
     it "uses maximum terminal width" do
+      @table << ["def", "#456", "Lançam foo bar"]
+      @table << ["ghi", "#789", "بالله  عليكم"]
       shell.should_receive(:terminal_width).and_return(20)
       content = capture(:stdout){ shell.print_table(@table, :indent => 2, :truncate => true) }
       content.should == <<-TABLE
   abc  #123  firs...
        #0    empty
   xyz  #786  last...
+  def  #456  Lanç...
+  ghi  #789  بالل...
 TABLE
     end
 
@@ -173,7 +179,7 @@ xyz  #786  last three
 TABLE
     end
 
-    it "prints a table with small numbers, and right-aligns them" do
+    it "prints a table with small numbers and right-aligns them" do
       table = [
         ["Name", "Number", "Color"],
         ["Erik", 1, "green"]
@@ -185,6 +191,18 @@ Erik       1  green
 TABLE
     end
 
+    it "doesn't output extra spaces for right-aligned columns in the last column" do
+      table = [
+        ["Name", "Number"],
+        ["Erik", 1]
+      ]
+      content = capture(:stdout){ shell.print_table(table) }
+      content.should == <<-TABLE
+Name  Number
+Erik       1
+TABLE
+    end
+
     it "prints a table with big numbers" do
       table = [
         ["Name", "Number", "Color"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler