apply [5790] to 1.2 stable branch

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5791 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
JEG2 · Dec 26, 2006 · df27fb8 · df27fb8
1 parent 4aa9335
commit df27fb8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file.  Closes #6852 [fearoffish]
+
 * Fix Webrick Daemon dispatching bug regarding a bad current working directory.  Closes #4899 [Rick Olson]
 
 * Make config.plugins affect the load path and the dependencies system.  Allows you to control plugin loading order, and keep disabled plugins off the load path. [James Adam]

diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb
@@ -342,8 +342,10 @@ def route_resources(*resources)
           sentinel = 'ActionController::Routing::Routes.draw do |map|'
 
           logger.route "map.resources #{resource_list}"
-          gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-            "#{match}\n  map.resources #{resource_list}\n"
+          unless options[:pretend]
+            gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+              "#{match}\n  map.resources #{resource_list}\n"
+            end
           end
         end