jets 3.0.22 → 3.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 564e115dd93f465b1041093b350e560009dc437fce0d2cd45a0d0120b7c1c214
-  data.tar.gz: df694dde52f5122bb77268be781b476c4fe49312a3b8de95d941cba91ad81c69
+  metadata.gz: a02adce73b38c44ec15f546538285e9797f544bdf6abe1301bfd97369c2d5cec
+  data.tar.gz: de64b60cfcc68e6af7b37f2c35ebd404c7d038dee00adb2f03f67c1a2d408ee0
 SHA512:
-  metadata.gz: 28e5b7d47af46c49abbff1419ea9b0fe788780bc4fb91e6acfb70d5b3e5c79c6d8df4af5f39e15085bcbd338648d7f4773bdcadd6c2bac96b0e720cdf1bd7d7e
-  data.tar.gz: 363782b3d1244f097b043b4d1cbc5bec06250234af75d5031813f4fe0cb1772444de7d8fde5d2f325f8357d9961d5af73f5c57fb3b0093a5a8a340ff28525cc8
+  metadata.gz: d9e95182926df309068f600c5179a0ea327884ba412b374490ae19130dd44b2dfdf4b4d1106e8527150cf05722e5b17df876d4ecf92ebcae252ad363748d6608
+  data.tar.gz: 12a73a2866479ab9e76466d7577a04cb319697f62441f90b86609f9f6567d48bd857fbaca1e8a3958ad0c9979e78da91b2e9afd82994e99f0e962c60faf4bfc4

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [3.0.23] - 2021-12-14
+- [#610](https://github.com/boltops-tools/jets/pull/610) Rewrite PLATFORMS section to specify Ruby only
+- [#611](https://github.com/boltops-tools/jets/pull/611) Update ruby_packager.rb
+
 ## [3.0.22] - 2021-10-26
 - [#607](https://github.com/boltops-tools/jets/pull/607) Job serialize - Revert "Fix job params serialization"
 

data/lib/jets/builders/ruby_packager.rb

@@ -3,7 +3,9 @@ require "bundler" # for clean_old_submodules only
 module Jets::Builders
   class RubyPackager
     include Util
-
+    
+    GEM_REGEXP = /-(arm|x)\d+.*-(darwin|linux)/    
+    
     attr_reader :full_app_root
     def initialize(relative_app_root)
       @full_app_root = "#{build_area}/#{relative_app_root}"
@@ -169,21 +171,28 @@ module Jets::Builders
       # Replace things like nokogiri (1.11.1-x86_64-darwin) => nokogiri (1.11.1)
       lines, new_lines = new_lines, []
       lines.each do |l|
-        if l.include?("-x86_64-darwin")
-          l = l.sub('-x86_64-darwin','')
-        end
+        l.sub!(GEM_REGEXP, '') if l =~ GEM_REGEXP
         new_lines << l
       end
 
       # Make sure platform is ruby
-      lines, new_lines, marker = new_lines, [], false
+      lines, new_lines, in_platforms_section, platforms_rewritten = new_lines, [], false, false
       lines.each do |l|
-        if marker # the next loop has the platform we want to replace
+        if in_platforms_section && platforms_rewritten # once PLATFORMS has been found, skip all lines until the next section
+          if l.present?
+            next
+          else
+            in_platforms_section = false
+          end
+        end
+
+        if in_platforms_section && !platforms_rewritten # specify ruby as the only platform
           new_lines << "  ruby\n"
-          marker = false
+          platforms_rewritten = true
           next
         end
-        marker = l.include?('PLATFORMS')
+
+        in_platforms_section = l.include?('PLATFORMS')
         new_lines << l
       end
 

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.0.22"
+  VERSION = "3.0.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.0.22
+  version: 3.0.23
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer