serverlessgems 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f45e4781de3600f9c61880c3b508a2955a393332efff18d980bbc2ef0ebc88ab
-  data.tar.gz: f3d78701b967fb4fc01a0ad7f332ec83690a38f0f86a0549a210d984e8b362ae
+  metadata.gz: 4180b95b85ce932e83e67ba621485a458e1d7cff1d673af091eee2c80fc957e5
+  data.tar.gz: 9b84b2f954ea096fc9a2c9b8243cd771847926c8b0b26023baa802f85d771030
 SHA512:
-  metadata.gz: f7182eb8a6bafde793df547b4e8aa93a09160dfdc01181f5909fe6327971186f1c45e9d1e42d82ca65afcb98c8bf52785b877f9f9c6eb1385a8a3f4fd5b97ab4
-  data.tar.gz: 8d6d08fdc726541ce96b1d3a7fc56a2e324f816018e5f96705883994b2a084160bbe213d91ba043f3ab5e9dcbbc20e85cfca2227df68458810f40b2307a22cfd
+  metadata.gz: acb02e4538a245354e35904f9b4ebd308bd768d9a87273c3b8ac2bf7bf217ce8575492ef4d5d8be8a1d8fb53a9bced3ea8a17afd10446eee95596d2df4714c5b
+  data.tar.gz: df2bdc6db711f9d8599233e49fb8183006f6b14a41c28b93bfb4e48eea9f313e1af148d650238c8c4c2d778d68a6554069b2d931f6552a8b03f3eeb6ef3c491e

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.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,64 @@ 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, 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
+
+        say "Found #{variants.size} platform variants for #{base_name}:"
+        variants.each { |v| say "  - #{v[:name]}" }
+
+        # 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") }
+
+        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
+
+        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
     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.2"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: serverlessgems
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tung Nguyen
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gems
@@ -94,7 +93,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - tongueroo@gmail.com
 executables: []
@@ -131,7 +129,6 @@ homepage: https://github.com/boltops-tools/serverlessgems
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.13
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Client Library works with Serverless Gems API for Jets Ruby Serverless Framework
 test_files: []