bundler-multilock 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 648cdaff608ff51cfe15ab2c098cff90218068d650f9c0fa4825dca90d2cc573
-  data.tar.gz: 12be8f53d490c149f2e2691b4e694c8bc395673a2c30e622b5071b1b4771ddb4
+  metadata.gz: ad2556137eeec88cc813f9ac79cbb7062a4a16b067bf88a61cfacb03d1ae9add
+  data.tar.gz: 58c7c976aa0e57f426b80152f213d069ee7f24ea5b9da1ee0c1ef115a8208e64
 SHA512:
-  metadata.gz: 5e42ff819d3a1640e6c51dd326e01c9d3400a8193807cb1ed3400b72b9dc2b9fb0dc71289471545c74034c61f2c53884ef1f8c53618360d9490ff6193f72a19e
-  data.tar.gz: 916d273cb5dbe217d8b5d77be760f9db732e92b39177bfc5487f8868f93e0a90bca11afbeb4c09b3e508f99098f81275973b941e243e7668e0443cd61bcc888a
+  metadata.gz: 84e3cd4a4b12513f2a5ea4d0d214abb9e1a061bf96d041d1bea16c833131941ce8da7f9109018dd2bc5b2ddc4afc363e68caae7948707ec7d3a68ac8dea745f3
+  data.tar.gz: cb8d45a52af7437ab6192809711531df051f7da2343b91087d4522f520441ab90476c822499d6e0c13d015923bf0701a75c9cead68f52bc49026de439cd0fbbe

data/lib/bundler/multilock/ext/dsl.rb

@@ -53,7 +53,7 @@ module Bundler
         end
 
         def lockfile(*args, **kwargs, &block)
-          return if Multilock.loaded?
+          return true if Multilock.loaded?
 
           Multilock.add_lockfile(*args, builder: self, **kwargs, &block)
         end

data/lib/bundler/multilock/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Multilock
-    VERSION = "1.0.0"
+    VERSION = "1.0.2"
   end
 end

data/lib/bundler/multilock.rb

@@ -356,12 +356,7 @@ module Bundler
 
       def write_lockfile(lockfile_definition, lockfile, install:, dependency_changes: false)
         self.prepare_block = lockfile_definition[:prepare]
-        definition = Definition.build(lockfile_definition[:gemfile], lockfile, false)
-        definition.instance_variable_set(:@dependency_changes, dependency_changes) if dependency_changes
-        if lockfile_definition[:lockfile].exist?
-          definition.instance_variable_set(:@lockfile_contents,
-                                           lockfile_definition[:lockfile].read)
-        end
+        definition = build_definition(lockfile_definition, lockfile, dependency_changes: dependency_changes)
 
         resolved_remotely = false
         begin
@@ -370,7 +365,8 @@ module Bundler
           begin
             definition.resolve_with_cache!
           rescue GemNotFound, SolveFailure
-            definition = Definition.build(lockfile_definition[:gemfile], lockfile, false)
+            definition = build_definition(lockfile_definition, lockfile, dependency_changes: dependency_changes)
+
             definition.resolve_remotely!
             resolved_remotely = true
           end
@@ -391,6 +387,16 @@ module Bundler
       ensure
         self.prepare_block = nil
       end
+
+      def build_definition(lockfile_definition, lockfile, dependency_changes:)
+        definition = Definition.build(lockfile_definition[:gemfile], lockfile, false)
+        definition.instance_variable_set(:@dependency_changes, dependency_changes) if dependency_changes
+        if lockfile_definition[:lockfile].exist?
+          definition.instance_variable_set(:@lockfile_contents,
+                                           lockfile_definition[:lockfile].read)
+        end
+        definition
+      end
     end
 
     reset!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler-multilock
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Instructure
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Support Multiple Lockfiles