Remove config.gem in favor of using the bundler. This makes config/boot.rb obsolete.

	The bundler library is at: http://github.com/wycats/bundler/ and is a rubygem.

4 files changed, 23 insertions, 147 deletions

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 49b13cae2b..20843cd720 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -75,10 +75,6 @@ module Rails::Generators
       end
     end
 
-    def create_boot_file
-      copy_file "config/boot.rb"
-    end
-
     def create_activerecord_files
       return if options[:skip_activerecord]
       template "config/databases/#{options[:database]}.yml", "config/database.yml"
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index bcbaa432b7..abe8c1556c 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -5,6 +5,17 @@ gem "rails", "<%= Rails::VERSION::STRING %>"
 # Bundling edge rails:
 # gem "rails", "<%= Rails::VERSION::STRING %>", :git => "git://github.com/rails/rails.git"
 
-# You can list more dependencies here
-# gem "nokogiri"
-# gem "merb" # ;)
\ No newline at end of file
+# Specify gemcutter as a gem source
+# source "http://gemcutter.org"
+
+# Specify gems that this application depends on and have them installed with rake gems:install
+# gem "bj"
+# gem "hpricot", "0.6"
+# gem "sqlite3-ruby", :require_as => "sqlite3"
+# gem "aws-s3", :require_as => "aws/s3"
+
+# Specify gems that should only be required in certain environments
+# gem "rspec", :only => :test
+# only :test do
+#   gem "webrat"
+# end
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index cf786093ba..451dba86fb 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -1,5 +1,12 @@
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.expand_path(File.join(File.dirname(__FILE__), 'boot'))
+begin
+  # Use Bundler
+  require File.expand_path("../../vendor/gems/environment", __FILE__)
+rescue LoadError
+  # Use Rubygems
+  require 'rubygems'
+end
+
+require 'rails'
 
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
deleted file mode 100644
index 928b195d8d..0000000000
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-module Rails
-  # Mark the version of Rails that generated the boot.rb file. This is
-  # a temporary solution and will most likely be removed as Rails 3.0
-  # comes closer.
-  BOOTSTRAP_VERSION = "3.0"
-
-  class << self
-    def boot!
-      unless booted?
-        root = File.expand_path('../..', __FILE__)
-        booter = File.exist?("#{root}/vendor/rails") ? VendorBoot : GemBoot
-        booter.new(root).run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-  end
-
-  class Boot
-    def initialize(root)
-      @root = root
-    end
-
-    def run
-      preinitialize
-      set_load_paths
-      load_initializer
-    end
-
-    def preinitialize
-      path = "#{@root}/config/preinitializer.rb"
-      load(path) if File.exist?(path)
-    end
-
-    def set_load_paths
-      %w(
-        actionmailer/lib
-        actionpack/lib
-        activemodel/lib
-        activerecord/lib
-        activeresource/lib
-        activesupport/lib
-        railties/lib
-        railties
-      ).reverse_each do |path|
-        path = "#{framework_root_path}/#{path}"
-        $LOAD_PATH.unshift(path) if File.directory?(path)
-        $LOAD_PATH.uniq!
-      end
-    end
-
-    def framework_root_path
-      defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{@root}/vendor/rails"
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "rails"
-      install_gem_spec_stubs
-    end
-
-    def install_gem_spec_stubs
-      begin; require "rubygems"; rescue LoadError; return; end
-
-      %w(rails activesupport activerecord actionpack actionmailer activeresource).each do |stub|
-        Gem.loaded_specs[stub] ||= Gem::Specification.new do |s|
-          s.name = stub
-          s.version = Rails::VERSION::STRING
-          s.loaded_from = ""
-        end
-      end
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      load_rubygems
-      load_rails_gem
-      require 'rails'
-    end
-
-    def load_rails_gem
-      if version = gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    def rubygems_version
-      Gem::RubyGemsVersion rescue nil
-    end
-
-    def gem_version
-      if defined? RAILS_GEM_VERSION
-        RAILS_GEM_VERSION
-      elsif ENV.include?('RAILS_GEM_VERSION')
-        ENV['RAILS_GEM_VERSION']
-      else
-        parse_gem_version(read_environment_rb)
-      end
-    end
-
-    def load_rubygems
-      min_version = '1.3.2'
-      require 'rubygems'
-      unless rubygems_version >= min_version
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-        exit 1
-      end
-
-    rescue LoadError
-      $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-      exit 1
-    end
-
-    def parse_gem_version(text)
-      $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-    end
-
-    private
-      def read_environment_rb
-        File.read("#{@root}/config/environment.rb")
-      end
-  end
-end
-
-# All that for this:
-Rails.boot!