From 9d2bf8e119a6d9a164df1f0025a12f0c2aa199de Mon Sep 17 00:00:00 2001
From: Kieran Pilkington <kieran@katipo.co.nz>
Date: Sun, 7 Feb 2010 08:07:05 +1300
Subject: [PATCH 1/2] Bundle to vendor when --dev or --edge are suuplied, to prevent altering system gems with possible buggy versions

---
 railties/lib/generators/rails/app/app_generator.rb |    2 +-
 railties/test/generators/app_generator_test.rb     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb
index c439ed8..6d856de 100644
--- a/railties/lib/generators/rails/app/app_generator.rb
+++ b/railties/lib/generators/rails/app/app_generator.rb
@@ -171,7 +171,7 @@ module Rails::Generators
     end
 
     def bundle_if_dev_or_edge
-      run "bundle install" if dev_or_edge?
+      run "bundle install vendor" if dev_or_edge?
     end
 
     protected
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 54b970c..5e714ab 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -155,7 +155,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_dev_option
-    generator([destination_root], :dev => true).expects(:run).with("bundle install")
+    generator([destination_root], :dev => true).expects(:run).with("bundle install vendor")
     silence(:stdout){ generator.invoke }
     rails_path = File.expand_path('../../..', Rails.root)
     dev_gem = %(gem "rails", :path => #{rails_path.inspect})
@@ -163,7 +163,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_edge_option
-    generator([destination_root], :edge => true).expects(:run).with("bundle install")
+    generator([destination_root], :edge => true).expects(:run).with("bundle install vendor")
     silence(:stdout){ generator.invoke }
     edge_gem = %(gem "rails", :git => "git://github.com/rails/rails.git")
     assert_file 'Gemfile', /^#{Regexp.escape(edge_gem)}$/
-- 
1.6.6


From 5e15afca385611c8dda226cc77bf0781b2474d29 Mon Sep 17 00:00:00 2001
From: Kieran Pilkington <kieran@katipo.co.nz>
Date: Sun, 7 Feb 2010 09:03:03 +1300
Subject: [PATCH 2/2] Add vendor to the gitignore list

---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 715d0bc..65e6a5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ railties/tmp
 bin
 .bundle
 pkg
+vendor
-- 
1.6.6