josevalim-thor 0.10.12 → 0.10.13

data/lib/thor/actions.rb

@@ -5,6 +5,11 @@ Dir[File.join(File.dirname(__FILE__), "actions", "*.rb")].each do |action|
 end
 
 class Thor
+  # Some actions require that a class method called source root is defined in
+  # the class. Remember to always cache the source root value, because Ruby
+  # __FILE__ always return the relative path, which may lead to mistakes if you
+  # are calling an action inside the "inside(path)" method.
+  #
   module Actions
     attr_accessor :behavior
 

data/lib/thor/base.rb

@@ -65,9 +65,14 @@ class Thor
 
       # Whenever a class inherits from Thor or Thor::Group, we should track the
       # class and the file on Thor::Base. This is the method responsable for it.
+      # Also invoke the source_root if the klass respond to it. This is needed
+      # to ensure that the source_root does not change after FileUtils#cd is
+      # called.
       #
       def register_klass_file(klass) #:nodoc:
         file = caller[1].match(/(.*):\d+/)[1]
+
+        klass.source_root if klass.respond_to?(:source_root)
         Thor::Base.subclasses << klass unless Thor::Base.subclasses.include?(klass)
 
         file_subclasses = Thor::Base.subclass_files[File.expand_path(file)]
@@ -434,13 +439,10 @@ class Thor
         end
 
         # Everytime someone inherits from a Thor class, register the klass
-        # and file into baseclass. Also invoke the source_root if the klass
-        # respond to it. This is needed to ensure that the source_root does 
-        # not change after FileUtils#cd is called.
+        # and file into baseclass.
         #
         def inherited(klass)
           Thor::Base.register_klass_file(klass)
-          klass.source_root if klass.respond_to?(:source_root)
         end
 
         # Fire this callback whenever a method is added. Added methods are

data/lib/thor/group.rb

@@ -12,12 +12,7 @@ class Thor::Group
     def desc(description=nil)
       case description
         when nil
-          usage = File.join(source_root, "..", "USAGE") if respond_to?(:source_root)
-          @desc ||= if usage && File.exist?(usage)
-            File.read(usage)
-          else
-            from_superclass(:desc, nil)
-          end
+          @desc ||= from_superclass(:desc, nil)
         else
           @desc = description
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-thor
 version: !ruby/object:Gem::Version 
-  version: 0.10.12
+  version: 0.10.13
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 -07:00
+date: 2009-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: []