thor 0.16.0 → 1.2.1

data/lib/thor/shell/html.rb

@@ -1,4 +1,4 @@
-require 'thor/shell/basic'
+require_relative "basic"
 
 class Thor
   module Shell
@@ -10,38 +10,38 @@ class Thor
       BOLD       = "font-weight: bold"
 
       # Set the terminal's foreground HTML color to black.
-      BLACK      = 'color: black'
+      BLACK      = "color: black"
       # Set the terminal's foreground HTML color to red.
-      RED        = 'color: red'
+      RED        = "color: red"
       # Set the terminal's foreground HTML color to green.
-      GREEN      = 'color: green'
+      GREEN      = "color: green"
       # Set the terminal's foreground HTML color to yellow.
-      YELLOW     = 'color: yellow'
+      YELLOW     = "color: yellow"
       # Set the terminal's foreground HTML color to blue.
-      BLUE       = 'color: blue'
+      BLUE       = "color: blue"
       # Set the terminal's foreground HTML color to magenta.
-      MAGENTA    = 'color: magenta'
+      MAGENTA    = "color: magenta"
       # Set the terminal's foreground HTML color to cyan.
-      CYAN       = 'color: cyan'
+      CYAN       = "color: cyan"
       # Set the terminal's foreground HTML color to white.
-      WHITE      = 'color: white'
+      WHITE      = "color: white"
 
       # Set the terminal's background HTML color to black.
-      ON_BLACK   = 'background-color: black'
+      ON_BLACK   = "background-color: black"
       # Set the terminal's background HTML color to red.
-      ON_RED     = 'background-color: red'
+      ON_RED     = "background-color: red"
       # Set the terminal's background HTML color to green.
-      ON_GREEN   = 'background-color: green'
+      ON_GREEN   = "background-color: green"
       # Set the terminal's background HTML color to yellow.
-      ON_YELLOW  = 'background-color: yellow'
+      ON_YELLOW  = "background-color: yellow"
       # Set the terminal's background HTML color to blue.
-      ON_BLUE    = 'background-color: blue'
+      ON_BLUE    = "background-color: blue"
       # Set the terminal's background HTML color to magenta.
-      ON_MAGENTA = 'background-color: magenta'
+      ON_MAGENTA = "background-color: magenta"
       # Set the terminal's background HTML color to cyan.
-      ON_CYAN    = 'background-color: cyan'
+      ON_CYAN    = "background-color: cyan"
       # Set the terminal's background HTML color to white.
-      ON_WHITE   = 'background-color: white'
+      ON_WHITE   = "background-color: white"
 
       # Set color by using a string or one of the defined constants. If a third
       # option is set to true, it also adds bold to the string. This is based
@@ -51,13 +51,13 @@ class Thor
       def set_color(string, *colors)
         if colors.all? { |color| color.is_a?(Symbol) || color.is_a?(String) }
           html_colors = colors.map { |color| lookup_color(color) }
-          "<span style=\"#{html_colors.join("; ")};\">#{string}</span>"
+          "<span style=\"#{html_colors.join('; ')};\">#{Thor::Util.escape_html(string)}</span>"
         else
           color, bold = colors
           html_color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
           styles = [html_color]
           styles << BOLD if bold
-          "<span style=\"#{styles.join("; ")};\">#{string}</span>"
+          "<span style=\"#{styles.join('; ')};\">#{Thor::Util.escape_html(string)}</span>"
         end
       end
 
@@ -67,57 +67,60 @@ class Thor
       # ask("What is your name?")
       #
       # TODO: Implement #ask for Thor::Shell::HTML
-      def ask(statement, color=nil)
+      def ask(statement, color = nil)
         raise NotImplementedError, "Implement #ask for Thor::Shell::HTML"
       end
 
-      protected
+    protected
 
-        # Overwrite show_diff to show diff with colors if Diff::LCS is
-        # available.
-        #
-        def show_diff(destination, content) #:nodoc:
-          if diff_lcs_loaded? && ENV['THOR_DIFF'].nil? && ENV['RAILS_DIFF'].nil?
-            actual  = File.binread(destination).to_s.split("\n")
-            content = content.to_s.split("\n")
+      def can_display_colors?
+        true
+      end
+
+      # Overwrite show_diff to show diff with colors if Diff::LCS is
+      # available.
+      #
+      def show_diff(destination, content) #:nodoc:
+        if diff_lcs_loaded? && ENV["THOR_DIFF"].nil? && ENV["RAILS_DIFF"].nil?
+          actual  = File.binread(destination).to_s.split("\n")
+          content = content.to_s.split("\n")
 
-            Diff::LCS.sdiff(actual, content).each do |diff|
-              output_diff_line(diff)
-            end
-          else
-            super
+          Diff::LCS.sdiff(actual, content).each do |diff|
+            output_diff_line(diff)
           end
+        else
+          super
         end
+      end
 
-        def output_diff_line(diff) #:nodoc:
-          case diff.action
-            when '-'
-              say "- #{diff.old_element.chomp}", :red, true
-            when '+'
-              say "+ #{diff.new_element.chomp}", :green, true
-            when '!'
-              say "- #{diff.old_element.chomp}", :red, true
-              say "+ #{diff.new_element.chomp}", :green, true
-            else
-              say "  #{diff.old_element.chomp}", nil, true
-          end
+      def output_diff_line(diff) #:nodoc:
+        case diff.action
+        when "-"
+          say "- #{diff.old_element.chomp}", :red, true
+        when "+"
+          say "+ #{diff.new_element.chomp}", :green, true
+        when "!"
+          say "- #{diff.old_element.chomp}", :red, true
+          say "+ #{diff.new_element.chomp}", :green, true
+        else
+          say "  #{diff.old_element.chomp}", nil, true
         end
+      end
 
-        # Check if Diff::LCS is loaded. If it is, use it to create pretty output
-        # for diff.
-        #
-        def diff_lcs_loaded? #:nodoc:
-          return true  if defined?(Diff::LCS)
-          return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
+      # Check if Diff::LCS is loaded. If it is, use it to create pretty output
+      # for diff.
+      #
+      def diff_lcs_loaded? #:nodoc:
+        return true if defined?(Diff::LCS)
+        return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
 
-          @diff_lcs_loaded = begin
-            require 'diff/lcs'
-            true
-          rescue LoadError
-            false
-          end
+        @diff_lcs_loaded = begin
+          require "diff/lcs"
+          true
+        rescue LoadError
+          false
         end
-
+      end
     end
   end
 end

data/lib/thor/shell.rb

@@ -1,33 +1,32 @@
-require 'rbconfig'
+require "rbconfig"
 
 class Thor
   module Base
-    # Returns the shell used in all Thor classes. If you are in a Unix platform
-    # it will use a colored log, otherwise it will use a basic one without color.
-    #
-    def self.shell
-      @shell ||= if ENV['THOR_SHELL'] && ENV['THOR_SHELL'].size > 0
-        Thor::Shell.const_get(ENV['THOR_SHELL'])
-      elsif ((RbConfig::CONFIG['host_os'] =~ /mswin|mingw/) && !(ENV['ANSICON']))
-        Thor::Shell::Basic
-      else
-        Thor::Shell::Color
-      end
-    end
+    class << self
+      attr_writer :shell
 
-    # Sets the shell used in all Thor classes.
-    #
-    def self.shell=(klass)
-      @shell = klass
+      # Returns the shell used in all Thor classes. If you are in a Unix platform
+      # it will use a colored log, otherwise it will use a basic one without color.
+      #
+      def shell
+        @shell ||= if ENV["THOR_SHELL"] && !ENV["THOR_SHELL"].empty?
+          Thor::Shell.const_get(ENV["THOR_SHELL"])
+        elsif RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ && !ENV["ANSICON"]
+          Thor::Shell::Basic
+        else
+          Thor::Shell::Color
+        end
+      end
     end
   end
 
   module Shell
-    SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_status, :print_in_columns, :print_table, :print_wrapped, :file_collision, :terminal_width]
+    SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_error, :say_status, :print_in_columns, :print_table, :print_wrapped, :file_collision, :terminal_width]
+    attr_writer :shell
 
-    autoload :Basic, 'thor/shell/basic'
-    autoload :Color, 'thor/shell/color'
-    autoload :HTML,  'thor/shell/html'
+    autoload :Basic, File.expand_path("shell/basic", __dir__)
+    autoload :Color, File.expand_path("shell/color", __dir__)
+    autoload :HTML,  File.expand_path("shell/html", __dir__)
 
     # Add shell to initialize config values.
     #
@@ -42,10 +41,10 @@ class Thor
     #
     #   MyScript.new [1.0], { :foo => :bar }, :shell => Thor::Shell::Basic.new
     #
-    def initialize(args=[], options={}, config={})
+    def initialize(args = [], options = {}, config = {})
       super
       self.shell = config[:shell]
-      self.shell.base ||= self if self.shell.respond_to?(:base)
+      shell.base ||= self if shell.respond_to?(:base)
     end
 
     # Holds the shell for the given Thor instance. If no shell is given,
@@ -54,14 +53,9 @@ class Thor
       @shell ||= Thor::Base.shell.new
     end
 
-    # Sets the shell for this thor class.
-    def shell=(shell)
-      @shell = shell
-    end
-
     # Common methods that are delegated to the shell.
     SHELL_DELEGATED_METHODS.each do |method|
-      module_eval <<-METHOD, __FILE__, __LINE__
+      module_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{method}(*args,&block)
           shell.#{method}(*args,&block)
         end
@@ -76,13 +70,12 @@ class Thor
       shell.padding -= 1
     end
 
-    protected
-
-      # Allow shell to be shared between invocations.
-      #
-      def _shared_configuration #:nodoc:
-        super.merge!(:shell => self.shell)
-      end
+  protected
 
+    # Allow shell to be shared between invocations.
+    #
+    def _shared_configuration #:nodoc:
+      super.merge!(:shell => shell)
+    end
   end
 end