serverlessgems 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f45e4781de3600f9c61880c3b508a2955a393332efff18d980bbc2ef0ebc88ab
-  data.tar.gz: f3d78701b967fb4fc01a0ad7f332ec83690a38f0f86a0549a210d984e8b362ae
+  metadata.gz: 3bf2582904ec4259bc6d3b6d0ebcf407e2a3061c5c32c49f1c96c23d46d28048
+  data.tar.gz: fb74483267d8a14301e6bb9f1ff1b9f8eae28227ae0b9895ad7853426103a46d
 SHA512:
-  metadata.gz: f7182eb8a6bafde793df547b4e8aa93a09160dfdc01181f5909fe6327971186f1c45e9d1e42d82ca65afcb98c8bf52785b877f9f9c6eb1385a8a3f4fd5b97ab4
-  data.tar.gz: 8d6d08fdc726541ce96b1d3a7fc56a2e324f816018e5f96705883994b2a084160bbe213d91ba043f3ab5e9dcbbc20e85cfca2227df68458810f40b2307a22cfd
+  metadata.gz: 8ee67a43c0eb68cbddab1a0e7b1aa3b7739c56d43df9f0e1aa91e6a5f9d23630b325ffe01ced97febf178cb991a4068499c07d938221f6c7577965b974809ed9
+  data.tar.gz: 9bf66559b45718864229297600d8e4d9b85a341d5e63d20f34c61ebde5ac66c467b4d34dbb9f41b296a97cda5833f7540c6e76d0d217bd229743909d02d759b5

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [0.4.3] - 2025-10-11
+- fix clean up gem variants
+
+## [0.4.2] - 2025-10-10
+- fix gem detection ffi - gnu suffix and clean up incompatible platform variants
+
 ## [0.4.1] - 2024-06-22
 - standardrb and updates
 

data/lib/jets/gems/check.rb

@@ -56,9 +56,9 @@ module Jets::Gems
         * Unavailable: <%= missing_gem['gem_name'] -%> Available versions: <%= available.join(' ') %>
         <% end %>
         Your current serverlessgems source: #{gems_source}
-        
+
         Jets is unable to build a deployment package that will work on AWS Lambda without the required pre-compiled gems. To remedy this, you can:
-        
+
         * Use another gem that does not require compilation.
         * Create your own custom layer with the gem: http://rubyonjets.com/docs/extras/custom-lambda-layers/
         <% if agree.yes? -%>
@@ -72,10 +72,10 @@ module Jets::Gems
         * You can try redeploying again after a few minutes.
         * Non-reported gems may take days or even longer to be built.
         <% end -%>
-        
+
         Compiled gems usually take some time to figure out how to build as they each depend on different libraries and packages.
         More info: http://rubyonjets.com/docs/serverlessgems/
-        
+
       EOL
       erb = ERB.new(template, trim_mode: "-") # trim mode https://stackoverflow.com/questions/4632879/erb-template-removing-the-trailing-line
       erb.result(binding)
@@ -156,9 +156,9 @@ module Jets::Gems
     # On new 2021 macbook with m1 chip: the gems are being saved in a folder like so:
     #   nokogiri-1.12.5-arm64-darwin
     # The GEM_REGEXP accounts for this case.
-    GEM_REGEXP = /-(arm|x)\d+.*-(darwin|linux)/
+    GEM_REGEXP = /-(arm|x|aarch)\d+.*-(darwin|linux)(?:-gnu)?/
     def other_compiled_gems
-      paths = Dir.glob("#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}/gems/*{-darwin,-linux}")
+      paths = Dir.glob("#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}/gems/*{-darwin,-linux}*")
       paths.map { |p| File.basename(p).sub(GEM_REGEXP, "") }
     end
 

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

@@ -19,6 +19,62 @@ module Jets::Gems::Extract
       say "Unpacking into #{dest}"
       FileUtils.mkdir_p(dest)
       unzip(zipfile_path, dest)
+      cleanup_incompatible_platform_variants
+    end
+
+    # Removes incompatible platform variants to prevent RubyGems from choosing the wrong one
+    # For AWS Lambda, we want to keep only x86_64-linux variants and remove others
+    def cleanup_incompatible_platform_variants
+      gems_dir = "#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}/gems"
+      specs_dir = "#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}/specifications"
+      return unless Dir.exist?(gems_dir)
+
+      # Find all gem directories for this gem name
+      gem_dirs = Dir.glob("#{gems_dir}/#{gem_name}-*").select do |path|
+        File.directory?(path) && File.basename(path).start_with?(gem_name)
+      end
+
+      # Group by base gem name (without platform suffix)
+      gem_groups = {}
+      gem_dirs.each do |dir|
+        name = File.basename(dir)
+        # Handle platform-specific gem names like nokogiri-1.18.10-x86_64-linux-gnu
+        base_name = name.sub(/-(x86_64-linux-gnu|aarch64-linux-gnu|arm64-linux-gnu|i386-linux-gnu|powerpc-linux-gnu|sparc-linux-gnu|mips-linux-gnu|riscv-linux-gnu|loongarch-linux-gnu|sw_64-linux-gnu|hppa-linux-gnu|ia64-linux-gnu|s390-linux-gnu|x86_64|arm64|aarch64|i386|powerpc|sparc|mips|riscv|loongarch|sw_64|hppa|ia64|s390).*/, "")
+        gem_groups[base_name] ||= []
+        gem_groups[base_name] << {dir: dir, name: name}
+      end
+
+      # For each gem group, clean up platform variants
+      gem_groups.each { |base_name, variants| cleanup_gem_variants(base_name, variants, specs_dir) }
+    end
+
+    # 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
+
+      say "Found #{variants.size} platform variants for #{base_name}:"
+      variants.each { |v| say "  - #{v[:name]}" }
+
+      # 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
+
+      keep_variants = base_variants.any? ? base_variants : variants
+      remove_variants = platform_variants
+
+      say "Keeping: #{keep_variants.map { |v| v[:name] }.join(", ")}"
+      say "Removing: #{remove_variants.map { |v| v[:name] }.join(", ")}"
+
+      # 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
 
     # ensure that we always have the full gem name

data/lib/jets/gems/version.rb

@@ -1,5 +1,5 @@
 module Jets
   module Gems
-    VERSION = "0.4.1"
+    VERSION = "0.4.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverlessgems
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 2025-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gems
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.13
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Client Library works with Serverless Gems API for Jets Ruby Serverless Framework