thor 0.9.5 → 0.9.6

data/lib/thor/runner.rb

@@ -176,7 +176,7 @@ class Thor::Runner < Thor
     raise Error, "No Thor tasks available" if klasses.empty?
     
     if with_modules && !(yaml = thor_yaml).empty?
-      max_name = yaml.max {|(xk,xv),(yk,yv)| xk.size <=> yk.size }.first.size
+      max_name = yaml.max {|(xk,xv),(yk,yv)| xk.to_s.size <=> yk.to_s.size }.first.size
       modules_label = "Modules"
       namespaces_label = "Namespaces"
       column_width = [max_name + 4, modules_label.size + 1].max

data/lib/thor/util.rb

@@ -1,5 +1,19 @@
 require 'thor/error'
 
+module ObjectSpace
+  
+  class << self
+
+    # @return <Array[Class]> All the classes in the object space.
+    def classes
+      klasses = []
+      ObjectSpace.each_object(Class) {|o| klasses << o}
+      klasses
+    end
+  end
+  
+end
+
 class Thor
   module Util
     
@@ -22,11 +36,11 @@ class Thor
     end
 
     def self.constants_in_contents(str)
-      klasses = self.constants.dup
-      eval(str)
-      ret = self.constants - klasses
-      ret.each {|k| self.send(:remove_const, k)}
-      ret
+      klasses = ObjectSpace.classes.dup
+      Module.new.class_eval(str)
+      klasses = ObjectSpace.classes - klasses
+      klasses = klasses.select {|k| k < Thor }
+      klasses.map! {|k| k.to_s.gsub(/#<Module:\w+>::/, '')}
     end
 
     def self.make_constant(str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-27 00:00:00 +02:00
+date: 2008-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,8 +22,8 @@ extensions: []
 
 extra_rdoc_files: 
 - README.markdown
-- CHANGELOG.rdoc
 - LICENSE
+- CHANGELOG.rdoc
 files: 
 - README.markdown
 - LICENSE