Skip to content
This repository
Browse code

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
  • Loading branch information...
commit aa7859c9768f4447b4f67808b2c92f4d0cb48cb2 1 parent 593b1b8
Jeremy Kemper jeremy authored
2  railties/CHANGELOG
... ... @@ -1,5 +1,7 @@
1 1 *SVN*
2 2
  3 +* Plugins may be symlinked in vendor/plugins. #4245 [brandon, progrium@gmail.com]
  4 +
3 5 * Resource generator depends on the model generator rather than duplicating it. #7269 [bscofield]
4 6
5 7 * Add/Update usage documentation for script/destroy, resource generator and scaffold_resource generator. Closes #7092, #7271, #7267. [bscofield]
2  railties/lib/rails_generator/lookup.rb
@@ -100,7 +100,7 @@ def use_component_sources!
100 100 if defined? ::RAILS_ROOT
101 101 sources << PathSource.new(:lib, "#{::RAILS_ROOT}/lib/generators")
102 102 sources << PathSource.new(:vendor, "#{::RAILS_ROOT}/vendor/generators")
103   - sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/**/generators")
  103 + sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/generators")
104 104 end
105 105 sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
106 106 sources << GemSource.new if Object.const_defined?(:Gem)
2  railties/lib/tasks/rails.rb
@@ -5,4 +5,4 @@
5 5
6 6 # Load any custom rakefile extensions
7 7 Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
8   -Dir["#{RAILS_ROOT}/vendor/plugins/**/tasks/**/*.rake"].sort.each { |ext| load ext }
  8 +Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
4 railties/lib/tasks/testing.rake
@@ -108,10 +108,10 @@ namespace :test do
108 108 if ENV['PLUGIN']
109 109 t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb"
110 110 else
111   - t.pattern = 'vendor/plugins/**/test/**/*_test.rb'
  111 + t.pattern = 'vendor/plugins/*/**/test/**/*_test.rb'
112 112 end
113 113
114 114 t.verbose = true
115 115 end
116   - Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
  116 + Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/*/**/test (or specify with PLUGIN=name)"
117 117 end

0 comments on commit aa7859c

Please sign in to comment.
Something went wrong with that request. Please try again.