josevalim-thor 0.10.5 → 0.10.6

data/lib/thor/actions.rb

@@ -53,8 +53,15 @@ class Thor
           :invoke
       end
 
-      self.root = config[:root]
       super
+
+      self.root = config[:root]
+
+      # For last, invoke source root to allow the result to be cached. This is
+      # needed because source root depends on the file location (__FILE__) which
+      # returns the wrong value if invoked after FileUtils#cd.
+      #
+      self.source_root if self.class.respond_to?(:source_root)
     end
 
     # Wraps an action object and call it accordingly to the thor class behavior.

data/lib/thor/group.rb

@@ -47,10 +47,10 @@ class Thor::Group
     #
     def help(shell, options={})
       if options[:short]
-        shell.say "#{self.namespace} #{self.arguments.map {|o| o.usage }.join(' ')}"
+        shell.say banner
       else
         shell.say "Usage:"
-        shell.say "  #{self.namespace} #{self.arguments.map {|o| o.usage }.join(' ')}"
+        shell.say "  #{banner}"
         shell.say
         class_options_help(shell)
         shell.say self.desc if self.desc
@@ -59,6 +59,13 @@ class Thor::Group
 
     protected
 
+      # The banner for this class. You can customize it if you are invoking the
+      # thor class by another means which is not the Thor::Runner.
+      #
+      def banner #:nodoc:
+        "#{self.namespace} #{self.arguments.map {|o| o.usage }.join(' ')}"
+      end
+
       def baseclass #:nodoc:
         Thor::Group
       end

data/lib/thor.rb

@@ -157,13 +157,13 @@ class Thor
         raise UndefinedTaskError, "task '#{meth}' could not be found in namespace '#{self.namespace}'" unless task
 
         shell.say "Usage:"
-        shell.say "  #{task.formatted_usage(self, options[:namespace])}"
+        shell.say "  #{banner(task, options[:namespace])}"
         shell.say
         class_options_help(shell, "Class")
         shell.say task.description
       else
         list = (options[:short] ? tasks : all_tasks).map do |_, task|
-          [ task.formatted_usage(self, options[:namespace]), task.short_description || '' ]
+          [ banner(task, options[:namespace]), task.short_description || '' ]
         end
 
         if options[:short]
@@ -180,6 +180,15 @@ class Thor
 
     protected
 
+      # The banner for this class. You can customize it if you are invoking the
+      # thor class by another means which is not the Thor::Runner. It receives
+      # the task that is going to be invoked and if the namespace should be
+      # displayed.
+      #
+      def banner(task, namespace=true) #:nodoc:
+        task.formatted_usage(self, namespace)
+      end
+
       def baseclass #:nodoc:
         Thor
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors: 
 - Yehuda Katz