Improve bundling bundler logic

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb
index 193b0f4307..36faf1a6d5 100644
--- a/lib/bundler/spec_set.rb
+++ b/lib/bundler/spec_set.rb
@@ -18,6 +18,7 @@ module Bundler
 
     def for(dependencies, skip = [], check = false, match_current_platform = false)
       handled, deps, specs = {}, dependencies.dup, []
+      skip << 'bundler'
 
       until deps.empty?
         dep = deps.shift
@@ -44,6 +45,10 @@ module Bundler
         end
       end
 
+      if spec = lookup['bundler'].first
+        specs << spec
+      end
+
       check ? true : SpecSet.new(specs)
     end
 
@@ -56,6 +61,13 @@ module Bundler
       lookup[key].reverse
     end
 
+    def []=(key, value)
+      @specs << value
+      @lookup = nil
+      @sorted = nil
+      value
+    end
+
     def to_a
       sorted.dup
     end