thor 0.15.1 → 0.15.2

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - jruby-18mode
-  - jruby-19mode
   - 1.8.7
   - 1.9.2
   - 1.9.3

data/Gemfile

@@ -2,10 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-platforms :jruby do
-  gem 'jruby-openssl', '~> 0.7'
-end
-
 platforms :mri_18 do
   gem 'ruby-debug', '>= 0.10.3'
 end

data/lib/thor/shell.rb

@@ -23,7 +23,7 @@ class Thor
   end
 
   module Shell
-    SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_status, :print_table, :print_wrapped, :file_collision]
+    SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_status, :print_in_columns, :print_table, :print_wrapped, :file_collision, :terminal_width]
 
     autoload :Basic, 'thor/shell/basic'
     autoload :Color, 'thor/shell/color'

data/lib/thor/shell/basic.rb

@@ -103,6 +103,25 @@ class Thor
         !yes?(statement, color)
       end
 
+      # Prints values in columns
+      #
+      # ==== Parameters
+      # Array[String, String, ...]
+      #
+      def print_in_columns(array)
+        return if array.empty?
+        colwidth = (array.map{|el| el.to_s.size}.max || 0) + 2
+        array.each_with_index do |value, index|
+          # Don't output trailing spaces when printing the last column
+          if (((index + 1) % (terminal_width / colwidth))).zero? && !index.zero?
+            stdout.puts value
+          else
+            stdout.printf("%-#{colwidth}s", value)
+          end
+        end
+        stdout.puts
+      end
+
       # Prints a table.
       #
       # ==== Parameters
@@ -112,8 +131,8 @@ class Thor
       # indent<Integer>:: Indent the first column by indent value.
       # colwidth<Integer>:: Force the first column to colwidth spaces wide.
       #
-      def print_table(table, options={})
-        return if table.empty?
+      def print_table(array, options={})
+        return if array.empty?
 
         formats, indent, colwidth = [], options[:indent].to_i, options[:colwidth]
         options[:truncate] = terminal_width if options[:truncate] == true
@@ -121,14 +140,14 @@ class Thor
         formats << "%-#{colwidth + 2}s" if colwidth
         start = colwidth ? 1 : 0
 
-        colcount = table.max{|a,b| a.size <=> b.size }.size
+        colcount = array.max{|a,b| a.size <=> b.size }.size
 
         maximas = []
 
-        start.upto(colcount - 1) do |i|
-          maxima = table.map {|row| row[i] ? row[i].to_s.size : 0 }.max
+        start.upto(colcount - 1) do |index|
+          maxima = array.map {|row| row[index] ? row[index].to_s.size : 0 }.max
           maximas << maxima
-          if i == colcount -1
+          if index == colcount -1
             # Don't output 2 trailing spaces when printing the last column
             formats << "%-s"
           else
@@ -139,21 +158,21 @@ class Thor
         formats[0] = formats[0].insert(0, " " * indent)
         formats << "%s"
 
-        table.each do |row|
+        array.each do |row|
           sentence = ""
 
-          row.each_with_index do |column, i|
-            maxima = maximas[i]
+          row.each_with_index do |column, index|
+            maxima = maximas[index]
 
             if column.is_a?(Numeric)
-              if i == row.size - 1
+              if index == 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]
+              f = formats[index]
             end
             sentence << f % column.to_s
           end
@@ -225,6 +244,19 @@ class Thor
         end
       end
 
+      # This code was copied from Rake, available under MIT-LICENSE
+      # Copyright (c) 2003, 2004 Jim Weirich
+      def terminal_width
+        if ENV['THOR_COLUMNS']
+          result = ENV['THOR_COLUMNS'].to_i
+        else
+          result = unix? ? dynamic_width : 80
+        end
+        (result < 10) ? 80 : result
+      rescue
+        80
+      end
+
       # Called if something goes wrong during the execution. This is used by Thor
       # internally and should not be used inside your scripts. If something went
       # wrong, you can always raise an exception. If you raise a Thor::Error, it
@@ -241,36 +273,36 @@ class Thor
         string
       end
 
-      protected
+    protected
 
-        def lookup_color(color)
-          return color unless color.is_a?(Symbol)
-          self.class.const_get(color.to_s.upcase)
-        end
+      def lookup_color(color)
+        return color unless color.is_a?(Symbol)
+        self.class.const_get(color.to_s.upcase)
+      end
 
-        def stdout
-          $stdout
-        end
+      def stdout
+        $stdout
+      end
 
-        def stdin
-          $stdin
-        end
+      def stdin
+        $stdin
+      end
 
-        def stderr
-          $stderr
-        end
+      def stderr
+        $stderr
+      end
 
-        def is?(value) #:nodoc:
-          value = value.to_s
+      def is?(value) #:nodoc:
+        value = value.to_s
 
-          if value.size == 1
-            /\A#{value}\z/i
-          else
-            /\A(#{value}|#{value[0,1]})\z/i
-          end
+        if value.size == 1
+          /\A#{value}\z/i
+        else
+          /\A(#{value}|#{value[0,1]})\z/i
         end
+      end
 
-        def file_collision_help #:nodoc:
+      def file_collision_help #:nodoc:
 <<HELP
 Y - yes, overwrite
 n - no, do not overwrite
@@ -279,96 +311,79 @@ q - quit, abort
 d - diff, show the differences between the old and the new
 h - help, show this help
 HELP
-        end
+      end
 
-        def show_diff(destination, content) #:nodoc:
-          diff_cmd = ENV['THOR_DIFF'] || ENV['RAILS_DIFF'] || 'diff -u'
+      def show_diff(destination, content) #:nodoc:
+        diff_cmd = ENV['THOR_DIFF'] || ENV['RAILS_DIFF'] || 'diff -u'
 
-          Tempfile.open(File.basename(destination), File.dirname(destination)) do |temp|
-            temp.write content
-            temp.rewind
-            system %(#{diff_cmd} "#{destination}" "#{temp.path}")
-          end
-        end
-
-        def quiet? #:nodoc:
-          mute? || (base && base.options[:quiet])
-        end
-
-        # This code was copied from Rake, available under MIT-LICENSE
-        # Copyright (c) 2003, 2004 Jim Weirich
-        def terminal_width
-          if ENV['THOR_COLUMNS']
-            result = ENV['THOR_COLUMNS'].to_i
-          else
-            result = unix? ? dynamic_width : 80
-          end
-          (result < 10) ? 80 : result
-        rescue
-          80
+        Tempfile.open(File.basename(destination), File.dirname(destination)) do |temp|
+          temp.write content
+          temp.rewind
+          system %(#{diff_cmd} "#{destination}" "#{temp.path}")
         end
+      end
 
-        # Calculate the dynamic width of the terminal
-        def dynamic_width
-          @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
-        end
+      def quiet? #:nodoc:
+        mute? || (base && base.options[:quiet])
+      end
 
-        def dynamic_width_stty
-          %x{stty size 2>/dev/null}.split[1].to_i
-        end
+      # Calculate the dynamic width of the terminal
+      def dynamic_width
+        @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
+      end
 
-        def dynamic_width_tput
-          %x{tput cols 2>/dev/null}.to_i
-        end
+      def dynamic_width_stty
+        %x{stty size 2>/dev/null}.split[1].to_i
+      end
 
-        def unix?
-          RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
-        end
+      def dynamic_width_tput
+        %x{tput cols 2>/dev/null}.to_i
+      end
 
-        def truncate(string, width)
-          as_unicode do
-            chars = string.chars.to_a
+      def unix?
+        RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
+      end
 
-            if chars.length <= width
-              chars.join
-            else
-              ( chars[0, width-3].join ) + "..."
-            end
+      def truncate(string, width)
+        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
+      if "".respond_to?(:encode)
+        def as_unicode
+          yield
         end
-
-        def ask_simply(statement, color = nil)
-          say("#{statement} ", color)
-          stdin.gets.strip
+      else
+        def as_unicode
+          old, $KCODE = $KCODE, "U"
+          yield
+        ensure
+          $KCODE = old
         end
+      end
 
-        def ask_filtered(statement, answer_set, *args)
-          correct_answer = nil
-
-          until correct_answer
-            answer = ask_simply("#{statement} #{answer_set.inspect}", *args)
-
-            correct_answer = answer_set.include?(answer) ? answer : nil
-
-            answers = answer_set.map(&:inspect).join(", ")
-            say("Your response must be one of: [#{answers}]. Please try again.") unless correct_answer
-          end
+      def ask_simply(statement, color=nil)
+        say("#{statement} ", color)
+        stdin.gets.strip
+      end
 
-          correct_answer
+      def ask_filtered(statement, answer_set, *args)
+        correct_answer = nil
+        until correct_answer
+          answer = ask_simply("#{statement} #{answer_set.inspect}", *args)
+          correct_answer = answer_set.include?(answer) ? answer : nil
+          answers = answer_set.map(&:inspect).join(", ")
+          say("Your response must be one of: [#{answers}]. Please try again.") unless correct_answer
         end
+        correct_answer
+      end
+
     end
   end
 end

data/lib/thor/util.rb

@@ -225,11 +225,11 @@ class Thor
           begin
             alternate_ruby = File.join(RbConfig::CONFIG['bindir'], 'ruby')
             alternate_ruby << RbConfig::CONFIG['EXEEXT']
-  
+
             # ruby is a symlink
             if File.symlink? alternate_ruby
               linked_ruby = File.readlink alternate_ruby
-  
+
               # symlink points to 'ruby_install_name'
               ruby = alternate_ruby if linked_ruby == ruby_name || linked_ruby == ruby
             end

data/lib/thor/version.rb

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

data/spec/actions/create_file_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'thor/actions'
 
 describe Thor::Actions::CreateFile do
-  before(:each) do
+  before do
     ::FileUtils.rm_rf(destination_root)
   end
 
@@ -63,7 +63,7 @@ describe Thor::Actions::CreateFile do
     end
 
     describe "when file exists" do
-      before(:each) do
+      before do
         create_file("doc/config.rb")
         invoke!
       end
@@ -77,7 +77,7 @@ describe Thor::Actions::CreateFile do
       end
 
       describe "and is not identical" do
-        before(:each) do
+        before do
           File.open(File.join(destination_root, 'doc/config.rb'), 'w'){ |f| f.write("FOO = 3") }
         end
 

data/spec/actions/create_link_spec.rb

@@ -3,7 +3,7 @@ require 'thor/actions'
 require 'tempfile'
 
 describe Thor::Actions::CreateLink do
-  before(:each) do
+  before do
     @hardlink_to = File.join(Dir.tmpdir, 'linkdest.rb')
     ::FileUtils.rm_rf(destination_root)
     ::FileUtils.rm_rf(@hardlink_to)

data/spec/actions/directory_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'thor/actions'
 
 describe Thor::Actions::Directory do
-  before(:each) do
+  before do
     ::FileUtils.rm_rf(destination_root)
     invoker.stub!(:file_name).and_return("rdoc")
   end

data/spec/actions/empty_directory_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'thor/actions'
 
 describe Thor::Actions::EmptyDirectory do
-  before(:each) do
+  before do
     ::FileUtils.rm_rf(destination_root)
   end
 
@@ -98,7 +98,7 @@ describe Thor::Actions::EmptyDirectory do
 
   context "protected methods" do
     describe "#convert_encoded_instructions" do
-      before :each do
+      before do
         empty_directory("test_dir")
         @action.base.stub!(:file_name).and_return("expected")
       end

data/spec/actions/file_manipulation_spec.rb

@@ -23,7 +23,7 @@ describe Thor::Actions do
     File.join(destination_root, "foo")
   end
 
-  before(:each) do
+  before do
     ::FileUtils.rm_rf(destination_root)
   end
 
@@ -197,7 +197,7 @@ describe Thor::Actions do
   end
 
   describe "when changing existent files" do
-    before(:each) do
+    before do
       ::FileUtils.cp_r(source_root, destination_root)
     end
 
@@ -316,7 +316,7 @@ describe Thor::Actions do
   end
 
   describe "when adjusting comments" do
-    before(:each) do
+    before do
       ::FileUtils.cp_r(source_root, destination_root)
     end
 

data/spec/actions/inject_into_file_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'thor/actions'
 
 describe Thor::Actions::InjectIntoFile do
-  before(:each) do
+  before do
     ::FileUtils.rm_rf(destination_root)
     ::FileUtils.cp_r(source_root, destination_root)
   end

data/spec/actions_spec.rb

@@ -198,7 +198,7 @@ describe Thor::Actions do
   end
 
   describe "#apply" do
-    before(:each) do
+    before do
       @template = <<-TEMPLATE
         @foo = "FOO"
         say_status :cool, :padding
@@ -248,7 +248,7 @@ describe Thor::Actions do
   end
 
   describe "#run" do
-    before(:each) do
+    before do
       runner.should_receive(:system).with("ls")
     end
 
@@ -271,7 +271,7 @@ describe Thor::Actions do
   end
 
   describe "#run_ruby_script" do
-    before(:each) do
+    before do
       Thor::Util.stub!(:ruby_command).and_return("/opt/jruby")
       runner.should_receive(:system).with("/opt/jruby script.rb")
     end

data/spec/base_spec.rb

@@ -104,7 +104,7 @@ describe Thor::Base do
   end
 
   describe "#class_options_help" do
-    before(:each) do
+    before do
       @content = capture(:stdout) { MyCounter.help(Thor::Base.shell.new) }
     end
 

data/spec/core_ext/hash_with_indifferent_access_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'thor/core_ext/hash_with_indifferent_access'
 
 describe Thor::CoreExt::HashWithIndifferentAccess do
-  before(:each) do
+  before do
     @hash = Thor::CoreExt::HashWithIndifferentAccess.new :foo => 'bar', 'baz' => 'bee', :force => true
   end
 

data/spec/core_ext/ordered_hash_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'thor/core_ext/ordered_hash'
 
 describe Thor::CoreExt::OrderedHash do
-  before :each do
+  before do
     @hash = Thor::CoreExt::OrderedHash.new
   end
 
@@ -26,7 +26,7 @@ describe Thor::CoreExt::OrderedHash do
   end
 
   describe "with several items" do
-    before :each do
+    before do
       @hash[:foo] = "Foo!"
       @hash[:bar] = "Bar!"
       @hash[:baz] = "Baz!"

data/spec/group_spec.rb

@@ -56,7 +56,7 @@ describe Thor::Group do
   end
 
   describe "#help" do
-    before(:each) do
+    before do
       @content = capture(:stdout){ MyCounter.help(Thor::Base.shell.new) }
     end
 
@@ -76,7 +76,7 @@ describe Thor::Group do
   end
 
   describe "#invoke" do
-    before(:each) do
+    before do
       @content = capture(:stdout){ E.start }
     end
 
@@ -108,7 +108,7 @@ describe Thor::Group do
 
   describe "#invoke_from_option" do
     describe "with default type" do
-      before(:each) do
+      before do
         @content = capture(:stdout){ G.start }
       end
 
@@ -147,7 +147,7 @@ describe Thor::Group do
     end
 
     describe "with boolean type" do
-      before(:each) do
+      before do
         @content = capture(:stdout){ H.start }
       end
 

data/spec/parser/options_spec.rb

@@ -151,7 +151,7 @@ describe Thor::Options do
     end
 
     describe "with one required and one optional switch" do
-      before :each do
+      before do
         create "--foo" => :required, "--bar" => :boolean
       end
 
@@ -174,7 +174,7 @@ describe Thor::Options do
     end
 
     describe "with :string type" do
-      before(:each) do
+      before do
         create ["--foo", "-f"] => :required
       end
 
@@ -220,7 +220,7 @@ describe Thor::Options do
     end
 
     describe "with :boolean type" do
-      before(:each) do
+      before do
         create "--foo" => false
       end
 
@@ -271,7 +271,7 @@ describe Thor::Options do
     end
 
     describe "with :hash type" do
-      before(:each) do
+      before do
         create "--attributes" => :hash
       end
 
@@ -289,7 +289,7 @@ describe Thor::Options do
     end
 
     describe "with :array type" do
-      before(:each) do
+      before do
         create "--attributes" => :array
       end
 
@@ -307,7 +307,7 @@ describe Thor::Options do
     end
 
     describe "with :numeric type" do
-      before(:each) do
+      before do
         create "n" => :numeric, "m" => 5
       end
 

data/spec/runner_spec.rb

@@ -117,7 +117,7 @@ describe Thor::Runner do
   end
 
   describe "tasks" do
-    before(:each) do
+    before do
       @location = "#{File.dirname(__FILE__)}/fixtures/task.thor"
       @original_yaml = {
         "random" => {
@@ -190,7 +190,7 @@ describe Thor::Runner do
     end
 
     describe "uninstall" do
-      before(:each) do
+      before do
         path = File.join(Thor::Util.thor_root, @original_yaml["random"][:filename])
         FileUtils.should_receive(:rm_rf).with(path)
       end
@@ -201,7 +201,7 @@ describe Thor::Runner do
     end
 
     describe "installed" do
-      before(:each) do
+      before do
         Dir.should_receive(:[]).and_return([])
       end
 
@@ -213,7 +213,7 @@ describe Thor::Runner do
     end
 
     describe "install/update" do
-      before(:each) do
+      before do
         FileUtils.stub!(:mkdir_p)
         FileUtils.stub!(:touch)
         $stdin.stub!(:gets).and_return("Y")

data/spec/shell/basic_spec.rb

@@ -120,8 +120,20 @@ describe Thor::Shell::Basic do
     end
   end
 
+  describe "#print_in_columns" do
+    before do
+      @array = [1234567890]
+      @array += ('a'..'e').to_a
+    end
+
+    it "prints in columns" do
+      content = capture(:stdout){ shell.print_in_columns(@array) }
+      content.rstrip.should == "1234567890  a           b           c           d           e"
+    end
+  end
+
   describe "#print_table" do
-    before(:each) do
+    before do
       @table = []
       @table << ["abc", "#123", "first three"]
       @table << ["", "#0", "empty"]

data/spec/spec_helper.rb

@@ -29,7 +29,7 @@ load File.join(File.dirname(__FILE__), "fixtures", "script.thor")
 load File.join(File.dirname(__FILE__), "fixtures", "invoke.thor")
 
 RSpec.configure do |config|
-  config.before :each do
+  config.before do
     ARGV.replace []
   end
 

data/spec/thor_spec.rb

@@ -247,7 +247,7 @@ describe Thor do
     end
 
     describe "on general" do
-      before(:each) do
+      before do
         @content = capture(:stdout){ MyScript.help(shell) }
       end
 

data/spec/util_spec.rb

@@ -119,7 +119,7 @@ describe Thor::Util do
   end
 
   describe "#user_home" do
-    before(:each) do
+    before do
       ENV.stub!(:[])
       Thor::Util.clear_user_home!
     end

metadata

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