Merge commit 'origin/master' into savepoints

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

5 files changed, 607 insertions, 134 deletions

diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 32c320385d..4a191578cf 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -1,109 +1,46 @@
 require 'rbconfig'
+require File.dirname(__FILE__) + '/template_runner'
 require 'digest/md5' 
+require 'active_support/secure_random'
 
 class AppGenerator < Rails::Generator::Base
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
 
-  DATABASES = %w(mysql oracle postgresql sqlite2 sqlite3 frontbase ibm_db)
+  DATABASES        = %w( mysql oracle postgresql sqlite2 sqlite3 frontbase ibm_db )
   DEFAULT_DATABASE = 'sqlite3'
 
-  default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
-    :shebang => DEFAULT_SHEBANG, :freeze => false
   mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
+  default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
+    :shebang => DEFAULT_SHEBANG, :with_dispatchers => false, :freeze => false
+
 
   def initialize(runtime_args, runtime_options = {})
     super
+
     usage if args.empty?
     usage("Databases supported for preconfiguration are: #{DATABASES.join(", ")}") if (options[:db] && !DATABASES.include?(options[:db]))
+
     @destination_root = args.shift
     @app_name = File.basename(File.expand_path(@destination_root))
   end
 
   def manifest
-    # Use /usr/bin/env if no special shebang was specified
-    script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
-    dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
-
-    # duplicate CGI::Session#generate_unique_id
-    md5 = Digest::MD5.new
-    now = Time.now
-    md5 << now.to_s
-    md5 << String(now.usec)
-    md5 << String(rand(0))
-    md5 << String($$)
-    md5 << @app_name
-
-    # Do our best to generate a secure secret key for CookieStore
-    secret = ActiveSupport::SecureRandom.hex(64)
-
     record do |m|
-      # Root directory and all subdirectories.
-      m.directory ''
-      BASEDIRS.each { |path| m.directory path }
-
-      # Root
-      m.file "fresh_rakefile", "Rakefile"
-      m.file "README",         "README"
-
-      # Application
-      m.template "helpers/application.rb",        "app/controllers/application.rb", :assigns => { :app_name => @app_name, :app_secret => md5.hexdigest }
-      m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb"
-      m.template "helpers/test_helper.rb",        "test/test_helper.rb"
-      m.template "helpers/performance_test.rb",   "test/performance/browsing_test.rb"
-
-      # database.yml and routes.rb
-      m.template "configs/databases/#{options[:db]}.yml", "config/database.yml", :assigns => {
-        :app_name => @app_name,
-        :socket   => options[:db] == "mysql" ? mysql_socket_location : nil
-      }
-      m.template "configs/routes.rb", "config/routes.rb"
-
-      # Initializers
-      m.template "configs/initializers/inflections.rb", "config/initializers/inflections.rb"
-      m.template "configs/initializers/mime_types.rb", "config/initializers/mime_types.rb"
-      m.template "configs/initializers/new_rails_defaults.rb", "config/initializers/new_rails_defaults.rb"
-
-      # Environments
-      m.file "environments/boot.rb",    "config/boot.rb"
-      m.template "environments/environment.rb", "config/environment.rb", :assigns => { :freeze => options[:freeze], :app_name => @app_name, :app_secret => secret }
-      m.file "environments/production.rb",  "config/environments/production.rb"
-      m.file "environments/development.rb", "config/environments/development.rb"
-      m.file "environments/test.rb",        "config/environments/test.rb"
-
-      # Scripts
-      %w( about console dbconsole destroy generate performance/benchmarker performance/profiler performance/request process/reaper process/spawner process/inspector runner server plugin ).each do |file|
-        m.file "bin/#{file}", "script/#{file}", script_options
-      end
-
-      # Dispatches
-      m.file "dispatches/dispatch.rb",   "public/dispatch.rb", dispatcher_options
-      m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", dispatcher_options
-      m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options
-
-      # HTML files
-      %w(404 422 500 index).each do |file|
-        m.template "html/#{file}.html", "public/#{file}.html"
-      end
-
-      m.template "html/favicon.ico",  "public/favicon.ico"
-      m.template "html/robots.txt",   "public/robots.txt"
-      m.file "html/images/rails.png", "public/images/rails.png"
-
-      # Javascripts
-      m.file "html/javascripts/prototype.js",    "public/javascripts/prototype.js"
-      m.file "html/javascripts/effects.js",      "public/javascripts/effects.js"
-      m.file "html/javascripts/dragdrop.js",     "public/javascripts/dragdrop.js"
-      m.file "html/javascripts/controls.js",     "public/javascripts/controls.js"
-      m.file "html/javascripts/application.js",  "public/javascripts/application.js"
-
-      # Docs
-      m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
+      create_directories(m)
+      create_root_files(m)
+      create_app_files(m)
+      create_config_files(m)
+      create_script_files(m)
+      create_test_files(m)
+      create_public_files(m)
+      create_documentation_file(m)
+      create_log_files(m)
+    end
+  end
 
-      # Logs
-      %w(server production development test).each { |file|
-        m.file "configs/empty.log", "log/#{file}.log", :chmod => 0666
-      }
+  def after_generate
+    if options[:template]
+      Rails::TemplateRunner.new(@destination_root, options[:template])
     end
   end
 
@@ -123,57 +60,199 @@ class AppGenerator < Rails::Generator::Base
             "Preconfigure for selected database (options: #{DATABASES.join('/')}).",
             "Default: #{DEFAULT_DATABASE}") { |v| options[:db] = v }
 
+      opt.on("-D", "--with-dispatchers",
+            "Add CGI/FastCGI/mod_ruby dispatches code to generated application skeleton",
+            "Default: false") { |v| options[:with_dispatchers] = v }
+
       opt.on("-f", "--freeze",
             "Freeze Rails in vendor/rails from the gems generating the skeleton",
             "Default: false") { |v| options[:freeze] = v }
+
+      opt.on("-m", "--template=path", String,
+            "Use an application template that lives at path (can be a filesystem path or URL).",
+            "Default: (none)") { |v| options[:template] = v }
+
+    end
+
+
+  private
+    def create_directories(m)
+      m.directory ''
+
+      # Intermediate directories are automatically created so don't sweat their absence here.
+      %w(
+        app/controllers
+        app/helpers
+        app/models
+        app/views/layouts
+        config/environments
+        config/initializers
+        config/locales
+        db
+        doc
+        lib
+        lib/tasks
+        log
+        public/images
+        public/javascripts
+        public/stylesheets
+        script/performance
+        test/fixtures
+        test/functional
+        test/integration
+        test/performance
+        test/unit
+        vendor
+        vendor/plugins
+        tmp/sessions
+        tmp/sockets
+        tmp/cache
+        tmp/pids
+      ).each { |path| m.directory(path) }
+    end
+    
+    def create_root_files(m)
+      m.file "fresh_rakefile", "Rakefile"
+      m.file "README",         "README"
+    end
+    
+    def create_app_files(m)
+      m.file "helpers/application_controller.rb", "app/controllers/application_controller.rb"
+      m.file "helpers/application_helper.rb",     "app/helpers/application_helper.rb"
+    end
+
+    def create_config_files(m)
+      create_database_configuration_file(m)
+      create_routes_file(m)
+      create_locale_file(m)
+      create_initializer_files(m)
+      create_environment_files(m)
+    end
+
+    def create_documentation_file(m)
+      m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
     end
 
+    def create_log_files(m)
+      %w( server production development test ).each do |file|
+        m.file "configs/empty.log", "log/#{file}.log", :chmod => 0666
+      end
+    end    
+
+    def create_public_files(m)
+      create_dispatch_files(m)
+      create_error_files(m)
+      create_welcome_file(m)
+      create_browser_convention_files(m)
+      create_rails_image(m)
+      create_javascript_files(m)
+    end
+    
+    def create_script_files(m)
+      %w( 
+        about console dbconsole destroy generate runner server plugin
+        performance/benchmarker performance/profiler performance/request
+      ).each do |file|
+        m.file "bin/#{file}", "script/#{file}", { 
+          :chmod => 0755, 
+          :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang]
+        }
+      end
+    end
+
+    def create_test_files(m)
+      m.file "helpers/test_helper.rb",      "test/test_helper.rb"
+      m.file "helpers/performance_test.rb", "test/performance/browsing_test.rb"
+    end
+
+
+    def create_database_configuration_file(m)
+      m.template "configs/databases/#{options[:db]}.yml", "config/database.yml", :assigns => {
+        :app_name => @app_name,
+        :socket   => options[:db] == "mysql" ? mysql_socket_location : nil }
+    end
+    
+    def create_routes_file(m)
+      m.file "configs/routes.rb", "config/routes.rb"
+    end
+
+    def create_initializer_files(m)
+      %w( 
+        backtrace_silencers 
+        inflections 
+        mime_types 
+        new_rails_defaults
+      ).each do |initializer|
+        m.file "configs/initializers/#{initializer}.rb", "config/initializers/#{initializer}.rb"
+      end
+
+      m.template "configs/initializers/session_store.rb", "config/initializers/session_store.rb", 
+        :assigns => { :app_name => @app_name, :app_secret => ActiveSupport::SecureRandom.hex(64) }
+    end
+
+    def create_locale_file(m)
+      m.file "configs/locales/en.yml", "config/locales/en.yml"
+    end
+
+    def create_environment_files(m)
+      m.template "environments/environment.rb", "config/environment.rb", 
+        :assigns => { :freeze => options[:freeze] }
+
+      m.file "environments/boot.rb",        "config/boot.rb"
+      m.file "environments/production.rb",  "config/environments/production.rb"
+      m.file "environments/development.rb", "config/environments/development.rb"
+      m.file "environments/test.rb",        "config/environments/test.rb"
+    end
+
+
+    def create_dispatch_files(m)
+      if options[:with_dispatchers]
+        dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
+
+        m.file "dispatches/config.ru",     "config.ru"
+        m.file "dispatches/dispatch.rb",   "public/dispatch.rb",   dispatcher_options
+        m.file "dispatches/dispatch.rb",   "public/dispatch.cgi",  dispatcher_options
+        m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options
+      end
+    end
+
+    def create_error_files(m)
+      %w( 404 422 500  ).each do |file|
+        m.file "html/#{file}.html", "public/#{file}.html"
+      end
+    end
+
+    def create_welcome_file(m)
+      m.file 'html/index.html', 'public/index.html'
+    end
+
+    def create_browser_convention_files(m)
+      m.file "html/favicon.ico", "public/favicon.ico"
+      m.file "html/robots.txt",  "public/robots.txt"
+    end
+
+    def create_rails_image(m)
+      m.file "html/images/rails.png", "public/images/rails.png"
+    end
+
+    def create_javascript_files(m)
+      %w( prototype effects dragdrop controls application ).each do |javascript|
+        m.file "html/javascripts/#{javascript}.js", "public/javascripts/#{javascript}.js"
+      end
+    end
+
+
     def mysql_socket_location
-      MYSQL_SOCKET_LOCATIONS.find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
-    end
-
-
-  # Installation skeleton.  Intermediate directories are automatically
-  # created so don't sweat their absence here.
-  BASEDIRS = %w(
-    app/controllers
-    app/helpers
-    app/models
-    app/views/layouts
-    config/environments
-    config/initializers
-    db
-    doc
-    lib
-    lib/tasks
-    log
-    public/images
-    public/javascripts
-    public/stylesheets
-    script/performance
-    script/process
-    test/fixtures
-    test/functional
-    test/integration
-    test/performance
-    test/unit
-    vendor
-    vendor/plugins
-    tmp/sessions
-    tmp/sockets
-    tmp/cache
-    tmp/pids
-  )
-
-  MYSQL_SOCKET_LOCATIONS = [
-    "/tmp/mysql.sock",                        # default
-    "/var/run/mysqld/mysqld.sock",            # debian/gentoo
-    "/var/tmp/mysql.sock",                    # freebsd
-    "/var/lib/mysql/mysql.sock",              # fedora
-    "/opt/local/lib/mysql/mysql.sock",        # fedora
-    "/opt/local/var/run/mysqld/mysqld.sock",  # mac + darwinports + mysql
-    "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
-    "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
-    "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
-  ]
-end
+      [
+        "/tmp/mysql.sock",                        # default
+        "/var/run/mysqld/mysqld.sock",            # debian/gentoo
+        "/var/tmp/mysql.sock",                    # freebsd
+        "/var/lib/mysql/mysql.sock",              # fedora
+        "/opt/local/lib/mysql/mysql.sock",        # fedora
+        "/opt/local/var/run/mysqld/mysqld.sock",  # mac + darwinports + mysql
+        "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
+        "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
+        "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
+      ].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
+    end
+end
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/applications/app/scm/git.rb b/railties/lib/rails_generator/generators/applications/app/scm/git.rb
new file mode 100644
index 0000000000..445de6ab42
--- /dev/null
+++ b/railties/lib/rails_generator/generators/applications/app/scm/git.rb
@@ -0,0 +1,16 @@
+module Rails
+  class Git < Scm
+    def self.clone(repos, branch=nil)
+      `git clone #{repos}`
+
+      if branch
+        `cd #{repos.split('/').last}/`
+        `git checkout #{branch}`
+      end
+    end
+
+    def self.run(command)
+      `git #{command}`
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/applications/app/scm/scm.rb b/railties/lib/rails_generator/generators/applications/app/scm/scm.rb
new file mode 100644
index 0000000000..f6c08cad39
--- /dev/null
+++ b/railties/lib/rails_generator/generators/applications/app/scm/scm.rb
@@ -0,0 +1,8 @@
+module Rails
+  class Scm
+    private
+      def self.hash_to_parameters(hash)
+        hash.collect { |key, value| "--#{key} #{(value.kind_of?(String) ? value : "")}"}.join(" ")
+      end
+  end
+end
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/applications/app/scm/svn.rb b/railties/lib/rails_generator/generators/applications/app/scm/svn.rb
new file mode 100644
index 0000000000..22b5966d25
--- /dev/null
+++ b/railties/lib/rails_generator/generators/applications/app/scm/svn.rb
@@ -0,0 +1,7 @@
+module Rails
+  class Svn < Scm
+    def self.checkout(repos, branch = nil)
+      `svn checkout #{repos}/#{branch || "trunk"}`
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/lib/rails_generator/generators/applications/app/template_runner.rb b/railties/lib/rails_generator/generators/applications/app/template_runner.rb
new file mode 100644
index 0000000000..0083e0d5a5
--- /dev/null
+++ b/railties/lib/rails_generator/generators/applications/app/template_runner.rb
@@ -0,0 +1,363 @@
+require File.dirname(__FILE__) + '/scm/scm'
+require File.dirname(__FILE__) + '/scm/git'
+require File.dirname(__FILE__) + '/scm/svn'
+
+require 'open-uri'
+require 'fileutils'
+
+module Rails
+  class TemplateRunner
+    attr_reader :behavior, :description, :root
+
+    def initialize(root, template) # :nodoc:
+      @root = Dir.pwd + "/" + root
+
+      puts "applying template: #{template}"
+
+      load_template(template)
+
+      puts "#{template} applied."
+    end
+
+    def load_template(template)
+      begin
+        code = open(template).read
+        in_root { self.instance_eval(code) }
+      rescue LoadError
+        raise "The template [#{template}] could not be loaded."
+      end
+    end
+
+    # Create a new file in the Rails project folder.  Specify the
+    # relative path from RAILS_ROOT.  Data is the return value of a block
+    # or a data string.
+    #
+    # ==== Examples
+    #
+    #   file("lib/fun_party.rb") do
+    #     hostname = ask("What is the virtual hostname I should use?")
+    #     "vhost.name = #{hostname}"
+    #   end
+    #
+    #   file("config/apach.conf", "your apache config")
+    #
+    def file(filename, data = nil, &block)
+      puts "creating file #{filename}"
+      dir, file = [File.dirname(filename), File.basename(filename)]
+
+      inside(dir) do
+        File.open(file, "w") do |f|
+          if block_given?
+            f.write(block.call)
+          else
+            f.write(data)
+          end
+        end
+      end
+    end
+
+    # Install a plugin.  You must provide either a Subversion url or Git url.
+    #
+    # ==== Examples
+    #
+    #   plugin 'restful-authentication', :git => 'git://github.com/technoweenie/restful-authentication.git'
+    #   plugin 'restful-authentication', :svn => 'svn://svnhub.com/technoweenie/restful-authentication/trunk'
+    #
+    def plugin(name, options)
+      puts "installing plugin #{name}"
+
+      if options[:git] || options[:svn]
+        in_root do
+          `script/plugin install #{options[:svn] || options[:git]}`
+        end
+      else
+        puts "! no git or svn provided for #{name}.  skipping..."
+      end
+    end
+
+    # Adds an entry into config/environment.rb for the supplied gem :
+    def gem(name, options = {})
+      puts "adding gem #{name}"
+
+      sentinel = 'Rails::Initializer.run do |config|'
+      gems_code = "config.gem '#{name}'"
+
+      if options.any?
+        opts = options.inject([]) {|result, h| result << [":#{h[0]} => '#{h[1]}'"] }.join(", ")
+        gems_code << ", #{opts}"
+      end
+
+      in_root do
+        gsub_file 'config/environment.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+          "#{match}\n  #{gems_code}"
+        end
+      end
+    end
+
+    # Run a command in git.
+    #
+    # ==== Examples
+    #
+    #   git :init
+    #   git :add => "this.file that.rb"
+    #   git :add => "onefile.rb", :rm => "badfile.cxx"
+    #
+    def git(command = {})
+      puts "running git #{command}"
+
+      in_root do
+        if command.is_a?(Symbol)
+          Git.run(command.to_s)
+        else
+          command.each do |command, options|
+            Git.run("#{command} #{options}")
+          end
+        end
+      end
+    end
+
+    # Create a new file in the vendor/ directory. Code can be specified
+    # in a block or a data string can be given.
+    #
+    # ==== Examples
+    #
+    #   vendor("sekrit.rb") do
+    #     sekrit_salt = "#{Time.now}--#{3.years.ago}--#{rand}--"
+    #     "salt = '#{sekrit_salt}'"
+    #   end
+    #
+    #   vendor("foreign.rb", "# Foreign code is fun")
+    #
+    def vendor(filename, data = nil, &block)
+      puts "vendoring file #{filename}"
+      inside("vendor") do |folder|
+        File.open("#{folder}/#{filename}", "w") do |f|
+          if block_given?
+            f.write(block.call)
+          else
+            f.write(data)
+          end
+        end
+      end
+    end
+
+    # Create a new file in the lib/ directory. Code can be specified
+    # in a block or a data string can be given.
+    #
+    # ==== Examples
+    #
+    #   lib("crypto.rb") do
+    #     "crypted_special_value = '#{rand}--#{Time.now}--#{rand(1337)}--'"
+    #   end
+    #
+    #   lib("foreign.rb", "# Foreign code is fun")
+    #
+    def lib(filename, data = nil)
+      puts "add lib file #{filename}"
+      inside("lib") do |folder|
+        File.open("#{folder}/#{filename}", "w") do |f|
+          if block_given?
+            f.write(block.call)
+          else
+            f.write(data)
+          end
+        end
+      end
+    end
+
+    # Create a new Rakefile with the provided code (either in a block or a string).
+    #
+    # ==== Examples
+    #
+    #   rakefile("bootstrap.rake") do
+    #     project = ask("What is the UNIX name of your project?")
+    #
+    #     <<-TASK
+    #       namespace :#{project} do
+    #         task :bootstrap do
+    #           puts "i like boots!"
+    #         end
+    #       end
+    #     TASK
+    #   end
+    #
+    #   rakefile("seed.rake", "puts 'im plantin ur seedz'")
+    #
+    def rakefile(filename, data = nil, &block)
+      puts "adding rakefile #{filename}"
+      inside("lib/tasks") do |folder|
+        File.open("#{folder}/#{filename}", "w") do |f|
+          if block_given?
+            f.write(block.call)
+          else
+            f.write(data)
+          end
+        end
+      end
+    end
+
+    # Create a new initializer with the provided code (either in a block or a string).
+    #
+    # ==== Examples
+    #
+    #   initializer("globals.rb") do
+    #     data = ""
+    #
+    #     ['MY_WORK', 'ADMINS', 'BEST_COMPANY_EVAR'].each do
+    #       data << "#{const} = :entp"
+    #     end
+    #
+    #     data
+    #   end
+    #
+    #   initializer("api.rb", "API_KEY = '123456'")
+    #
+    def initializer(filename, data = nil, &block)
+      puts "adding initializer #{filename}"
+      inside("config/initializers") do |folder|
+        File.open("#{folder}/#{filename}", "w") do |f|
+          if block_given?
+            f.write(block.call)
+          else
+            f.write(data)
+          end
+        end
+      end
+    end
+
+    # Generate something using a generator from Rails or a plugin.
+    # The second parameter is the argument string that is passed to
+    # the generator or an Array that is joined.
+    #
+    # ==== Example
+    #
+    #   generate(:authenticated, "user session")
+    #
+    def generate(what, args = nil)
+      puts "generating #{what}"
+      args = args.join(" ") if args.class == Array
+
+      in_root { `#{root}/script/generate #{what} #{args}` }
+    end
+
+    # Executes a command
+    #
+    # ==== Example
+    #
+    #   inside('vendor') do
+    #     run('ln -s ~/edge rails)
+    #   end
+    #
+    def run(command)
+      puts "executing #{command} from #{Dir.pwd}"
+      `#{command}`
+    end
+
+    # Runs the supplied rake task
+    #
+    # ==== Example
+    #
+    #   rake("db:migrate")
+    #   rake("db:migrate", "production")
+    #
+    def rake(command, env = 'development')
+      puts "running rake task #{command}"
+      in_root { `rake #{command} RAILS_ENV=#{env}` }
+    end
+
+    # Just run the capify command in root
+    #
+    # ==== Example
+    #
+    #   capify!
+    #
+    def capify!
+      in_root { `capify .` }
+    end
+
+    # Add Rails to /vendor/rails
+    #
+    # ==== Example
+    #
+    #   freeze!
+    #
+    def freeze!(args = {})
+      puts "vendoring rails edge"
+      in_root { `rake rails:freeze:edge` }
+    end
+
+    # Make an entry in Rails routing file conifg/routes.rb
+    #
+    # === Example
+    #
+    #   route "map.root :controller => :welcome"
+    #
+    def route(routing_code)
+      sentinel = 'ActionController::Routing::Routes.draw do |map|'
+
+      in_root do
+        gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+          "#{match}\n  #{routing_code}\n"
+        end
+      end
+    end
+
+    protected
+
+    # Get a user's input
+    #
+    # ==== Example
+    #
+    #   answer = ask("Should I freeze the latest Rails?")
+    #   freeze! if ask("Should I freeze the latest Rails?") == "yes"
+    #
+    def ask(string)
+      puts string
+      gets.strip
+    end
+
+    # Do something in the root of the Rails application or
+    # a provided subfolder; the full path is yielded to the block you provide.
+    # The path is set back to the previous path when the method exits.
+    def inside(dir = '', &block)
+      folder = File.join(root, dir)
+      FileUtils.mkdir_p(folder) unless File.exist?(folder)
+      FileUtils.cd(folder) { block.arity == 1 ? yield(folder) : yield }
+    end
+
+    def in_root
+      FileUtils.cd(root) { yield }
+    end
+
+    # Helper to test if the user says yes(y)?
+    #
+    # ==== Example
+    #
+    #   freeze! if yes?("Should I freeze the latest Rails?")
+    #
+    def yes?(question)
+      answer = ask(question).downcase
+      answer == "y" || answer == "yes"
+    end
+
+    # Helper to test if the user does NOT say yes(y)?
+    #
+    # ==== Example
+    #
+    #   capify! if no?("Will you be using vlad to deploy your application?")
+    #
+    def no?(question)
+      !yes?(question)
+    end
+
+    def gsub_file(relative_destination, regexp, *args, &block)
+      path = destination_path(relative_destination)
+      content = File.read(path).gsub(regexp, *args, &block)
+      File.open(path, 'wb') { |file| file.write(content) }
+    end
+
+    def destination_path(relative_destination)
+      File.join(root, relative_destination)
+    end
+  end
+end
\ No newline at end of file