Changeset 6101
- Timestamp:
- 02/01/07 20:12:36 (1 year ago)
- Files:
-
- trunk/railties/CHANGELOG (modified) (1 diff)
- trunk/railties/lib/rails_generator/lookup.rb (modified) (1 diff)
- trunk/railties/lib/tasks/rails.rb (modified) (1 diff)
- trunk/railties/lib/tasks/testing.rake (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/railties/CHANGELOG
r6069 r6101 1 1 *SVN* 2 3 * Plugins may be symlinked in vendor/plugins. #4245 [brandon, progrium@gmail.com] 2 4 3 5 * Resource generator depends on the model generator rather than duplicating it. #7269 [bscofield] trunk/railties/lib/rails_generator/lookup.rb
r4310 r6101 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") trunk/railties/lib/tasks/rails.rb
r5469 r6101 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 } trunk/railties/lib/tasks/testing.rake
r5263 r6101 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
