Merge commit 'mainstream/master'

Conflicts:
	railties/guides/files/stylesheets/main.css
	railties/guides/rails_guides/generator.rb
	railties/guides/source/index.erb.textile

1 files changed, 7 insertions, 4 deletions

diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 5a07841be8..2dd659032f 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -72,13 +72,14 @@ module Rails
     rescue Gem::LoadError
     end
 
-    def dependencies
-      return [] if framework_gem?
-      return [] if specification.nil?
+    def dependencies(options = {})
+      return [] if framework_gem? || specification.nil?
+
       all_dependencies = specification.dependencies.map do |dependency|
         GemDependency.new(dependency.name, :requirement => dependency.version_requirements)
       end
-      all_dependencies += all_dependencies.map(&:dependencies).flatten
+
+      all_dependencies += all_dependencies.map { |d| d.dependencies(options) }.flatten if options[:flatten]
       all_dependencies.uniq
     end
 
@@ -149,6 +150,8 @@ module Rails
     end
 
     def unpack_to(directory)
+      return if specification.nil? || File.directory?(gem_dir(directory)) || framework_gem?
+
       FileUtils.mkdir_p directory
       Dir.chdir directory do
         Gem::GemRunner.new.run(unpack_command)