public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Plugins may be symlinked in vendor/plugins. Closes #4245.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6101 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
jeremy (author)
Thu Feb 01 12:12:36 -0800 2007
commit  aa7859c9768f4447b4f67808b2c92f4d0cb48cb2
tree    cf6e5dda7dac0704739d0b5fd14b7ac99e3e307b
parent  593b1b837d24e61ea8f5386d66669585f3c14d5a
...
1
2
 
 
3
4
5
...
1
2
3
4
5
6
7
0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Plugins may be symlinked in vendor/plugins.  #4245 [brandon, progrium@gmail.com]
0
+
0
 * Resource generator depends on the model generator rather than duplicating it.  #7269 [bscofield]
0
 
0
 * Add/Update usage documentation for script/destroy, resource generator and scaffold_resource generator.  Closes #7092, #7271, #7267.  [bscofield]
...
100
101
102
103
 
104
105
106
...
100
101
102
 
103
104
105
106
0
@@ -100,7 +100,7 @@ module Rails
0
           if defined? ::RAILS_ROOT
0
             sources << PathSource.new(:lib, "#{::RAILS_ROOT}/lib/generators")
0
             sources << PathSource.new(:vendor, "#{::RAILS_ROOT}/vendor/generators")
0
-            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/**/generators")
0
+            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/generators")
0
           end
0
           sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
0
           sources << GemSource.new if Object.const_defined?(:Gem)
...
5
6
7
8
 
...
5
6
7
 
8
0
@@ -5,4 +5,4 @@ Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
0
 
0
 # Load any custom rakefile extensions
0
 Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
0
-Dir["#{RAILS_ROOT}/vendor/plugins/**/tasks/**/*.rake"].sort.each { |ext| load ext }
0
+Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
...
108
109
110
111
 
112
113
114
115
116
 
117
...
108
109
110
 
111
112
113
114
115
 
116
117
0
@@ -108,10 +108,10 @@ namespace :test do
0
     if ENV['PLUGIN']
0
       t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb"
0
     else
0
-      t.pattern = 'vendor/plugins/**/test/**/*_test.rb'
0
+      t.pattern = 'vendor/plugins/*/**/test/**/*_test.rb'
0
     end
0
 
0
     t.verbose = true
0
   end
0
-  Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
0
+  Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/*/**/test (or specify with PLUGIN=name)"
0
 end

Comments