0
@@ -42,12 +42,14 @@ class Thor
0
     def self.get_constants_for(klass)
0
       top_level_constants = make_constant(klass).constants
0
       return if top_level_constants.empty?
0
-      top_level_constants.dup.each do |const|
0
-        if (children = get_constants_for("#{klass}::#{const}"))
0
-          top_level_constants << children.map {|child| "#{const}::#{child}"}
0
+      ret = []
0
+      top_level_constants.each do |const|
0
+        klass_name = "#{klass}::#{const}"
0
+        if (children = get_constants_for(klass_name) )
0
+          ret << children.map {|child| "#{const}::#{child}"}
0
         end
0
       end
0
-      top_level_constants.flatten
0
+      (top_level_constants + ret).flatten
0
     end
0
 
0
   end

0
@@ -89,8 +89,8 @@ describe Thor::Util do
0
       list = Thor::Util.constants_in_contents("FOO = 12; Bar = {}; class Baz; end; class Baz::Bam; end")
0
       list.must include("FOO")
0
       list.must include("Bar")
0
-      list.must include("Baz::Bam")
0
       list.must include("Baz")
0
+      list.must include("Baz::Bam")
0
     end
0
 
0
     it "doesn't put the newly-defined constants in the enclosing namespace" do
0
@@ -117,15 +117,11 @@ describe Thor::Util do
0
             end
0
           end
0
         end
0
-        class Box; end
0
-        class Box::Cutter; end
0
-        
0
         Thor::Util.get_constants_for("Foo").must include("Baz::Bar")
0
         Thor::Util.get_constants_for("Foo").must include("Baz::Bar::Bam")
0
         Thor::Util.get_constants_for("Foo").must include("Baz::Bar::Bat")
0
         Thor::Util.get_constants_for("Foo").must include("Baz::Bar::Bam::Boo")
0
         Thor::Util.get_constants_for("Foo").must include("Baz::Bar::Bam::Bor")
0
-        Thor::Util.get_constants_for("Box").must include("Cutter")
0
       end
0
     end
0