1 files changed, 19 insertions, 21 deletions

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index d3420a6a3c..6df33d65e9 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -49,6 +49,9 @@ module Rails
         class_option :skip_javascript,    :type => :boolean, :aliases => "-J", :default => false,
                                           :desc => "Skip JavaScript files"
 
+        class_option :skip_index_html,    :type => :boolean, :aliases => "-I", :default => false,
+                                          :desc => "Skip public/index.html and app/assets/images/rails.png files"
+
         class_option :dev,                :type => :boolean, :default => false,
                                           :desc => "Setup the #{name} with Gemfile pointing to your Rails checkout"
 
@@ -120,7 +123,7 @@ module Rails
       end
 
       def database_gemfile_entry
-        options[:skip_active_record] ? "" : "gem '#{gem_for_database}'\n"
+        options[:skip_active_record] ? "" : "gem '#{gem_for_database}'"
       end
 
       def include_all_railties?
@@ -134,22 +137,24 @@ module Rails
       def rails_gemfile_entry
         if options.dev?
           <<-GEMFILE.strip_heredoc
-            gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
-            gem 'journey',   :git => 'https://github.com/rails/journey.git'
-            gem 'arel',      :git => 'https://github.com/rails/arel.git'
+            gem 'rails',     path: '#{Rails::Generators::RAILS_DEV_PATH}'
+            gem 'journey',   github: 'rails/journey'
+            gem 'arel',      github: 'rails/arel'
+            gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
-            gem 'rails',     :git => 'https://github.com/rails/rails.git'
-            gem 'journey',   :git => 'https://github.com/rails/journey.git'
-            gem 'arel',      :git => 'https://github.com/rails/arel.git'
+            gem 'rails',     github: 'rails/rails'
+            gem 'journey',   github: 'rails/journey'
+            gem 'arel',      github: 'rails/arel'
+            gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
             gem 'rails', '#{Rails::VERSION::STRING}'
 
             # Bundle edge Rails instead:
-            # gem 'rails', :git => 'https://github.com/rails/rails.git'
+            # gem 'rails', github: 'rails/rails'
           GEMFILE
         end
       end
@@ -181,10 +186,6 @@ module Rails
         end
       end
 
-      def ruby_debugger_gemfile_entry
-        "gem 'ruby-debug19', :require => 'ruby-debug'"
-      end
-
       def assets_gemfile_entry
         return if options[:skip_sprockets]
 
@@ -193,8 +194,9 @@ module Rails
             # Gems used only for assets and not required
             # in production environments by default.
             group :assets do
-              gem 'sass-rails',   :git => 'https://github.com/rails/sass-rails.git'
-              gem 'coffee-rails', :git => 'https://github.com/rails/coffee-rails.git'
+              gem 'sprockets-rails', github: 'rails/sprockets-rails'
+              gem 'sass-rails',   github: 'rails/sass-rails'
+              gem 'coffee-rails', github: 'rails/coffee-rails'
 
               # See https://github.com/sstephenson/execjs#readme for more supported runtimes
               #{javascript_runtime_gemfile_entry}
@@ -206,6 +208,7 @@ module Rails
             # Gems used only for assets and not required
             # in production environments by default.
             group :assets do
+              gem 'sprockets-rails', github: 'rails/sprockets-rails'
               gem 'sass-rails',   '~> 4.0.0.beta'
               gem 'coffee-rails', '~> 4.0.0.beta'
 
@@ -227,7 +230,7 @@ module Rails
         if defined?(JRUBY_VERSION)
           "gem 'therubyrhino'\n"
         else
-          "# gem 'therubyracer'\n"
+          "# gem 'therubyracer', platform: :ruby\n"
         end
       end
 
@@ -248,7 +251,7 @@ module Rails
       end
 
       def run_bundle
-        bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle]
+        bundle_command('install') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend]
       end
 
       def empty_directory_with_gitkeep(destination, config = {})
@@ -259,11 +262,6 @@ module Rails
       def git_keep(destination)
         create_file("#{destination}/.gitkeep") unless options[:skip_git]
       end
-
-      # Returns Ruby 1.9 style key-value pair.
-      def key_value(key, value)
-        "#{key}: #{value}"
-      end
     end
   end
 end