diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/lookup.rb | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/rails.rb | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/testing.rake | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ac9dba48bd..f3f78d0606 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Plugins may be symlinked in vendor/plugins. #4245 [brandon, progrium@gmail.com] + * Resource generator depends on the model generator rather than duplicating it. #7269 [bscofield] * Add/Update usage documentation for script/destroy, resource generator and scaffold_resource generator. Closes #7092, #7271, #7267. [bscofield] diff --git a/railties/lib/rails_generator/lookup.rb b/railties/lib/rails_generator/lookup.rb index 06f1a9eb1b..9446353013 100644 --- a/railties/lib/rails_generator/lookup.rb +++ b/railties/lib/rails_generator/lookup.rb @@ -100,7 +100,7 @@ module Rails if defined? ::RAILS_ROOT sources << PathSource.new(:lib, "#{::RAILS_ROOT}/lib/generators") sources << PathSource.new(:vendor, "#{::RAILS_ROOT}/vendor/generators") - sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/**/generators") + sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/generators") end sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators") sources << GemSource.new if Object.const_defined?(:Gem) diff --git a/railties/lib/tasks/rails.rb b/railties/lib/tasks/rails.rb index ec4847a2a5..bfcf5bc493 100644 --- a/railties/lib/tasks/rails.rb +++ b/railties/lib/tasks/rails.rb @@ -5,4 +5,4 @@ Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext } # Load any custom rakefile extensions Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext } -Dir["#{RAILS_ROOT}/vendor/plugins/**/tasks/**/*.rake"].sort.each { |ext| load ext } +Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext } diff --git a/railties/lib/tasks/testing.rake b/railties/lib/tasks/testing.rake index 4f0292c854..59ce7af888 100644 --- a/railties/lib/tasks/testing.rake +++ b/railties/lib/tasks/testing.rake @@ -108,10 +108,10 @@ namespace :test do if ENV['PLUGIN'] t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb" else - t.pattern = 'vendor/plugins/**/test/**/*_test.rb' + t.pattern = 'vendor/plugins/*/**/test/**/*_test.rb' end t.verbose = true end - Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)" + Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/*/**/test (or specify with PLUGIN=name)" end |