prebake 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 165d7d78f5647f35f50690133586dfd1c7d18b55958a184f20f812cd322587ce
-  data.tar.gz: e0f7ee51e509b3961bfaa812d142e4d84a1ea1ba8a110fa8330b5da74165e638
+  metadata.gz: f8631c361d4db2193eacf4995fb4127aff87dac604181479f2a4d8dcce984da7
+  data.tar.gz: eec69b8190a68c262659ab98e134174a5ea06f9b1ffa25c204bc3b03de5dcb1a
 SHA512:
-  metadata.gz: eeeb9c110e82c848a208738c35e565c9590586f7848e782524de04e6482fd9fa378da70a9be3191a2e40821c09ddcd7273d2ec2963028d7bfab6783addd90c4c
-  data.tar.gz: 22d403d28812c4ff75a3f620ff67d8761ffcfb2917727233e55d6d7b59687e689256ec42ec81685ccbbdeb05d27756e737f76b3c5a10bb4ec2f9ee0eca82c06e
+  metadata.gz: 58878c01e36b7553feba5fc0077b2affb94d1188aa53e8e65839fd047d89d8e9089c5eae6a1c7258fccf13852e7cc1ea86131711948e301511f8db64294a712f
+  data.tar.gz: 3860c5f16d6765e4fbff18c1049e3402610c9961d07cf8cec61115352be954ddf647e37c9c0a6b7055e62bdb6ea4cc3ce7c041ef6306302a8daac29dc91e5643

data/lib/prebake/async_publisher.rb

@@ -76,7 +76,8 @@ module Prebake
       end
 
       if !Prebake.libruby_available? && ElfInspector.libruby_needed_for_gem?(gem_path)
-        Logger.warn "Skipping push of #{cache_key}: binary requires libruby.so (dynamic Ruby) but this is a static Ruby build; binary would crash on this platform"
+        Logger.warn "Skipping push of #{cache_key}: binary requires libruby.so (dynamic Ruby) " \
+                    "but this is a static Ruby build; binary would crash on this platform"
         FileUtils.rm_f(gem_path)
         return nil
       end

data/lib/prebake/elf_inspector.rb

@@ -10,7 +10,10 @@ module Prebake
   module ElfInspector
     def self.required_glibc_for_gem(gem_path)
       versions = []
-      each_gem_binary(gem_path) { |binary| v = required_glibc(binary); versions << v if v }
+      each_gem_binary(gem_path) do |binary|
+        v = required_glibc(binary)
+        versions << v if v
+      end
       versions.empty? ? nil : versions.max_by { |v| Gem::Version.new(v) }
     rescue StandardError => e
       # Malformed gem, missing objdump, or I/O error — treat as unknown, let
@@ -69,7 +72,7 @@ module Prebake
       Dir.mktmpdir("prebake-gem") do |tmpdir|
         Gem::Package.new(gem_path).extract_files(tmpdir)
         Dir.glob(File.join(tmpdir, "**/*.{so,bundle,dll}")).each do |binary|
-          next if File.symlink?(binary) || File.size(binary).zero?
+          next if File.symlink?(binary) || File.empty?(binary)
 
           yield binary
         end

data/lib/prebake/ext_builder_patch.rb

@@ -11,6 +11,14 @@ require_relative "logger"
 
 module Prebake
   module ExtBuilderPatch
+    # The metrics cops are off for this method deliberately. It is a cascade of
+    # cache checks where every failure path falls through to `super`, the real
+    # source build. Extracting any stage would mean returning a sentinel for the
+    # caller to turn back into `super`, which reads worse than the cascade and
+    # risks silently installing a gem with no compiled binaries if a branch is
+    # mistranslated.
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
     def build_extensions
       return super unless @spec.extensions.any?
       return super unless Prebake.enabled?
@@ -59,7 +67,7 @@ module Prebake
 
         unless installed
           Prebake.backend.delete(cache_key)
-          return super
+          super
         end
       else
         super
@@ -67,6 +75,8 @@ module Prebake
     ensure
       FileUtils.rm_f(cached_gem) if cached_gem
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
 
     private
 

data/lib/prebake/extension_validator.rb

@@ -24,7 +24,7 @@ module Prebake
 
       nested.each do |binary|
         next if File.symlink?(binary)
-        next if File.size(binary).zero?
+        next if File.empty?(binary)
 
         dest = File.join(ext_dir, File.basename(binary))
         next if File.exist?(dest)

data/lib/prebake/extractor.rb

@@ -17,35 +17,18 @@ module Prebake
 
         # Copy only binary files (.so, .bundle, .dll) to extension_dir
         Dir.glob(File.join(tmpdir, "**/*.{so,bundle,dll}")).each do |binary|
-          # Reject symlinks and empty files
-          next if File.symlink?(binary)
-          next if File.size(binary).zero?
-
-          # Verify path is within tmpdir (prevent traversal)
-          real_binary = File.realpath(binary)
-          real_tmpdir = File.realpath(tmpdir)
-          next unless real_binary.start_with?("#{real_tmpdir}/")
-
-          relative = binary.sub("#{tmpdir}/", "")
-
-          # Normalize paths from cached gems where binaries were packaged
-          # from gem_dir build artifacts or dirty extension_dirs.
-          # ext/<name>/<name>.so               → <name>.so       (build artifact)
-          # lib/<name>/<name>.so               → <name>/<name>.so (gem lib path)
-          # extension/<platform>/<ver>/<name>.so → <name>.so       (extension_dir artifact)
-          relative = relative.sub(%r{\Aext/[^/]+/}, "") if relative.start_with?("ext/")
-          relative = relative.sub(%r{\Alib/}, "") if relative.start_with?("lib/")
-          relative = relative.sub(%r{\Aextensions?/[^/]+/[^/]+/}, "") if relative.start_with?("extension/", "extensions/")
-
-          dest = File.join(spec.extension_dir, relative)
+          next unless safe_binary?(binary, tmpdir)
+
+          dest = File.join(spec.extension_dir, normalized_path(binary, tmpdir))
           FileUtils.mkdir_p(File.dirname(dest))
           FileUtils.cp(binary, dest)
+          restore_in_gem_dir(binary, tmpdir, spec)
           extracted_count += 1
         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
+      FileUtils.touch(File.join(spec.extension_dir, ".prebake")) if extracted_count.positive?
 
       Logger.info "Installed precompiled #{File.basename(gem_path)} " \
                   "(#{extracted_count} binary files)"
@@ -55,5 +38,42 @@ module Prebake
       Logger.warn "Extraction failed for #{File.basename(gem_path)}: #{e.message}"
       raise
     end
+
+    # Reject symlinks, empty files, and anything resolving outside tmpdir
+    # (path traversal via a crafted gem).
+    def self.safe_binary?(binary, tmpdir)
+      return false if File.symlink?(binary)
+      return false if File.empty?(binary)
+
+      File.realpath(binary).start_with?("#{File.realpath(tmpdir)}/")
+    end
+
+    # Normalize paths from cached gems where binaries were packaged from
+    # gem_dir build artifacts or dirty extension_dirs.
+    # ext/<name>/<name>.so                 → <name>.so        (build artifact)
+    # lib/<name>/<name>.so                 → <name>/<name>.so (gem lib path)
+    # extension/<platform>/<ver>/<name>.so → <name>.so        (extension_dir artifact)
+    def self.normalized_path(binary, tmpdir)
+      relative = binary.sub("#{tmpdir}/", "")
+      relative = relative.sub(%r{\Aext/[^/]+/}, "") if relative.start_with?("ext/")
+      relative = relative.sub(%r{\Alib/}, "") if relative.start_with?("lib/")
+      return relative unless relative.start_with?("extension/", "extensions/")
+
+      relative.sub(%r{\Aextensions?/[^/]+/[^/]+/}, "")
+    end
+
+    # A source build leaves binaries in the gem dir too: ffi-compiler builds in
+    # place under ext/, and RubyGems copies extconf output into lib/. FFI gems
+    # dlopen those exact paths (llhttp-ffi, sassc). Only ext/ and lib/ are
+    # restored, because self-hosted cached gems put extension_dir binaries at
+    # the gem root, where no build would leave them.
+    def self.restore_in_gem_dir(binary, tmpdir, spec)
+      relative = binary.delete_prefix("#{tmpdir}/")
+      return unless relative.start_with?("ext/", "lib/")
+
+      dest = File.join(spec.full_gem_path, relative)
+      FileUtils.mkdir_p(File.dirname(dest))
+      FileUtils.cp(binary, dest)
+    end
   end
 end

data/lib/prebake/platform_gem_builder.rb

@@ -54,34 +54,7 @@ module Prebake
       Dir.glob(File.join(build_dir, "**/*.{so,bundle,dll}")).each { |f| File.delete(f) }
 
       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).
-        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)
-        end
-      end
+      copy_installed_binaries(ext_dir, build_dir) if ext_dir && File.directory?(ext_dir)
 
       prefix = "#{build_dir}/"
       compiled = Dir.glob(File.join(build_dir, "**/*.{so,bundle,dll}"))
@@ -90,5 +63,38 @@ module Prebake
 
       platform_spec
     end
+
+    def copy_installed_binaries(ext_dir, build_dir)
+      installed_binaries(ext_dir).each do |binary|
+        next if File.symlink?(binary)
+        next if File.empty?(binary)
+
+        dest = File.join(build_dir, root_level_path(binary, ext_dir))
+        FileUtils.mkdir_p(File.dirname(dest))
+        FileUtils.cp(binary, dest)
+      end
+    end
+
+    # Binaries at root and one level deep (e.g., nokogiri/nokogiri.so), plus the
+    # extension/<platform>/<abi>/ layout Ruby 4.0+ installs into.  A nested
+    # binary is skipped when a root-level one already claims its normalized
+    # path, so the cached gem stays layout-agnostic.
+    def installed_binaries(ext_dir)
+      binaries = Dir.glob(File.join(ext_dir, "*.{so,bundle,dll}")) +
+                 Dir.glob(File.join(ext_dir, "*/*.{so,bundle,dll}"))
+
+      Dir.glob(File.join(ext_dir, "extension/*/*/*.{so,bundle,dll}")).each do |binary|
+        normalized = root_level_path(binary, ext_dir)
+        next if binaries.any? { |b| b.delete_prefix("#{ext_dir}/") == normalized }
+
+        binaries << binary
+      end
+
+      binaries
+    end
+
+    def root_level_path(binary, ext_dir)
+      binary.delete_prefix("#{ext_dir}/").sub(%r{\Aextension/[^/]+/[^/]+/}, "")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prebake
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Thejus Paul
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-13 00:00:00.000000000 Z
+date: 2026-09-23 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