allow externally defined parent lockfiles (#26)

instructure · Feb 12, 2024 · 8009bf4 · 8009bf4
1 parent ca1d05c
commit 8009bf4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/bundler/multilock.rb b/lib/bundler/multilock.rb
@@ -70,7 +70,8 @@ def add_lockfile(lockfile = nil,
 
         parent = expand_lockfile(parent)
         if parent != Bundler.default_lockfile(force_original: true) &&
-           !lockfile_definitions.find { |definition| definition[:lockfile] == parent }
+           !lockfile_definitions.find { |definition| definition[:lockfile] == parent } &&
+           !parent.exist?
           raise ArgumentError, "Parent lockfile #{parent} is not defined"
         end
 

diff --git a/spec/bundler/multilock_spec.rb b/spec/bundler/multilock_spec.rb
@@ -138,6 +138,14 @@
     end
   end
 
+  it "allows externally defined parents if they exist" do
+    with_gemfile(<<~RUBY) do
+      lockfile("full", parent: Bundler.default_lockfile)
+    RUBY
+      invoke_bundler("install")
+    end
+  end
+
   it "generates custom lockfiles with varying versions" do
     with_gemfile(<<~RUBY) do
       lockfile do