prebake 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7152aa806669f0896d95a649eeeaad41a487d8e3dee400550a605f2b4595e761
-  data.tar.gz: 5f4f0ab6eb003077b367a11112fed63a3ab2fe626062c550a4ad13fa871e9f96
+  metadata.gz: dd89a26b2545f4c3a080e52028f1ec5fcc4100b36021321c45c2e35f70e6190c
+  data.tar.gz: 78c2f94618cbf112ad075ee84f780184bb53322db744a5012f1e299b03cf8d22
 SHA512:
-  metadata.gz: 658cbdca9d891f2d3c371b0b54adce27334357bf2fb748b71143dedac88ad9edbf8a77eaad71022d86acd1cd61d35e85d0f312fdb3d5c349c74787feb5241c86
-  data.tar.gz: 1a16e177051bd07a0fbf3ea4ccad9da56291c771a442a4624f6dfd9835140b4fa4a6c4a08a237b53502ab2563ddc4be8628c30fa3400888c63802c58da3efb50
+  metadata.gz: c846dc96b8e3366cf674c55e453f5808bf6f25c20aec20c6f62d00f0f86f7f18c589fb85c0b8cb400c7fd80ce7b9037adc4250ee484b8d798bf67bb812ceffc6
+  data.tar.gz: b906601a833da0313c4d1cbaad020abde631f1212337e0174d8062ca9777575b19ed98d4c882c109bd172d8de339d22a8fd59ef1986f5cd3444c437625634a51

data/lib/prebake/async_publisher.rb

@@ -9,39 +9,17 @@ require_relative "logger"
 module Prebake
   module AsyncPublisher
     @pending_specs = []
-    @threads = []
     @mutex = Mutex.new
 
     def self.reset!
-      @mutex.synchronize do
-        @pending_specs.clear
-        @threads.clear
-      end
+      @mutex.synchronize { @pending_specs.clear }
     end
 
-    # Queue a spec for later processing (no threads, no chdir)
     def self.enqueue(spec, backend)
       @mutex.synchronize { @pending_specs << [spec, backend] }
     end
 
-    # For testing - enqueue a raw block for async execution
-    def self.enqueue_block(&block)
-      thread = Thread.new do
-        block.call
-      rescue StandardError => e
-        Logger.warn "Error in background task: #{e.message}"
-      end
-
-      @mutex.synchronize { @threads << thread }
-    end
-
-    # Build all queued gems (serial, safe for Dir.chdir) then push in parallel
     def self.wait_for_completion(timeout: 120)
-      # First, wait for any raw block threads (from tests)
-      block_threads = @mutex.synchronize { @threads.dup }
-      block_threads.each { |t| t.join(timeout) }
-
-      # Then process queued specs
       specs = @mutex.synchronize { @pending_specs.dup }
       return if specs.empty?
 
@@ -71,10 +49,7 @@ module Prebake
 
       Logger.info "All pushes complete."
 
-      @mutex.synchronize do
-        @pending_specs.clear
-        @threads.clear
-      end
+      @mutex.synchronize { @pending_specs.clear }
     end
 
     def self.build_gem(spec, backend)

data/lib/prebake/backends/base.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../logger"
+
 module Prebake
   module Backends
     class Base
@@ -7,25 +9,47 @@ module Prebake
         raise NotImplementedError, "#{self.class}#fetch not implemented"
       end
 
-      def fetch_checksum(cache_key)
-        raise NotImplementedError, "#{self.class}#fetch_checksum not implemented"
+      def fetch_checksum(_cache_key)
+        nil
       end
 
       def push(gem_path, cache_key, checksum)
         raise NotImplementedError, "#{self.class}#push not implemented"
       end
 
-      def exists?(cache_key)
-        raise NotImplementedError, "#{self.class}#exists? not implemented"
+      def exists?(_cache_key)
+        false
       end
 
-      def delete(cache_key)
-        raise NotImplementedError, "#{self.class}#delete not implemented"
+      def delete(_cache_key)
+        false
       end
 
       def checksums_supported?
         true
       end
+
+      protected
+
+      def warn_if_insecure_http(url)
+        return if url.start_with?("https://")
+        return if ENV.fetch("PREBAKE_ALLOW_INSECURE", "false") == "true"
+        return unless url.start_with?("http://")
+        return if darwin_with_default_host?(url)
+
+        Logger.warn(
+          "Using insecure HTTP connection to #{url}. " \
+          "Set PREBAKE_ALLOW_INSECURE=true to suppress this warning."
+        )
+      end
+
+      private
+
+      def darwin_with_default_host?(url)
+        RUBY_PLATFORM.include?("darwin") &&
+          Prebake.backend_type == "http" &&
+          url.chomp("/") == Prebake::DEFAULT_HTTP_URL
+      end
     end
   end
 end

data/lib/prebake/backends/gemstash.rb

@@ -27,13 +27,7 @@ module Prebake
         @url = url.chomp("/")
         @key = key
 
-        return if @url.start_with?("https://") || ENV.fetch("PREBAKE_ALLOW_INSECURE", "false") == "true"
-        return unless @url.start_with?("http://")
-
-        Logger.warn(
-          "Using insecure HTTP connection to #{@url}. " \
-          "Set PREBAKE_ALLOW_INSECURE=true to suppress this warning."
-        )
+        warn_if_insecure_http(@url)
       end
 
       def fetch(cache_key)

data/lib/prebake/backends/http.rb

@@ -15,13 +15,7 @@ module Prebake
         @url = url.chomp("/")
         @token = token
 
-        return if @url.start_with?("https://") || ENV.fetch("PREBAKE_ALLOW_INSECURE", "false") == "true"
-        return unless @url.start_with?("http://")
-
-        Logger.warn(
-          "Using insecure HTTP connection to #{@url}. " \
-          "Set PREBAKE_ALLOW_INSECURE=true to suppress this warning."
-        )
+        warn_if_insecure_http(@url)
       end
 
       def fetch(cache_key)

data/lib/prebake/backends/s3.rb

@@ -12,11 +12,13 @@ module Prebake
         @bucket = bucket
         @region = region
         @prefix = prefix
+
+        require "aws-sdk-s3"
+      rescue LoadError
+        raise Prebake::Error, "aws-sdk-s3 gem is required for S3 backend"
       end
 
       def fetch(cache_key)
-        return nil unless sdk_available?
-
         response = client.get_object(bucket: @bucket, key: object_key(cache_key))
         path = File.join(Dir.tmpdir, "prebake-#{SecureRandom.hex(16)}.gem")
         File.binwrite(path, response.body.read)
@@ -27,8 +29,6 @@ module Prebake
       end
 
       def fetch_checksum(cache_key)
-        return nil unless sdk_available?
-
         response = client.get_object(bucket: @bucket, key: checksum_key(cache_key))
         response.body.read.strip
       rescue StandardError => e
@@ -37,8 +37,6 @@ module Prebake
       end
 
       def push(gem_path, cache_key, checksum)
-        return false unless sdk_available?
-
         gem_key = object_key(cache_key)
         File.open(gem_path, "rb") do |file|
           client.put_object(bucket: @bucket, key: gem_key, body: file)
@@ -60,8 +58,6 @@ module Prebake
       end
 
       def exists?(cache_key)
-        return false unless sdk_available?
-
         client.head_object(bucket: @bucket, key: object_key(cache_key))
         true
       rescue StandardError
@@ -69,8 +65,6 @@ module Prebake
       end
 
       def delete(cache_key)
-        return false unless sdk_available?
-
         client.delete_object(bucket: @bucket, key: object_key(cache_key))
         client.delete_object(bucket: @bucket, key: checksum_key(cache_key))
         Logger.info "Deleted #{cache_key} from S3"
@@ -90,14 +84,6 @@ module Prebake
         "#{object_key(cache_key)}.sha256"
       end
 
-      def sdk_available?
-        require "aws-sdk-s3"
-        true
-      rescue LoadError
-        Logger.warn "aws-sdk-s3 not available. Install it to use S3 backend."
-        false
-      end
-
       def client
         @client ||= Aws::S3::Client.new(region: @region)
       end

data/lib/prebake/ext_builder_patch.rb

@@ -21,11 +21,7 @@ module Prebake
       expected_checksum = Prebake.backend.fetch_checksum(cache_key)
 
       if expected_checksum.nil? && Prebake.backend.checksums_supported?
-        Logger.warn "No checksum available for #{cache_key}, removing cached gem"
-        Prebake.backend.delete(cache_key)
-        # GET triggers the worker to dispatch a rebuild via GH Actions on cache miss
-        trigger_path = Prebake.backend.fetch(cache_key)
-        FileUtils.rm_f(trigger_path) if trigger_path
+        trigger_rebuild(cache_key)
         return super
       end
 
@@ -52,6 +48,14 @@ module Prebake
 
     private
 
+    def trigger_rebuild(cache_key)
+      Logger.warn "No checksum available for #{cache_key}, removing cached gem"
+      Prebake.backend.delete(cache_key)
+      # GET triggers the worker to dispatch a rebuild via GH Actions on cache miss
+      trigger_path = Prebake.backend.fetch(cache_key)
+      FileUtils.rm_f(trigger_path) if trigger_path
+    end
+
     def verify_checksum(cache_key, expected, gem_path)
       return true if expected.nil?
 

data/lib/prebake/extractor.rb

@@ -28,6 +28,14 @@ module Prebake
           next unless real_binary.start_with?("#{real_tmpdir}/")
 
           relative = binary.sub("#{tmpdir}/", "")
+
+          # Normalize paths from legacy cached gems where binaries were
+          # packaged from gem_dir build artifacts instead of extension_dir.
+          # ext/<name>/<name>.so  → <name>.so  (build artifact path)
+          # lib/<name>/<name>.so  → <name>/<name>.so  (gem lib path)
+          relative = relative.sub(%r{\Aext/[^/]+/}, "") if relative.start_with?("ext/")
+          relative = relative.sub(%r{\Alib/}, "") if relative.start_with?("lib/")
+
           dest = File.join(spec.extension_dir, relative)
           FileUtils.mkdir_p(File.dirname(dest))
           FileUtils.cp(binary, dest)

data/lib/prebake/logger.rb

@@ -5,7 +5,7 @@ module Prebake
     LEVELS = { debug: 0, info: 1, warn: 2 }.freeze
 
     def self.level
-      LEVELS.fetch(ENV.fetch("PREBAKE_LOG_LEVEL", "warn").to_sym, 1)
+      @level ||= LEVELS.fetch(ENV.fetch("PREBAKE_LOG_LEVEL", "warn").to_sym, 1)
     end
 
     def self.debug(msg)
@@ -22,23 +22,12 @@ module Prebake
 
     def self.warn(msg)
       return unless level <= 2
-      return if darwin_with_default_host?
 
       output "  [prebake] WARN: #{msg}"
     end
 
     def self.reset!
-      remove_instance_variable(:@darwin_with_default_host) if instance_variable_defined?(:@darwin_with_default_host)
-    end
-
-    private_class_method def self.darwin_with_default_host?
-      return @darwin_with_default_host if defined?(@darwin_with_default_host)
-
-      @darwin_with_default_host =
-        RUBY_PLATFORM.include?("darwin") &&
-        Prebake.backend_type == "http" &&
-        (url = ENV.fetch("PREBAKE_HTTP_URL", nil)
-         url.nil? || url.chomp("/") == Prebake::DEFAULT_HTTP_URL)
+      @level = nil
     end
 
     def self.output(msg)

data/lib/prebake/platform_gem_builder.rb

@@ -48,6 +48,22 @@ module Prebake
       platform_spec.platform = Gem::Platform.new(Platform.generalized)
       platform_spec.extensions = []
 
+      # Remove build-artifact binaries copied from gem_dir (they live at
+      # wrong paths like ext/<name>/<name>.so).  The properly-installed
+      # binaries are in extension_dir, placed there by `make install`.
+      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)
+        Dir.glob(File.join(ext_dir, "**/*.{so,bundle,dll}")).each do |binary|
+          next if File.symlink?(binary)
+          relative = binary.delete_prefix("#{ext_dir}/")
+          dest = File.join(build_dir, relative)
+          FileUtils.mkdir_p(File.dirname(dest))
+          FileUtils.cp(binary, dest)
+        end
+      end
+
       prefix = "#{build_dir}/"
       compiled = Dir.glob(File.join(build_dir, "**/*.{so,bundle,dll}"))
                     .map { |f| f.delete_prefix(prefix) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prebake
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Thejus Paul
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-24 00:00:00.000000000 Z
+date: 2026-03-30 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