thor 0.13.6 → 0.13.7

data/CHANGELOG.rdoc

@@ -1,8 +1,8 @@
 == 0.13, released 2010-02-03
 
-* Several bug fixes
+* Added Thor::Shell::HTML
 * Decoupled Thor::Group and Thor, so it's easier to vendor
-* Added check_unknown_options! in case you want error messages to be raised in valid switches.
+* Added check_unknown_options! in case you want error messages to be raised in valid switches
 * run(command) should return the results of command
 
 == 0.12, released 2010-01-02

data/lib/thor.rb

@@ -1,6 +1,5 @@
 require 'thor/base'
 
-# TODO: Update thor to allow for git-style CLI (git bisect run)
 class Thor
   class << self
     # Sets the default task when thor is executed without an explicit task to be called.
@@ -35,6 +34,20 @@ class Thor
       end
     end
 
+    # Defines the long description of the next task.
+    #
+    # ==== Parameters
+    # long description<String>
+    #
+    def long_desc(long_description, options={})
+      if options[:for]
+        task = find_and_refresh_task(options[:for])
+        task.long_description = long_description if long_description
+      else
+        @long_desc = long_description
+      end
+    end
+
     # Maps an input to a task. If you define:
     #
     #   map "-T" => "list"
@@ -121,8 +134,17 @@ class Thor
     #   script.invoke(:task, first_arg, second_arg, third_arg)
     #
     def start(original_args=ARGV, config={})
+      @@original_args = original_args
       super do |given_args|
-        meth = normalize_task_name(given_args.shift)
+        meth = given_args.first.to_s
+
+        if !meth.empty? && (map[meth] || meth !~ /^\-/)
+          given_args.shift
+        else
+          meth = nil
+        end
+
+        meth = normalize_task_name(meth)
         task = all_tasks[meth]
 
         if task
@@ -153,7 +175,12 @@ class Thor
       shell.say "  #{banner(task)}"
       shell.say
       class_options_help(shell, nil => task.options.map { |_, o| o })
-      shell.say task.description
+      if task.long_description
+        shell.say "Description:"
+        shell.print_wrapped(task.long_description, :ident => 2)
+      else
+        shell.say task.description
+      end
     end
 
     # Prints help information for this class.
@@ -161,8 +188,8 @@ class Thor
     # ==== Parameters
     # shell<Thor::Shell>
     #
-    def help(shell)
-      list = printable_tasks
+    def help(shell, subcommand = false)
+      list = printable_tasks(true, subcommand)
       Thor::Util.thor_classes_in(self).each do |klass|
         list += klass.printable_tasks(false)
       end
@@ -175,17 +202,24 @@ class Thor
     end
 
     # Returns tasks ready to be printed.
-    def printable_tasks(all=true)
+    def printable_tasks(all = true, subcommand = false)
       (all ? all_tasks : tasks).map do |_, task|
         item = []
-        item << banner(task)
+        item << banner(task, false, subcommand)
         item << (task.description ? "# #{task.description.gsub(/\s+/m,' ')}" : "")
         item
       end
     end
 
-    def handle_argument_error(task, error) #:nodoc:
-      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as #{task.formatted_usage(self, banner_base == "thor").inspect}."
+    def subcommands
+      @@subcommands ||= {}
+    end
+
+    def subcommand(subcommand, subcommand_class)
+      subcommand = subcommand.to_s
+      subcommands[subcommand] = subcommand_class
+      subcommand_class.subcommand_help subcommand
+      define_method(subcommand) { |*_| subcommand_class.start(subcommand_args) }
     end
 
     protected
@@ -195,8 +229,8 @@ class Thor
       # the task that is going to be invoked and a boolean which indicates if
       # the namespace should be displayed as arguments.
       #
-      def banner(task)
-        "#{banner_base} #{task.formatted_usage(self, banner_base == "thor")}"
+      def banner(task, namespace = nil, subcommand = false)
+        "#{$0} #{task.formatted_usage(self, $thor_runner, subcommand)}"
       end
 
       def baseclass #:nodoc:
@@ -205,8 +239,8 @@ class Thor
 
       def create_task(meth) #:nodoc:
         if @usage && @desc
-          tasks[meth.to_s] = Thor::Task.new(meth, @desc, @usage, method_options)
-          @usage, @desc, @method_options = nil
+          tasks[meth.to_s] = Thor::Task.new(meth, @desc, @long_desc, @usage, method_options)
+          @usage, @desc, @long_desc, @method_options = nil
           true
         elsif self.all_tasks[meth.to_s] || meth.to_sym == :method_missing
           true
@@ -227,10 +261,21 @@ class Thor
       # If a map can't be found use the sent name or the default task.
       #
       def normalize_task_name(meth) #:nodoc:
-        mapping = map[meth.to_s]
-        meth = mapping || meth || default_task
+        meth = map[meth.to_s] || meth || default_task
         meth.to_s.gsub('-','_') # treat foo-bar > foo_bar
       end
+
+      def subcommand_help(cmd)
+        desc "help [COMMAND]", "Describe subcommands or one specific subcommand"
+        class_eval <<-RUBY
+          def help(task = nil, subcommand = true); super; end
+        RUBY
+      end
+
+  end
+
+  def subcommand_args
+    @@original_args[1..-1]
   end
 
   include Thor::Base
@@ -238,7 +283,7 @@ class Thor
   map HELP_MAPPINGS => :help
 
   desc "help [TASK]", "Describe available tasks or one specific task"
-  def help(task=nil)
-    task ? self.class.task_help(shell, task) : self.class.help(shell)
+  def help(task = nil, subcommand = false)
+    task ? self.class.task_help(shell, task) : self.class.help(shell, subcommand)
   end
 end

data/lib/thor/actions.rb

@@ -190,12 +190,13 @@ class Thor
     #
     def apply(path, config={})
       verbose = config.fetch(:verbose, true)
-      path    = find_in_source_paths(path) unless path =~ /^http\:\/\//
+      is_uri  = path =~ /^https?\:\/\//
+      path    = find_in_source_paths(path) unless is_uri
 
       say_status :apply, path, verbose
       shell.padding += 1 if verbose
 
-      if URI(path).is_a?(URI::HTTP)
+      if is_uri
         contents = open(path, "Accept" => "application/x-thor-template") {|io| io.read }
       else
         contents = open(path) {|io| io.read }

data/lib/thor/actions/create_file.rb

@@ -20,7 +20,9 @@ class Thor
     #
     #   create_file "config/apach.conf", "your apache config"
     #
-    def create_file(destination, data=nil, config={}, &block)
+    def create_file(destination, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      data = args.first
       action CreateFile.new(self, destination, block || data.to_s, config)
     end
     alias :add_file :create_file

data/lib/thor/actions/directory.rb

@@ -40,7 +40,9 @@ class Thor
     #   directory "doc"
     #   directory "doc", "docs", :recursive => false
     #
-    def directory(source, destination=nil, config={}, &block)
+    def directory(source, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first || source
       action Directory.new(self, source, destination || source, config, &block)
     end
 

data/lib/thor/actions/file_manipulation.rb

@@ -18,8 +18,9 @@ class Thor
     #
     #   copy_file "doc/README"
     #
-    def copy_file(source, destination=nil, config={}, &block)
-      destination ||= source
+    def copy_file(source, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first || source
       source = File.expand_path(find_in_source_paths(source.to_s))
 
       create_file destination, nil, config do
@@ -46,7 +47,10 @@ class Thor
     #     content.split("\n").first
     #   end
     #
-    def get(source, destination=nil, config={}, &block)
+    def get(source, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first
+
       source = File.expand_path(find_in_source_paths(source.to_s)) unless source =~ /^http\:\/\//
       render = open(source) {|input| input.binmode.read }
 
@@ -74,8 +78,10 @@ class Thor
     #
     #   template "doc/README"
     #
-    def template(source, destination=nil, config={}, &block)
-      destination ||= source
+    def template(source, *args, &block)
+      config = args.last.is_a?(Hash) ? args.pop : {}
+      destination = args.first || source
+
       source  = File.expand_path(find_in_source_paths(source.to_s))
       context = instance_eval('binding')
 

data/lib/thor/base.rb

@@ -382,13 +382,17 @@ class Thor
       end
 
       def handle_no_task_error(task) #:nodoc:
-        if self.banner_base == "thor"
+        if $thor_runner
           raise UndefinedTaskError, "Could not find task #{task.inspect} in #{namespace.inspect} namespace."
         else
           raise UndefinedTaskError, "Could not find task #{task.inspect}."
         end
       end
 
+      def handle_argument_error(task, error) #:nodoc:
+        raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as #{self.banner(task).inspect}."
+      end
+
       protected
 
         # Prints the class options per group. If an option does not belong to
@@ -516,11 +520,6 @@ class Thor
           false
         end
 
-        # Returns the base for banner.
-        def banner_base
-          @banner_base ||= $thor_runner ? "thor" : File.basename($0.split(" ").first)
-        end
-
         # SIGNATURE: Sets the baseclass. This is where the superclass lookup
         # finishes.
         def baseclass #:nodoc:

data/lib/thor/core_ext/hash_with_indifferent_access.rb

@@ -65,7 +65,7 @@ class Thor
             else
               self[$1] == args.first
             end
-          else 
+          else
             self[method]
           end
         end

data/lib/thor/group.rb

@@ -228,7 +228,7 @@ class Thor::Group
       # The banner for this class. You can customize it if you are invoking the
       # thor class by another ways which is not the Thor::Runner.
       def banner
-        "#{banner_base} #{self_task.formatted_usage(self, false)}"
+        "#{$0} #{self_task.formatted_usage(self, false)}"
       end
 
       # Represents the whole class as a task.
@@ -241,7 +241,7 @@ class Thor::Group
       end
 
       def create_task(meth) #:nodoc:
-        tasks[meth.to_s] = Thor::Task.new(meth, nil, nil, nil)
+        tasks[meth.to_s] = Thor::Task.new(meth, nil, nil, nil, nil)
         true
       end
   end

data/lib/thor/parser/arguments.rb

@@ -51,6 +51,11 @@ class Thor
 
     private
 
+      def no_or_skip?(arg)
+        arg =~ /^--(no|skip)-([-\w]+)$/
+        $2
+      end
+
       def last?
         @pile.empty?
       end
@@ -114,7 +119,7 @@ class Thor
         array
       end
 
-      # Check if the peel is numeric ofrmat and return a Float or Integer.
+      # Check if the peek is numeric format and return a Float or Integer.
       # Otherwise raises an error.
       #
       def parse_numeric(name)
@@ -127,10 +132,16 @@ class Thor
         $&.index('.') ? shift.to_f : shift.to_i
       end
 
-      # Parse string, i.e., just return the current value in the pile.
+      # Parse string:
+      # for --string-arg, just return the current value in the pile
+      # for --no-string-arg, nil
       #
       def parse_string(name)
-        shift
+        if no_or_skip?(name)
+          nil
+        else
+          shift
+        end
       end
 
       # Raises an error if @non_assigned_required array is not empty.

data/lib/thor/parser/options.rb

@@ -124,11 +124,6 @@ class Thor
         end
       end
 
-      def no_or_skip?(arg)
-        arg =~ /^--(no|skip)-([-\w]+)$/
-        $2
-      end
-
       # Check if the given argument is actually a shortcut.
       #
       def normalize_switch(arg)

data/lib/thor/runner.rb

@@ -13,7 +13,7 @@ class Thor::Runner < Thor #:nodoc:
 
   # Override Thor#help so it can give information about any class and any method.
   #
-  def help(meth=nil)
+  def help(meth = nil)
     if meth && !self.respond_to?(meth)
       initialize_thorfiles(meth)
       klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
@@ -39,7 +39,7 @@ class Thor::Runner < Thor #:nodoc:
   def install(name)
     initialize_thorfiles
 
-    # If a directory name is provided as the argument, look for a 'main.thor' 
+    # If a directory name is provided as the argument, look for a 'main.thor'
     # task in said directory.
     begin
       if File.directory?(File.expand_path(name))
@@ -139,7 +139,7 @@ class Thor::Runner < Thor #:nodoc:
   end
 
   desc "list [SEARCH]", "List the available thor tasks (--substring means .*SEARCH)"
-  method_options :substring => :boolean, :group => :string, :all => :boolean
+  method_options :substring => :boolean, :group => :string, :all => :boolean, :debug => :boolean
   def list(search="")
     initialize_thorfiles
 
@@ -156,8 +156,8 @@ class Thor::Runner < Thor #:nodoc:
 
   private
 
-    def self.banner(task)
-      "thor " + task.formatted_usage(self, false)
+    def self.banner(task, all = false, subcommand = false)
+      "thor " + task.formatted_usage(self, all, subcommand)
     end
 
     def thor_root
@@ -199,7 +199,7 @@ class Thor::Runner < Thor #:nodoc:
     #
     def initialize_thorfiles(relevant_to=nil, skip_lookup=false)
       thorfiles(relevant_to, skip_lookup).each do |f|
-        Thor::Util.load_thorfile(f) unless Thor::Base.subclass_files.keys.include?(File.expand_path(f))
+        Thor::Util.load_thorfile(f, nil, options[:debug]) unless Thor::Base.subclass_files.keys.include?(File.expand_path(f))
       end
     end
 
@@ -267,16 +267,11 @@ class Thor::Runner < Thor #:nodoc:
       raise Error, "No Thor tasks available" if klasses.empty?
       show_modules if with_modules && !thor_yaml.empty?
 
-      # Remove subclasses
-      klasses.dup.each do |klass|
-        klasses -= Thor::Util.thor_classes_in(klass)
-      end
-
       list = Hash.new { |h,k| h[k] = [] }
       groups = klasses.select { |k| k.ancestors.include?(Thor::Group) }
 
       # Get classes which inherit from Thor
-      (klasses - groups).each { |k| list[k.namespace] += k.printable_tasks(false) }
+      (klasses - groups).each { |k| list[k.namespace.split(":").first] += k.printable_tasks(false) }
 
       # Get classes which inherit from Thor::Base
       groups.map! { |k| k.printable_tasks(false).first }

data/lib/thor/shell.rb

@@ -1,5 +1,4 @@
 require 'rbconfig'
-require 'thor/shell/color'
 
 class Thor
   module Base
@@ -7,7 +6,9 @@ class Thor
     # it will use a colored log, otherwise it will use a basic one without color.
     #
     def self.shell
-      @shell ||= if Config::CONFIG['host_os'] =~ /mswin|mingw/
+      @shell ||= if ENV['THOR_SHELL'] && ENV['THOR_SHELL'].size > 0
+        Thor::Shell.const_get(ENV['THOR_SHELL'])
+      elsif Config::CONFIG['host_os'] =~ /mswin|mingw/
         Thor::Shell::Basic
       else
         Thor::Shell::Color
@@ -24,6 +25,10 @@ class Thor
   module Shell
     SHELL_DELEGATED_METHODS = [:ask, :yes?, :no?, :say, :say_status, :print_table]
 
+    autoload :Basic, 'thor/shell/basic'
+    autoload :Color, 'thor/shell/color'
+    autoload :HTML,  'thor/shell/HTML'
+
     # Add shell to initialize config values.
     #
     # ==== Configuration

data/lib/thor/shell/basic.rb

@@ -42,8 +42,8 @@ class Thor
           $stdout.puts(message)
         else
           $stdout.print(message)
-          $stdout.flush
         end
+        $stdout.flush
       end
 
       # Say a status with the given color and appends the message. Since this
@@ -81,16 +81,20 @@ class Thor
       # Array[Array[String, String, ...]]
       #
       # ==== Options
-      # ident<Integer>:: Ident the first column by ident value.
+      # ident<Integer>:: Indent the first column by ident value.
+      # colwidth<Integer>:: Force the first column to colwidth spaces wide.
       #
       def print_table(table, options={})
         return if table.empty?
 
-        formats, ident = [], options[:ident].to_i
+        formats, ident, colwidth = [], options[:ident].to_i, options[:colwidth]
         options[:truncate] = terminal_width if options[:truncate] == true
 
-        0.upto(table.first.length - 2) do |i|
-          maxima = table.max{ |a,b| a[i].size <=> b[i].size }[i].size
+        formats << "%-#{colwidth + 2}s" if colwidth
+        start = colwidth ? 1 : 0
+
+        start.upto(table.first.length - 2) do |i|
+          maxima ||= table.max{|a,b| a[i].size <=> b[i].size }[i].size
           formats << "%-#{maxima + 2}s"
         end
 
@@ -105,7 +109,35 @@ class Thor
           end
 
           sentence = truncate(sentence, options[:truncate]) if options[:truncate]
-          $stdout.puts sentence  
+          $stdout.puts sentence
+        end
+      end
+
+      # Prints a long string, word-wrapping the text to the current width of the
+      # terminal display. Ideal for printing heredocs.
+      #
+      # ==== Parameters
+      # String
+      #
+      # ==== Options
+      # ident<Integer>:: Indent each line of the printed paragraph by ident value.
+      #
+      def print_wrapped(message, options={})
+        ident = options[:ident] || 0
+        width = terminal_width - ident
+        paras = message.split("\n\n")
+
+        paras.map! do |unwrapped|
+          unwrapped.strip.gsub(/\n/, " ").squeeze(" ").
+          gsub(/.{1,#{width}}(?:\s|\Z)/){($& + 5.chr).
+          gsub(/\n\005/,"\n").gsub(/\005/,"\n")}
+        end
+
+        paras.each do |para|
+          para.split("\n").each do |line|
+            $stdout.puts line.insert(0, " " * ident)
+          end
+          $stdout.puts unless para == paras.last
         end
       end
 

data/lib/thor/shell/html.rb

@@ -0,0 +1,121 @@
+require 'thor/shell/basic'
+
+class Thor
+  module Shell
+    # Inherit from Thor::Shell::Basic and add set_color behavior. Check
+    # Thor::Shell::Basic to see all available methods.
+    #
+    class HTML < Basic
+      # The start of an HTML bold sequence.
+      BOLD       = "<strong>"
+      # The end of an HTML bold sequence.
+      END_BOLD   = "</strong>"
+
+      # Embed in a String to clear previous color selection.
+      CLEAR      = "</span>"
+
+      # Set the terminal's foreground HTML color to black.
+      BLACK      = '<span style="color: black;">'
+      # Set the terminal's foreground HTML color to red.
+      RED        = '<span style="color: red;">'
+      # Set the terminal's foreground HTML color to green.
+      GREEN      = '<span style="color: green;">'
+      # Set the terminal's foreground HTML color to yellow.
+      YELLOW     = '<span style="color: yellow;">'
+      # Set the terminal's foreground HTML color to blue.
+      BLUE       = '<span style="color: blue;">'
+      # Set the terminal's foreground HTML color to magenta.
+      MAGENTA    = '<span style="color: magenta;">'
+      # Set the terminal's foreground HTML color to cyan.
+      CYAN       = '<span style="color: cyan;">'
+      # Set the terminal's foreground HTML color to white.
+      WHITE      = '<span style="color: white;">'
+
+      # Set the terminal's background HTML color to black.
+      ON_BLACK   = '<span style="background-color: black">'
+      # Set the terminal's background HTML color to red.
+      ON_RED     = '<span style="background-color: red">'
+      # Set the terminal's background HTML color to green.
+      ON_GREEN   = '<span style="background-color: green">'
+      # Set the terminal's background HTML color to yellow.
+      ON_YELLOW  = '<span style="background-color: yellow">'
+      # Set the terminal's background HTML color to blue.
+      ON_BLUE    = '<span style="background-color: blue">'
+      # Set the terminal's background HTML color to magenta.
+      ON_MAGENTA = '<span style="background-color: magenta">'
+      # Set the terminal's background HTML color to cyan.
+      ON_CYAN    = '<span style="background-color: cyan">'
+      # Set the terminal's background HTML color to white.
+      ON_WHITE   = '<span style="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
+      # on Highline implementation and it automatically appends CLEAR 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, end_bold = bold ? [BOLD, END_BOLD] : ['', '']
+        "#{bold}#{color}#{string}#{CLEAR}#{end_bold}"
+      end
+      
+      # Ask something to the user and receives a response.
+      #
+      # ==== Example
+      # ask("What is your name?")
+      #
+      # TODO: Implement #ask for Thor::Shell::HTML
+      def ask(statement, color=nil)
+        raise NotImplementedError, "Implement #ask for Thor::Shell::HTML"
+      end
+
+      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")
+
+            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
+        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?
+
+          @diff_lcs_loaded = begin
+            require 'diff/lcs'
+            true
+          rescue LoadError
+            false
+          end
+        end
+
+    end
+  end
+end

data/lib/thor/task.rb

@@ -1,11 +1,11 @@
 class Thor
-  class Task < Struct.new(:name, :description, :usage, :options)
+  class Task < Struct.new(:name, :description, :long_description, :usage, :options)
     FILE_REGEXP = /^#{Regexp.escape(File.dirname(__FILE__))}/
 
     # A dynamic task that handles method missing scenarios.
     class Dynamic < Task
       def initialize(name, options=nil)
-        super(name.to_s, "A dynamically-generated task", name.to_s, options)
+        super(name.to_s, "A dynamically-generated task", name.to_s, name.to_s, options)
       end
 
       def run(instance, args=[])
@@ -17,8 +17,8 @@ class Thor
       end
     end
 
-    def initialize(name, description, usage, options=nil)
-      super(name.to_s, description, usage, options || {})
+    def initialize(name, description, long_description, usage, options=nil)
+      super(name.to_s, description, long_description, usage, options || {})
     end
 
     def initialize_copy(other) #:nodoc:
@@ -39,18 +39,18 @@ class Thor
         instance.class.handle_no_task_error(name) : (raise e)
     end
 
-    # Returns the formatted usage by injecting given required arguments 
+    # Returns the formatted usage by injecting given required arguments
     # and required options into the given usage.
-    def formatted_usage(klass, namespace=true)
+    def formatted_usage(klass, namespace = true, subcommand = false)
       namespace = klass.namespace unless namespace == false
 
-      # Add namespace
-      formatted = if namespace
-        "#{namespace.gsub(/^(default|thor:runner:)/,'')}:"
-      else
-        ""
+      if namespace
+        formatted = "#{namespace.gsub(/^(default)/,'')}:"
+        formatted.sub!(/.$/, ' ') if subcommand
       end
 
+      formatted ||= ""
+
       # Add usage with required arguments
       formatted << if klass && !klass.arguments.empty?
         usage.to_s.gsub(/^#{name}/) do |match|
@@ -99,4 +99,4 @@ class Thor
       end
 
   end
-end
+end

data/lib/thor/util.rb

@@ -147,13 +147,18 @@ class Thor
     # Receives a path and load the thor file in the path. The file is evaluated
     # inside the sandbox to avoid namespacing conflicts.
     #
-    def self.load_thorfile(path, content=nil)
+    def self.load_thorfile(path, content=nil, debug=false)
       content ||= File.binread(path)
 
       begin
         Thor::Sandbox.class_eval(content, path)
       rescue Exception => e
         $stderr.puts "WARNING: unable to load thorfile #{path.inspect}: #{e.message}"
+        if debug
+          $stderr.puts *e.backtrace
+        else
+          $stderr.puts e.backtrace.first
+        end
       end
     end
 

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.13.6".freeze
+  VERSION = "0.13.7".freeze
 end

data/spec/actions_spec.rb

@@ -192,10 +192,28 @@ describe Thor::Actions do
         @foo = "FOO"
         say_status :cool, :padding
       TEMPLATE
-      @template.instance_eval "def read; self; end" # Make the string respond to read
+      @template.stub(:read).and_return(@template)
 
+      @file = '/'
+      runner.stub(:open).and_return(@template)
+    end
+
+    it "accepts a URL as the path" do
       @file = "http://gist.github.com/103208.txt"
       runner.should_receive(:open).with(@file, "Accept" => "application/x-thor-template").and_return(@template)
+      action(:apply, @file)
+    end
+
+    it "accepts a secure URL as the path" do
+      @file = "https://gist.github.com/103208.txt"
+      runner.should_receive(:open).with(@file, "Accept" => "application/x-thor-template").and_return(@template)
+      action(:apply, @file)
+    end
+
+    it "accepts a local file path with spaces" do
+      @file = File.expand_path("fixtures/path with spaces", File.dirname(__FILE__))
+      runner.should_receive(:open).with(@file).and_return(@template)
+      action(:apply, @file)
     end
 
     it "opens a file and executes its content in the instance binding" do

data/spec/base_spec.rb

@@ -176,8 +176,8 @@ describe Thor::Base do
     it "returns tracked subclasses, grouped by the files they come from" do
       thorfile = File.join(File.dirname(__FILE__), "fixtures", "script.thor")
       Thor::Base.subclass_files[File.expand_path(thorfile)].must == [
-        MyScript, MyScript::AnotherScript, MyChildScript, Scripts::MyScript,
-        Scripts::MyDefaults, Scripts::ChildDefault
+        MyScript, MyScript::AnotherScript, MyChildScript, Barn,
+        Scripts::MyScript, Scripts::MyDefaults, Scripts::ChildDefault
       ]
     end
 

data/spec/fixtures/script.thor

@@ -37,6 +37,7 @@ END
   end
 
   desc "example_default_task", "example!"
+  method_options :with => :string
   def example_default_task
     options.empty? ? "default task" : options
   end
@@ -52,6 +53,12 @@ END
   end
 
   desc "long_description", "a" * 80
+  long_desc <<-D
+    This is a really really really long description.
+    Here you go. So very long.
+
+    It even has two paragraphs.
+  D
   def long_description
   end
 
@@ -114,6 +121,17 @@ class MyChildScript < MyScript
   remove_task :boom, :undefine => true
 end
 
+class Barn < Thor
+  desc "open [ITEM]", "open the barn door"
+  def open(item = nil)
+    if item == "shotgun"
+      puts "That's going to leave a mark."
+    else
+      puts "Open sesame!"
+    end
+  end
+end
+
 module Scripts
   class MyScript < MyChildScript
     argument :accessor, :type => :string
@@ -136,6 +154,9 @@ module Scripts
     def task_conflict
       puts "task"
     end
+
+    desc "barn", "commands to manage the barn"
+    subcommand "barn", Barn
   end
 
   class ChildDefault < Thor

data/spec/parser/options_spec.rb

@@ -176,6 +176,11 @@ describe Thor::Options do
         parse("--no-foo")["foo"].must be_nil
       end
 
+      it "does not consume an argument for --no-switch format" do
+        create "--cheese" => :string
+        parse('burger', '--no-cheese', 'fries')["cheese"].must be_nil
+      end
+
       it "accepts a --switch format on non required types" do
         create "--foo" => :string
         parse("--foo")["foo"].must == "foo"

data/spec/runner_spec.rb

@@ -85,7 +85,7 @@ describe Thor::Runner do
     it "does not swallow Thor InvocationError" do
       ARGV.replace ["my_script:animal"]
       content = capture(:stderr) { Thor::Runner.start }
-      content.strip.must == '"animal" was called incorrectly. Call as "my_script:animal TYPE".'
+      content.strip.must == '"animal" was called incorrectly. Call as "thor my_script:animal TYPE".'
     end
   end
 

data/spec/shell/basic_spec.rb

@@ -129,6 +129,15 @@ TABLE
   abc  #123  firs...
        #0    empty
   xyz  #786  last...
+TABLE
+    end
+
+    it "honors the colwidth option" do
+      content = capture(:stdout){ shell.print_table(@table, :colwidth => 10)}
+      content.must == <<-TABLE
+abc         #123  first three
+            #0    empty
+xyz         #786  last three
 TABLE
     end
   end

data/spec/shell/html_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Thor::Shell::HTML do
+  def shell
+    @shell ||= Thor::Shell::HTML.new
+  end
+
+  describe "#say" do
+    it "set the color if specified" do
+      $stdout.should_receive(:puts).with('<span style="color: green;">Wow! Now we have colors!</span>')
+      shell.say "Wow! Now we have colors!", :green
+    end
+
+    it "does not use a new line even with colors" do
+      $stdout.should_receive(:print).with('<span style="color: green;">Wow! Now we have colors! </span>')
+      shell.say "Wow! Now we have colors! ", :green
+    end
+  end
+
+  describe "#say_status" do
+    it "uses color to say status" do
+      $stdout.should_receive(:puts).with('<strong><span style="color: red;">    conflict</span></strong>  README')
+      shell.say_status :conflict, "README", :red
+    end
+  end
+
+end

data/spec/shell_spec.rb

@@ -21,6 +21,18 @@ describe Thor::Shell do
     it "returns the shell in use" do
       MyCounter.new([1,2]).shell.must be_kind_of(Thor::Base.shell)
     end
+    
+    it "uses $THOR_SHELL" do
+      class Thor::Shell::TestShell < Thor::Shell::Basic; end
+      
+      Thor::Base.shell.must == shell.class
+      ENV['THOR_SHELL'] = 'TestShell'
+      Thor::Base.shell = nil
+      Thor::Base.shell.must == Thor::Shell::TestShell
+      ENV['THOR_SHELL'] = ''
+      Thor::Base.shell = shell.class
+      Thor::Base.shell.must == shell.class
+    end
   end
 
   describe "with_padding" do
@@ -31,4 +43,5 @@ describe Thor::Shell do
       end
     end
   end
+  
 end

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ load File.join(File.dirname(__FILE__), "fixtures", "script.thor")
 load File.join(File.dirname(__FILE__), "fixtures", "invoke.thor")
 
 # Set shell to basic
+$0 = "thor"
 Thor::Base.shell = Thor::Shell::Basic
 
 Kernel.module_eval do

data/spec/task_spec.rb

@@ -6,7 +6,7 @@ describe Thor::Task do
       options[key] = Thor::Option.parse(key, value)
     end
 
-    @task ||= Thor::Task.new(:can_has, "I can has cheezburger", "can_has", options)
+    @task ||= Thor::Task.new(:can_has, "I can has cheezburger", "I can has cheezburger\nLots and lots of it", "can_has", options)
   end
 
   describe "#formatted_usage" do
@@ -46,7 +46,7 @@ describe Thor::Task do
 
   describe "#dup" do
     it "dup options hash" do
-      task = Thor::Task.new("can_has", nil, nil, :foo => true, :bar => :required)
+      task = Thor::Task.new("can_has", nil, nil, nil, :foo => true, :bar => :required)
       task.dup.options.delete(:foo)
       task.options[:foo].must_not be_nil
     end

data/spec/thor_spec.rb

@@ -41,6 +41,10 @@ describe Thor do
       MyScript.start([]).must == "default task"
     end
 
+    it "invokes the default task if no command is specified even if switches are given" do
+      MyScript.start(["--with", "option"]).must == {"with"=>"option"}
+    end
+
     it "inherits the default task from parent" do
       MyChildScript.default_task.must == "example_default_task"
     end
@@ -112,7 +116,7 @@ describe Thor do
     end
 
     it "raises an error if a required param is not provided" do
-      capture(:stderr) { MyScript.start(["animal"]) }.strip.must == '"animal" was called incorrectly. Call as "my_script:animal TYPE".'
+      capture(:stderr) { MyScript.start(["animal"]) }.strip.must == '"animal" was called incorrectly. Call as "thor my_script:animal TYPE".'
     end
 
     it "raises an error if the invoked task does not exist" do
@@ -137,6 +141,21 @@ describe Thor do
     end
   end
 
+  describe "#subcommand" do
+    it "maps a given subcommand to another Thor subclass" do
+      barn_help = capture(:stdout){ Scripts::MyDefaults.start(["barn"]) }
+      barn_help.must include("barn help [COMMAND]  # Describe subcommands or one specific subcommand")
+    end
+
+    it "passes commands to subcommand classes" do
+      capture(:stdout){ Scripts::MyDefaults.start(["barn", "open"]) }.strip.must == "Open sesame!"
+    end
+
+    it "passes arguments to subcommand classes" do
+      capture(:stdout){ Scripts::MyDefaults.start(["barn", "open", "shotgun"]) }.strip.must == "That's going to leave a mark."
+    end
+  end
+
   describe "#help" do
     def shell
       @shell ||= Thor::Base.shell.new
@@ -184,7 +203,7 @@ describe Thor do
 
     describe "for a specific task" do
       it "provides full help info when talking about a specific task" do
-        capture(:stdout) { MyScript.task_help(shell, "foo") }.must == <<END
+        capture(:stdout) { MyScript.task_help(shell, "foo") }.must == <<-END
 Usage:
   thor my_script:foo BAR
 
@@ -206,6 +225,24 @@ END
       it "normalizes names before claiming they don't exist" do
         capture(:stdout) { MyScript.task_help(shell, "name-with-dashes") }.must =~ /thor my_script:name-with-dashes/
       end
+
+      it "uses the long description if it exists" do
+        capture(:stdout) { MyScript.task_help(shell, "long_description") }.must == <<-HELP
+Usage:
+  thor my_script:long_description
+
+Description:
+  This is a really really really long description. Here you go. So very long.
+
+  It even has two paragraphs.
+HELP
+      end
+
+      it "doesn't assign the long description to the next task without one" do
+        capture(:stdout) do
+          MyScript.task_help(shell, "name_with_dashes")
+        end.must_not =~ /so very long/i
+      end
     end
 
     describe "instance method" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 13
-  - 6
-  version: 0.13.6
+  - 7
+  version: 0.13.7
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 +02:00
+date: 2010-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -62,9 +63,47 @@ files:
 - lib/thor/shell.rb
 - lib/thor/shell/basic.rb
 - lib/thor/shell/color.rb
+- lib/thor/shell/html.rb
 - lib/thor/task.rb
 - lib/thor/util.rb
 - lib/thor/version.rb
+- spec/actions/create_file_spec.rb
+- spec/actions/directory_spec.rb
+- spec/actions/empty_directory_spec.rb
+- spec/actions/file_manipulation_spec.rb
+- spec/actions/inject_into_file_spec.rb
+- spec/actions_spec.rb
+- spec/base_spec.rb
+- spec/core_ext/hash_with_indifferent_access_spec.rb
+- spec/core_ext/ordered_hash_spec.rb
+- spec/fixtures/application.rb
+- spec/fixtures/bundle/execute.rb
+- spec/fixtures/doc/config.rb
+- spec/group_spec.rb
+- spec/invocation_spec.rb
+- spec/parser/argument_spec.rb
+- spec/parser/arguments_spec.rb
+- spec/parser/option_spec.rb
+- spec/parser/options_spec.rb
+- spec/rake_compat_spec.rb
+- spec/runner_spec.rb
+- spec/shell/basic_spec.rb
+- spec/shell/color_spec.rb
+- spec/shell/html_spec.rb
+- spec/shell_spec.rb
+- spec/spec_helper.rb
+- spec/task_spec.rb
+- spec/thor_spec.rb
+- spec/util_spec.rb
+- spec/fixtures/bundle/main.thor
+- spec/fixtures/doc/%file_name%.rb.tt
+- spec/fixtures/doc/README
+- spec/fixtures/group.thor
+- spec/fixtures/invoke.thor
+- spec/fixtures/path with spaces
+- spec/fixtures/script.thor
+- spec/fixtures/task.thor
+- spec/spec.opts
 has_rdoc: true
 homepage: http://yehudakatz.com
 licenses: []
@@ -75,23 +114,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: textmate
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A scripting framework that replaces rake, sake and rubigen
@@ -118,6 +161,7 @@ test_files:
 - spec/runner_spec.rb
 - spec/shell/basic_spec.rb
 - spec/shell/color_spec.rb
+- spec/shell/html_spec.rb
 - spec/shell_spec.rb
 - spec/spec_helper.rb
 - spec/task_spec.rb
@@ -128,6 +172,7 @@ test_files:
 - spec/fixtures/doc/README
 - spec/fixtures/group.thor
 - spec/fixtures/invoke.thor
+- spec/fixtures/path with spaces
 - spec/fixtures/script.thor
 - spec/fixtures/task.thor
 - spec/spec.opts