test/patches/symlinked_plugins_1.2.6.diff

   1 Index: /trunk/railties/lib/rails_generator/lookup.rb
   2 ===================================================================
   3 --- /trunk/railties/lib/rails_generator/lookup.rb (revision 4310)
   4 +++ /trunk/railties/lib/rails_generator/lookup.rb (revision 6101)
   5 @@ -101,5 +101,5 @@
   6              sources << PathSource.new(:lib, "#{::RAILS_ROOT}/lib/generators")
   7              sources << PathSource.new(:vendor, "#{::RAILS_ROOT}/vendor/generators")
   8 -            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/**/generators")
   9 +            sources << PathSource.new(:plugins, "#{::RAILS_ROOT}/vendor/plugins/*/**/generators")
  10            end
  11            sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
  12 Index: /trunk/railties/lib/tasks/rails.rb
  13 ===================================================================
  14 --- /trunk/railties/lib/tasks/rails.rb (revision 5469)
  15 +++ /trunk/railties/lib/tasks/rails.rb (revision 6101)
  16 @@ -6,3 +6,3 @@
  17  # Load any custom rakefile extensions
  18  Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
  19 -Dir["#{RAILS_ROOT}/vendor/plugins/**/tasks/**/*.rake"].sort.each { |ext| load ext }
  20 +Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
  21 Index: /trunk/railties/lib/tasks/testing.rake
  22 ===================================================================
  23 --- /trunk/railties/lib/tasks/testing.rake (revision 5263)
  24 +++ /trunk/railties/lib/tasks/testing.rake (revision 6101)
  25 @@ -109,9 +109,9 @@
  26        t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb"
  27      else
  28 -      t.pattern = 'vendor/plugins/**/test/**/*_test.rb'
  29 +      t.pattern = 'vendor/plugins/*/**/test/**/*_test.rb'
  30      end
  31
  32      t.verbose = true
  33    end
  34 -  Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
  35 +  Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/*/**/test (or specify with PLUGIN=name)"
  36  end
  37 Index: /trunk/railties/CHANGELOG
  38 ===================================================================
  39 --- /trunk/railties/CHANGELOG (revision 6069)
  40 +++ /trunk/railties/CHANGELOG (revision 6101)
  41 @@ -1,3 +1,5 @@
  42  *SVN*
  43 +
  44 +* Plugins may be symlinked in vendor/plugins.  #4245 [brandon, progrium@gmail.com]
  45
  46  * Resource generator depends on the model generator rather than duplicating it.  #7269 [bscofield]