prebundler 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4367b16dd270ecc8daa363de78e174123030871509d0fae9051194e82c086cb
-  data.tar.gz: 4d72e1df239d66f4774b4c330f6d9af90fb0c98649338e7cca6c56b2c4dbb776
+  metadata.gz: c0fa034ffbb98e0cc6d86acf0f364e18524ad9fccb58531d8ce9a6c17eb0cada
+  data.tar.gz: 05ed655f3564bb17000ae9513d224800431670115357f3b379b5c9031853a8b5
 SHA512:
-  metadata.gz: 0f7db5d69593de1cc601990a74a6d2dce27c9ff2f4d36dd7128201120386cb42b485edd1dc71fda4abf2c5a33a8b7b215351facc22718c8d6b6038b61600db8a
-  data.tar.gz: 611ad14c794f56d6e986e69f5dc03434ae08d3d09e22e23cd98049da74aa69032894612dab35ffd35d308db36889f50106e261613ff8a46bbf21c5e1e8891ced
+  metadata.gz: aae6ace1ae931abd77108a31fff2df2a5d3a896922ae916c40cb89ef9043a8bb789460c51f87f4868381deef46eb5df8676c01b912fe43c4ff15946de7ab94a8
+  data.tar.gz: 7e198a678b46e2d303ad5b6cce696f9526211d9f765dcff49765947b9af5d52c3dd7839a72ab6c43d71dc5f320425b44f57fd4ba19cb7b03449df37efd046833

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.15.2
+* Fix issue causing prebundler to store empty archives for some gems with native extensions.
+  - `Bundler.local_platform` reports "aarch64-linux" in my Docker container, but eg. nokogiri's platform is "aarch64-linux-gnu." Using Bundler's local platform to identify the gem's installation directory silently fails because we're missing the "-gnu" part, so no files are included in the archive.
+
 ## 0.15.1
 * Specify file path when evaling other gemfiles.
   - `instance_eval` takes two additional arguments, the first of which populates the value of the `__FILE__` constant. This argument was not being passed in several cases, which led to an unexpected working directory when calling `eval_gemfile` with relative paths.

data/lib/prebundler/cli/install.rb

@@ -117,9 +117,13 @@ module Prebundler
       end
 
       def store_gem(gem_ref, dest_file)
-        out.puts "Storing #{gem_ref.id}"
-        gem_ref.add_to_tar(dest_file)
-        config.storage_backend.store_file(dest_file, gem_ref.tar_file)
+        if File.exist?(gem_ref.install_dir)
+          out.puts "Storing #{gem_ref.id}"
+          gem_ref.add_to_tar(dest_file)
+          config.storage_backend.store_file(dest_file, gem_ref.tar_file)
+        else
+          out.puts "Could not determine install dir for #{gem_ref.id}, skipping storage"
+        end
       end
 
       def update_bundle_config

data/lib/prebundler/gem_ref.rb

@@ -188,7 +188,12 @@ module Prebundler
     end
 
     def find_platform_dir(base)
-      platform = Bundler.local_platform.to_a
+      platform = case spec.platform
+        when String
+          [spec.platform]
+        else
+          spec.platform.to_a
+      end
 
       platform.size.downto(0) do |i|
         dir = [base, *platform[0...i]].join('-')

data/lib/prebundler/gemfile_interpreter.rb

@@ -18,11 +18,14 @@ module Prebundler
       instance_eval(File.read(gemfile_path), gemfile_path, 0)
 
       lockfile = Bundler::LockfileParser.new(File.read("#{gemfile_path}.lock"))
+      local_platform = Bundler.local_platform
 
       lockfile.specs.each do |spec|
-        gems[spec.name] ||= GemRef.create(spec.name, bundle_path, options)
-        gems[spec.name].spec = spec
-        gems[spec.name].dependencies = spec.dependencies.map(&:name)
+        if spec.match_platform(local_platform)
+          gems[spec.name] ||= GemRef.create(spec.name, bundle_path, options)
+          gems[spec.name].spec = spec
+          gems[spec.name].dependencies = spec.dependencies.map(&:name)
+        end
       end
 
       # Get rid of gems without a spec, as they are likely not supposed

data/lib/prebundler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prebundler
-  VERSION = '0.15.1'
+  VERSION = '0.15.2'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: prebundler
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,7 +114,6 @@ files:
 homepage: http://github.com/camertron
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Gem dependency prebuilder
 test_files: []