josevalim-thor 0.10.22 → 0.10.23

data/lib/thor.rb

@@ -127,24 +127,21 @@ class Thor
     #   script.invoke(:task, first_arg, second_arg, third_arg)
     #
     def start(given_args=ARGV, config={})
-      config[:shell] ||= Thor::Base.shell.new
+      super do
+        meth = normalize_task_name(given_args.shift)
+        task = all_tasks[meth]
 
-      meth = normalize_task_name(given_args.shift)
-      task = all_tasks[meth]
+        if task
+          args, opts = Thor::Options.split(given_args)
+          config.merge!(:task_options => task.options)
+        else
+          args, opts = given_args, {}
+        end
 
-      if task
-        args, opts = Thor::Options.split(given_args)
-        config.merge!(:task_options => task.options)
-      else
-        args, opts = given_args, {}
+        task ||= Task.dynamic(meth)
+        trailing = args[Range.new(arguments.size, -1)]
+        new(args, opts, config).invoke(task, trailing || [])
       end
-
-      task ||= Task.dynamic(meth)
-      trailing = args[Range.new(arguments.size, -1)]
-
-      new(args, opts, config).invoke(task, trailing || [])
-    rescue Thor::Error => e
-      config[:shell].error e.message
     end
 
     # Prints help information. If a task name is given, it shows information

data/lib/thor/base.rb

@@ -341,6 +341,19 @@ class Thor
         end
       end
 
+      # Default way to start generators from the command line.
+      #
+      def start(given_args=ARGV, config={}) #:nodoc:
+        config[:shell] ||= Thor::Base.shell.new
+        yield
+      rescue Thor::Error => e
+        if given_args.include?("--debug")
+          raise e
+        else
+          config[:shell].error e.message
+        end
+      end
+
       protected
 
         # Prints the class options per group. If an option does not belong to

data/lib/thor/group.rb

@@ -22,17 +22,15 @@ class Thor::Group
     # inside the class.
     #
     def start(given_args=ARGV, config={})
-      config[:shell] ||= Thor::Base.shell.new
+      super do
+        if Thor::HELP_MAPPINGS.include?(given_args.first)
+          help(config[:shell])
+          return
+        end
 
-      if Thor::HELP_MAPPINGS.include?(given_args.first)
-        help(config[:shell])
-        return
+        args, opts = Thor::Options.split(given_args)
+        new(args, opts, config).invoke
       end
-
-      args, opts = Thor::Options.split(given_args)
-      new(args, opts, config).invoke
-    rescue Thor::Error => e
-      config[:shell].error e.message
     end
 
     # Prints help information.

data/lib/thor/shell.rb

@@ -1,11 +1,11 @@
-require 'thor/shell/basic'
+require 'thor/shell/color'
 
 class Thor
   module Base
-    # Returns the shell used in all Thor classes.
+    # Returns the shell used in all Thor classes. Default to color one.
     #
     def self.shell
-      @shell || Thor::Shell::Basic
+      @shell ||= Thor::Shell::Color
     end
 
     # Sets the shell used in all Thor classes.

data/lib/thor/shell/basic.rb

@@ -3,7 +3,19 @@ require 'tempfile'
 class Thor
   module Shell
     class Basic
-      attr_accessor :base
+      attr_accessor :base, :padding
+
+      # Initialize base and padding to nil.
+      #
+      def initialize #:nodoc:
+        @base, @padding = nil, 0
+      end
+
+      # Do not allow padding to be less than zero.
+      #
+      def padding=(value) #:nodoc:
+        @padding = [0, value].max
+      end
 
       # Ask something to the user and receives a response.
       #
@@ -22,14 +34,16 @@ class Thor
       # ==== Example
       # say("I know you knew that.")
       #
-      def say(statement="", color=nil, force_new_line=false)
-        statement = statement.to_s
+      def say(message="", color=nil, force_new_line=false)
+        message  = message.to_s
+        new_line = force_new_line || !(message[-1, 1] == " " || message[-1, 1] == "\t")
+        message  = set_color(message, color) if color
 
-        if !force_new_line && (statement[-1, 1] == " " || statement[-1, 1] == "\t")
-          $stdout.print(statement)
-          $stdout.flush
+        if new_line
+          $stdout.puts(message)
         else
-          $stdout.puts(statement)
+          $stdout.print(message)
+          $stdout.flush
         end
       end
 
@@ -38,11 +52,14 @@ class Thor
       # in log_status, avoiding the message from being shown. If a Symbol is
       # given in log_status, it's used as the color.
       #
-      def say_status(status, message, log_status=true)
-        return if base && base.options[:quiet]
-
-        color = log_status.is_a?(Symbol) ? log_status : :green
-        say "#{status.to_s.rjust(12)}  #{message}", color, true if log_status
+      def say_status(status, message, log_status=true) #:nodoc:
+        return if quiet? || log_status == false
+        spaces = "  " * (padding + 1)
+        color  = log_status.is_a?(Symbol) ? log_status : :green
+
+        status = status.to_s.rjust(12)
+        status = set_color status, color, true if color
+        say "#{status}#{spaces}#{message}", nil, true
       end
 
       # Make a question the to user and returns true if the user replies "y" or
@@ -160,6 +177,10 @@ class Thor
 
       protected
 
+        def set_color(string, color, bold=false)
+          string
+        end
+
         def is?(value)
           value = value.to_s
 
@@ -182,6 +203,8 @@ HELP
         end
 
         def show_diff(destination, content)
+          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
@@ -189,8 +212,8 @@ HELP
           end
         end
 
-        def diff_cmd
-          ENV['THOR_DIFF'] || ENV['RAILS_DIFF'] || 'diff -u'
+        def quiet?
+          base && base.options[:quiet]
         end
 
     end

data/lib/thor/shell/color.rb

@@ -0,0 +1,106 @@
+require 'thor/shell/basic'
+
+class Thor
+  module Shell
+    # Set color in the output. Got color values from HighLine.
+    #
+    class Color < Basic
+      # Embed in a String to clear all previous ANSI sequences.
+      CLEAR      = "\e[0m"
+      # The start of an ANSI bold sequence.
+      BOLD       = "\e[1m"
+
+      # Set the terminal's foreground ANSI color to black.
+      BLACK      = "\e[30m"
+      # Set the terminal's foreground ANSI color to red.
+      RED        = "\e[31m"
+      # Set the terminal's foreground ANSI color to green.
+      GREEN      = "\e[32m"
+      # Set the terminal's foreground ANSI color to yellow.
+      YELLOW     = "\e[33m"
+      # Set the terminal's foreground ANSI color to blue.
+      BLUE       = "\e[34m"
+      # Set the terminal's foreground ANSI color to magenta.
+      MAGENTA    = "\e[35m"
+      # Set the terminal's foreground ANSI color to cyan.
+      CYAN       = "\e[36m"
+      # Set the terminal's foreground ANSI color to white.
+      WHITE      = "\e[37m"
+
+      # Set the terminal's background ANSI color to black.
+      ON_BLACK   = "\e[40m"
+      # Set the terminal's background ANSI color to red.
+      ON_RED     = "\e[41m"
+      # Set the terminal's background ANSI color to green.
+      ON_GREEN   = "\e[42m"
+      # Set the terminal's background ANSI color to yellow.
+      ON_YELLOW  = "\e[43m"
+      # Set the terminal's background ANSI color to blue.
+      ON_BLUE    = "\e[44m"
+      # Set the terminal's background ANSI color to magenta.
+      ON_MAGENTA = "\e[45m"
+      # Set the terminal's background ANSI color to cyan.
+      ON_CYAN    = "\e[46m"
+      # Set the terminal's background ANSI color to white.
+      ON_WHITE   = "\e[47m"
+
+      protected
+
+        # Set color by using a string or one of the defined constants. Based
+        # on Highline implementation. CLEAR is automatically be embedded to
+        # the end of the returned String.
+        #
+        def set_color(string, color, bold=false)
+          color = self.class.const_get(color.to_s.upcase) if color.is_a?(Symbol)
+          bold  = bold ? BOLD : ""
+          "#{bold}#{color}#{string}#{CLEAR}"
+        end
+
+        # Overwrite show_diff to show diff with colors if Diff::LCS is
+        # available.
+        #
+        def show_diff(destination, content)
+          if diff_lcs_loaded?
+            actual  = File.read(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
+          end
+        end
+
+        def output_diff_line(diff)
+          case diff.action
+            when '-'
+              say "- #{diff.old_element.chomp}", :red
+            when '+'
+              say "+ #{diff.new_element.chomp}", :green
+            when '!'
+              say "- #{diff.old_element.chomp}", :red
+              say "+ #{diff.new_element.chomp}", :green
+            else
+              say "  #{diff.old_element.chomp}"
+          end
+        end
+
+        # Check if Diff::LCS is loaded. If it is, use it to create pretty output
+        # for diff.
+        #
+        def diff_lcs_loaded?
+          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
+        end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.22
+  version: 0.10.23
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-01 00:00:00 -07:00
+date: 2009-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -51,6 +51,7 @@ files:
 - lib/thor/parser.rb
 - lib/thor/shell
 - lib/thor/shell/basic.rb
+- lib/thor/shell/color.rb
 - lib/thor/invocation.rb
 - lib/thor/parser
 - lib/thor/parser/argument.rb