2 files changed, 65 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 6448e5eda9..ecf3551f50 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -138,12 +138,73 @@ module Rails
         FileUtils.cd(destination_root) unless options[:pretend]
       end
 
+      class TemplateRecorder < ::BasicObject # :nodoc:
+        attr_reader :gems
+
+        def initialize(target)
+          @target         = target
+          # unfortunately, instance eval has access to these ivars
+          @app_const      = target.send :app_const
+          @app_const_base = target.send :app_const_base
+          @app_name       = target.send :app_name
+          @commands       = []
+          @gems           = []
+        end
+
+        def gemfile_entry(*args)
+          @target.send :gemfile_entry, *args
+        end
+
+        def add_gem_entry_filter(*args, &block)
+          @target.send :add_gem_entry_filter, *args, &block
+        end
+
+        def method_missing(name, *args, &block)
+          @commands << [name, args, block]
+        end
+
+        def respond_to_missing?(method, priv = false)
+          super || @target.respond_to?(method, priv)
+        end
+
+        def replay!
+          @commands.each do |name, args, block|
+            @target.send name, *args, &block
+          end
+        end
+      end
+
       def apply_rails_template
-        apply rails_template if rails_template
+        @recorder = TemplateRecorder.new self
+
+        apply(rails_template, target: @recorder) if rails_template
       rescue Thor::Error, LoadError, Errno::ENOENT => e
         raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
       end
 
+      def replay_template
+        @recorder.replay! if @recorder
+      end
+
+      def apply(path, config={})
+        verbose = config.fetch(:verbose, true)
+        target  = config.fetch(:target, self)
+        is_uri  = path =~ /^https?\:\/\//
+        path    = find_in_source_paths(path) unless is_uri
+
+        say_status :apply, path, verbose
+        shell.padding += 1 if verbose
+
+        if is_uri
+          contents = open(path, "Accept" => "application/x-thor-template") {|io| io.read }
+        else
+          contents = open(path) {|io| io.read }
+        end
+
+        target.instance_eval(contents, path)
+        shell.padding -= 1 if verbose
+      end
+
       def set_default_accessors!
         self.destination_root = File.expand_path(app_path, destination_root)
         self.rails_template = case options[:template]
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 3c62e7a4d2..e0badf21f8 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -165,6 +165,7 @@ module Rails
       end
 
       public_task :set_default_accessors!
+      public_task :apply_rails_template
       public_task :create_root
 
       def create_root_files
@@ -234,7 +235,8 @@ module Rails
         end
       end
 
-      public_task :apply_rails_template, :run_bundle
+      public_task :replay_template
+      public_task :run_bundle
 
     protected