prebake 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b41470c179a9d7eeea7abf647de6fa9ae136315e3d340b7aa15df32947eb736
-  data.tar.gz: 8ff27c2b4cec2e3b4eae238f7f03f5349f81c19c00a69ca09342fa9517280474
+  metadata.gz: b2c8911f4634bbddf8455aae1f54efc5985f72372a3cd1581fa890da5fc7e543
+  data.tar.gz: 2efa89bd847b4c67eceb11479452267bd68812e503bba51f997317e469cd8b38
 SHA512:
-  metadata.gz: 9e74e49ebb1930667976828920f843f1470dbab7221da5b32bc8005b95dbf74bff330840f9e668aa02b975a2d272f81de644fb6269014079c5c016b8abad7041
-  data.tar.gz: 59fda3db5878eee943b404128c6be3e13e0c95565694cc9e33479e140666474b82d888a2773d03a16020581dcfbb6b93f845181a5a3f378c216567d385f37dc6
+  metadata.gz: 73e53914ed4dec0e1a0b5ce3a9be292cd75cf0d8e4c24336ad341b0573f939e46c09f079e2afde4b23ba51fd1127aaa54dae96018546492187417689b5ccdefe
+  data.tar.gz: ed0b096a62e01f40d859033457ed6ed0b9ba8301df0fa90bed67100195687afe33af3e92a52959d8c2bfbbc741dba9be7b3994def8f998a23641fb14eca1d2be

data/lib/prebake/extension_validator.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require_relative "logger"
+
+module Prebake
+  module ExtensionValidator
+    BINARY_GLOB = "*.{so,bundle,dll}"
+
+    def self.validate_all
+      Bundler.definition.specs.each { |spec| validate(spec) }
+    end
+
+    def self.validate(spec)
+      ext_dir = spec.extension_dir
+      return unless File.exist?(File.join(ext_dir, ".prebake"))
+
+      # Fast path: root-level binaries already present
+      return if Dir.glob(File.join(ext_dir, BINARY_GLOB)).any?
+
+      # Scan known-broken nested patterns
+      nested = Dir.glob(File.join(ext_dir, "extension", "*", "*", BINARY_GLOB))
+      nested.concat(Dir.glob(File.join(ext_dir, "lib", BINARY_GLOB)))
+
+      nested.each do |binary|
+        next if File.symlink?(binary)
+        next if File.size(binary).zero?
+
+        dest = File.join(ext_dir, File.basename(binary))
+        next if File.exist?(dest)
+
+        FileUtils.cp(binary, dest)
+        Logger.info "Validator: copied #{File.basename(binary)} to #{ext_dir}"
+      end
+    end
+  end
+end

data/lib/prebake/extractor.rb

@@ -46,6 +46,9 @@ module Prebake
         end
       end
 
+      # Mark this extension_dir as prebake-managed for post-install validation
+      FileUtils.touch(File.join(spec.extension_dir, ".prebake")) if extracted_count > 0
+
       Logger.info "Installed precompiled #{File.basename(gem_path)} " \
                   "(#{extracted_count} binary files)"
 

data/lib/prebake/hooks.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "async_publisher"
+require_relative "extension_validator"
 require_relative "logger"
 
 module Prebake
@@ -21,6 +22,8 @@ module Prebake
       end
 
       Bundler::Plugin::API.hook("after-install-all") do |_deps|
+        ExtensionValidator.validate_all
+
         next unless Prebake.push_enabled?
 
         AsyncPublisher.wait_for_completion

data/lib/prebake/platform_gem_builder.rb

@@ -56,14 +56,27 @@ module Prebake
       ext_dir = @spec.extension_dir
       if ext_dir && File.directory?(ext_dir)
         # Collect binaries at root and one level deep (e.g., nokogiri/nokogiri.so).
-        # Skip deeper paths which are platform artifacts from dirty extension_dirs
-        # (e.g., extension/x86_64-linux/4.0.0/gem.so left by prior extractions).
         binaries = Dir.glob(File.join(ext_dir, "*.{so,bundle,dll}")) +
                    Dir.glob(File.join(ext_dir, "*/*.{so,bundle,dll}"))
+
+        # Ruby 4.0+ places compiled extensions in extension/<platform>/<abi>/
+        # within extension_dir.  Collect these too, normalizing their paths
+        # to root level so the cached gem is layout-agnostic.
+        Dir.glob(File.join(ext_dir, "extension/*/*/*.{so,bundle,dll}")).each do |binary|
+          relative = binary.delete_prefix("#{ext_dir}/")
+          normalized = relative.sub(%r{\Aextension/[^/]+/[^/]+/}, "")
+          # Skip if a root-level binary with the same name already exists
+          next if binaries.any? { |b| b.delete_prefix("#{ext_dir}/") == normalized }
+
+          binaries << binary
+        end
+
         binaries.each do |binary|
           next if File.symlink?(binary)
           next if File.size(binary).zero?
           relative = binary.delete_prefix("#{ext_dir}/")
+          # Normalize extension/<platform>/<abi>/ paths to root level
+          relative = relative.sub(%r{\Aextension/[^/]+/[^/]+/}, "")
           dest = File.join(build_dir, relative)
           FileUtils.mkdir_p(File.dirname(dest))
           FileUtils.cp(binary, dest)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prebake
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Thejus Paul
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-03-31 00:00:00.000000000 Z
 dependencies: []
 description: Prebake speeds up bundle install by skipping native gem compilation.
   It fetches precompiled binaries for gems like puma, nokogiri, pg, grpc, and bootsnap
@@ -32,6 +32,7 @@ files:
 - lib/prebake/backends/s3.rb
 - lib/prebake/cache_key.rb
 - lib/prebake/ext_builder_patch.rb
+- lib/prebake/extension_validator.rb
 - lib/prebake/extractor.rb
 - lib/prebake/hooks.rb
 - lib/prebake/logger.rb