Add check for lockfile object

rubygems · Mar 19, 2018 · 470d7de · 470d7de
1 parent 72b344e
commit 470d7de
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
@@ -101,13 +101,18 @@ def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, opti
       @static_gemfile  = false
 
       @locked_gems            = lockfile
-      @lockfile               = lockfile && lockfile.lockfile
-      @lockfile_contents      = lockfile && lockfile.lockfile_contents || String.new
-      @locked_bundler_version = lockfile && lockfile.bundler_version
-      @locked_ruby_version    = lockfile && lockfile.ruby_version
-      @locked_platforms       = lockfile && lockfile.platforms || []
+      @lockfile               = lockfile
+      @lockfile_contents      = String.new
+      @locked_bundler_version = nil
+      @locked_ruby_version    = nil
+      @locked_platforms       = []
 
       if lockfile
+        @lockfile               = lockfile.lockfile
+        @lockfile_contents      = lockfile.lockfile_contents || String.new
+        @locked_bundler_version = lockfile.bundler_version
+        @locked_ruby_version    = lockfile.ruby_version
+        @locked_platforms       = lockfile.platforms || []
         @platforms = @locked_platforms.dup
 
         if unlock != true

diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
@@ -216,6 +216,11 @@ def github(repo, options = {})
     end
 
     def to_definition(lockfile, unlock)
+      # Convert lockfile to LockfileParser object
+      if lockfile && !lockfile.instance_of?(LockfileParser)
+        lockfile = LockfileParser.new(Bundler.read_file(lockfile))
+      end
+
       Definition.new(lockfile, @dependencies, @sources, unlock, @ruby_version, @optional_groups, @gemfiles).tap do |definition|
         definition.static_gemfile = !@dynamic
       end

diff --git a/lib/bundler/injector.rb b/lib/bundler/injector.rb
@@ -31,10 +31,6 @@ def inject(gemfile_path, lockfile_path)
         # Set conservative versioning to false because we want to let the resolver resolve the version first
         builder.eval_gemfile("injected gems", build_gem_lines(false)) if @new_deps.any?
 
-        # resolve to see if the new deps broke anything
-        @definition = builder.to_definition(lockfile_path, {})
-        @definition.resolve_remotely!
-
         # since nothing broke, we can add those gems to the gemfile
         append_to(gemfile_path, build_gem_lines(@options[:conservative_versioning])) if @new_deps.any?