Merge pull request #6168 from oclaussen/generate_valid_gemfile

Make gem_installer generate a valid Gemfile

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/chef/cookbook/gem_installer.rb b/lib/chef/cookbook/gem_installer.rb
index deac48ff78..79b62f7a72 100644
--- a/lib/chef/cookbook/gem_installer.rb
+++ b/lib/chef/cookbook/gem_installer.rb
@@ -40,6 +40,13 @@ class Chef
 
         cookbook_collection.each_value do |cookbook_version|
           cookbook_version.metadata.gems.each do |args|
+            if cookbook_gems[args.first].last.is_a?(Hash)
+              args << {} unless args.last.is_a?(Hash)
+              args.last.merge!(cookbook_gems[args.first].pop) do |key, v1, v2|
+                raise Chef::Exceptions::GemRequirementConflict.new(args.first, key, v1, v2) if v1 != v2
+                v2
+              end
+            end
             cookbook_gems[args.first] += args[1..-1]
           end
         end