jets-api 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69a0ae2689dddcba856316946b3d2819837d05a542b69bf33bbf025f7117d08
-  data.tar.gz: 0cf8e60cd2423ff63e8aed0f083ae25712a01d2245becae511fcd206dff00a15
+  metadata.gz: 51468ca624c4c38cb0195a8d607d3237feafb9aa835b33c2d8d5f545ad665af2
+  data.tar.gz: 01a6654c2aa40b6fa26b13f4d6227ffa954c40e17825d70b51e88d61e1094348
 SHA512:
-  metadata.gz: b85423d5ffa43da256e6429f98efd7c0371cefe43c15091604f0e25790ac6551ee6292e22290982468fe5964570954ee163f657a2f25ec103d20e4ad82f10801
-  data.tar.gz: 3e0297e48ab73fbab862d65de8240ceaa26bc4d7f175860d26d46d49cf6f898618a0c0776401f4d6c2ac9b1af62dfd255daec5294f278b0ea875ae0f788168d8
+  metadata.gz: 3b1c5fd73342ab8a586797e7c631fb2c9590be9f461c9ac7e6f8efd2a4b96cc67fa6b4542f9ce2315897cc7e2a0e6a43b4f10e6d07ce125af0a94c27ac190d93
+  data.tar.gz: 46e54fbcd532c31279c04bdb0fc99f73ee36030f2d5d809f3f0486c10b50c6dc55520967ae0b0d6e62713707708fc10a2648e9a2b4ab6fd2ba53636e5c6d3d19

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.2.2] - 2025-10-11
+- fix clean up gem variants
+
 ## [0.2.1] - 2025-10-11
 - fix gem detection ffi - gnu suffix and clean up incompatible platform variants
 - standardrb

data/lib/jets/api/gems/extract/base.rb

@@ -50,14 +50,13 @@ module Jets::Api::Gems::Extract
       dest
     end
 
-    @@log_level = :info # default level is :info
-    # @@log_level = :debug # uncomment to debug
+    @@log_level = ENV["JETS_API_LOG_LEVEL"] || "info" # default level is :info
     def log_level=(val)
       @@log_level = val
     end
 
-    def say(message, level = :info)
-      enabled = @@log_level == :debug || level == :debug
+    def say(message, level = "info")
+      enabled = @@log_level == "debug" || level == "debug"
       puts(message) if enabled
     end
   end

data/lib/jets/api/gems/extract/gem.rb

@@ -44,38 +44,36 @@ module Jets::Api::Gems::Extract
         gem_groups[base_name] << {dir: dir, name: name}
       end
 
-      # For each gem group, keep only x86_64-linux variants
-      gem_groups.each do |base_name, variants|
-        next if variants.size <= 1 # No cleanup needed if only one variant
+      # For each gem group, clean up platform variants
+      gem_groups.each { |base_name, variants| cleanup_gem_variants(base_name, variants, specs_dir) }
+    end
 
-        say "Found #{variants.size} platform variants for #{base_name}:"
-        variants.each { |v| say "  - #{v[:name]}" }
+    # Clean up platform variants for a specific gem group
+    def cleanup_gem_variants(base_name, variants, specs_dir)
+      return if variants.size <= 1 # No cleanup needed if only one variant
 
-        # Find x86_64-linux variants (preferred for AWS Lambda)
-        x86_64_variants = variants.select { |v| v[:name].include?("-x86_64-linux-gnu") || v[:name].include?("-x86_64-linux") }
+      say "Found #{variants.size} platform variants for #{base_name}:"
+      variants.each { |v| say "  - #{v[:name]}" }
 
-        if x86_64_variants.any?
-          # Keep x86_64-linux variants, remove others
-          keep_variants = x86_64_variants
-          remove_variants = variants - x86_64_variants
-        else
-          # If no x86_64-linux variants, keep the first one alphabetically
-          keep_variants = [variants.min_by { |v| v[:name] }]
-          remove_variants = variants - keep_variants
-        end
+      # Always favor base gem variants (without platform suffix) - these are from Jets API
+      # Remove all platform-specific variants
+      base_variants = variants.select { |v| !v[:name].match(/-[^-]+-[^-]+$/) }
+      platform_variants = variants - base_variants
 
-        say "Keeping: #{keep_variants.map { |v| v[:name] }.join(", ")}"
-        say "Removing: #{remove_variants.map { |v| v[:name] }.join(", ")}"
+      keep_variants = base_variants.any? ? base_variants : variants
+      remove_variants = platform_variants
 
-        # Remove incompatible variants
-        remove_variants.each do |variant|
-          say "Removing incompatible variant: #{variant[:name]}"
-          FileUtils.rm_rf(variant[:dir])
+      say "Keeping: #{keep_variants.map { |v| v[:name] }.join(", ")}"
+      say "Removing: #{remove_variants.map { |v| v[:name] }.join(", ")}"
 
-          # Also remove the corresponding gemspec
-          gemspec_path = "#{specs_dir}/#{variant[:name]}.gemspec"
-          FileUtils.rm_f(gemspec_path) if File.exist?(gemspec_path)
-        end
+      # Remove incompatible variants
+      remove_variants.each do |variant|
+        say "Removing incompatible variant: #{variant[:name]}"
+        FileUtils.rm_rf(variant[:dir])
+
+        # Also remove the corresponding gemspec
+        gemspec_path = "#{specs_dir}/#{variant[:name]}.gemspec"
+        FileUtils.rm_f(gemspec_path) if File.exist?(gemspec_path)
       end
     end
 

data/lib/jets/api/version.rb

@@ -1,5 +1,5 @@
 module Jets
   module Api
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets-api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tung Nguyen