Merge commit 'mainstream/master'

Conflicts:
	railties/guides/files/stylesheets/main.css
	railties/guides/rails_guides/generator.rb
	railties/guides/source/index.erb.textile

1 files changed, 25 insertions, 5 deletions

diff --git a/railties/lib/rails_generator/generators/applications/app/template_runner.rb b/railties/lib/rails_generator/generators/applications/app/template_runner.rb
index eeb6b17661..73ab57d4f0 100644
--- a/railties/lib/rails_generator/generators/applications/app/template_runner.rb
+++ b/railties/lib/rails_generator/generators/applications/app/template_runner.rb
@@ -85,6 +85,7 @@ module Rails
     # Adds an entry into config/environment.rb for the supplied gem :
     def gem(name, options = {})
       log 'gem', name
+      env = options.delete(:env)
 
       gems_code = "config.gem '#{name}'"
 
@@ -93,18 +94,26 @@ module Rails
         gems_code << ", #{opts}"
       end
 
-      environment gems_code
+      environment gems_code, :env => env
     end
 
     # Adds a line inside the Initializer block for config/environment.rb. Used by #gem
-    def environment(data = nil, &block)
+    # If options :env is specified, the line is appended to the corresponding
+    # file in config/environments/#{env}.rb
+    def environment(data = nil, options = {}, &block)
       sentinel = 'Rails::Initializer.run do |config|'
 
       data = block.call if !data && block_given?
 
       in_root do
-        gsub_file 'config/environment.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-          "#{match}\n " << data
+        if options[:env].nil?
+          gsub_file 'config/environment.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+            "#{match}\n  " << data
+          end
+        else
+          Array.wrap(options[:env]).each do|env|
+            append_file "config/environments/#{env}.rb", "\n#{data}"
+          end
         end
       end
     end
@@ -307,7 +316,7 @@ module Rails
     #
     def ask(string)
       log '', string
-      gets.strip
+      STDIN.gets.strip
     end
 
     # Do something in the root of the Rails application or
@@ -356,6 +365,17 @@ module Rails
       File.open(path, 'wb') { |file| file.write(content) }
     end
 
+    # Append text to a file
+    #
+    # ==== Example
+    #
+    #   append_file 'config/environments/test.rb', 'config.gem "rspec"'
+    #
+    def append_file(relative_destination, data)
+      path = destination_path(relative_destination)
+      File.open(path, 'ab') { |file| file.write(data) }
+    end
+
     def destination_path(relative_destination)
       File.join(root, relative_destination)
     end