prebake 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b26fcaf48bb23473eba4be41c4934c2e3e66467b11eab5ea31f35df3e6ff254
-  data.tar.gz: 64f5aad9dd04be31a4de3e54d555f9fdeb1d84931b831d1b231b79633043fa61
+  metadata.gz: 31185ad0841776ec02da2cd5c8009dc58902aa55e19c4a99709a24e1cde477b7
+  data.tar.gz: d394286a0464cabe3f925edb48b964a902675581dc9f36e3e486819f7f7560d0
 SHA512:
-  metadata.gz: 5c4f0ee21e83e836af98ad1ec0c37737836efc14345936d0f1e19d6702eddecb9a17afd6dec46f1e3fce24b02fca492c9e48a6f9db4be536ec99c48c57c08416
-  data.tar.gz: 0fb83b5a5679666ce2b5ed41f27280742fef92d87ab489f056ba0271514eac93c6efe25e2733bb9a0feea1addbd617227119f2febe0fb9e127351ea5e84264fe
+  metadata.gz: ba38a6ef9217ce6c9273db4a2c284b991c7406f24837a98278dd9faf19905216a96b3bcb4e46b977523fb63b7d1bc5d94e1f1de1933414625978ed1d73adcd9b
+  data.tar.gz: cebd97cda589821cd1eb4df1ed4b71b39134d9d3e9e1433ab34f70acf7585d4568c900559631b640d3e1dce869f4b15d230a21b3e4a6587eba7fab9beeba9942

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
 
@@ -42,7 +38,10 @@ module Prebake
       end
 
       if verify_checksum(cache_key, expected_checksum, cached_gem)
-        install_from_cache(cached_gem)
+        unless install_from_cache(cached_gem)
+          Prebake.backend.delete(cache_key)
+          return super
+        end
       else
         super
       end
@@ -52,6 +51,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?
 
@@ -65,10 +72,16 @@ module Prebake
     end
 
     def install_from_cache(gem_path)
-      Logger.info "Installing precompiled #{@spec.name}-#{@spec.version}"
-      Extractor.install(gem_path, @spec)
+      count = Extractor.install(gem_path, @spec)
+
+      if count.zero?
+        Logger.warn "No binaries found in cached gem for #{@spec.name}, falling back to source build"
+        return false
+      end
+
       FileUtils.mkdir_p(File.dirname(@spec.gem_build_complete_path))
       FileUtils.touch(@spec.gem_build_complete_path)
+      true
     end
   end
 end

data/lib/prebake/extractor.rb

@@ -45,6 +45,8 @@ module Prebake
 
       Logger.info "Installed precompiled #{File.basename(gem_path)} " \
                   "(#{extracted_count} binary files)"
+
+      extracted_count
     rescue StandardError => e
       Logger.warn "Extraction failed for #{File.basename(gem_path)}: #{e.message}"
       raise

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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prebake
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Thejus Paul