github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-31 01:08:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Plugins may be symlinked in vendor/plugins. Closes #4245.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6101 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2007-02-01 20:12:36 +00:00
parent 593b1b837d
commit aa7859c976
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
railties/CHANGELOG
View File

@@ -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]

2
railties/lib/rails_generator/lookup.rb
View File

@@ -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)

2
railties/lib/tasks/rails.rb
View File

@@ -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 }

4
railties/lib/tasks/testing.rake
View File

@@ -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