jets 5.0.14 → 5.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae6365fe50afc845cc215ec4ffb3355a418f8e587cbbf8b12d182cdabf901eb4
-  data.tar.gz: 8791a73d7f86a0010ccc018a712ba3f3cc5512c8d6f0b37538d262b2ef2fa2f9
+  metadata.gz: 793eaf384ef1ef578d47e79c46a137f04ff2734a8dbde8219a2da73e6d4a1750
+  data.tar.gz: d6d253a3cebc683cb876f513c042bdf443d73adc5b4d61b130e807234bd2c06c
 SHA512:
-  metadata.gz: 742a38687b5b6d33069dfe8080937e0ed01c3d6cd2ea807d548fd51fa88cb7d4930b34e8d01aa4ae8b9e9d1cb63a45b0ea26468e70153527954fd1b0c1e545e2
-  data.tar.gz: 0ccf5968934e66f0bd802808b2d1c8179a088a2160c0086d597d45c4d8f2dff7e4ea5dfd4ed35f9239e34089187ad0e3b13e17161b39338c13c07d100c83eb57
+  metadata.gz: 2546975115d9471875543b795c480c85086bad4d04ecfb827b56e08afd4626f669d339919e74a051d516e088c87f157b8c40cffbe3896d233fc511714e4fceb5
+  data.tar.gz: 2a964324f5596564081fc61741ae3c992395dafd02fe841d2dae31488398a9d6c765b7d300869154202842f102f35d6dae50a179634b9b62c5887fa9b3c82be7

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [5.0.15] - 2025-10-11
+- update jets-api 0.2.1 dependency
+- require logger super early
+- require logger and mutex_m dependency
+- add activemodel 7.0.8 dependency
+- update to transfer manager upload file to remove deprecation warning
+- update GEM_REGEXP match -gnu for Gemfile.lock rewrite
+
 ## [5.0.14] - 2024-05-20
 - [#719](https://github.com/rubyonjets/jets/pull/719) Support for s3 event sns configuration
 - [#722](https://github.com/rubyonjets/jets/pull/722) Sets config.cache_classes to true in test env

data/jets.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "actionmailer", "~> 7.0.8"
   spec.add_dependency "actionpack", "~> 7.0.8"
   spec.add_dependency "actionview", "~> 7.0.8"
+  spec.add_dependency "activemodel", "~> 7.0.8"
   spec.add_dependency "activerecord", "~> 7.0.8"
   spec.add_dependency "activesupport", "~> 7.0.8"
   spec.add_dependency "railties", "~> 7.0.8" # for ActiveRecord database_tasks.rb
@@ -52,12 +53,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dsl_evaluator", ">= 0.3.0" # for DslEvaluator.print_code
   spec.add_dependency "gems"
   spec.add_dependency "hashie"
-  spec.add_dependency "jets-api", ">= 0.1.4"
+  spec.add_dependency "logger"
+  spec.add_dependency "jets-api", ">= 0.2.1"
   spec.add_dependency "jets-git"
   spec.add_dependency "jets-html-sanitizer"
   spec.add_dependency "kramdown"
   spec.add_dependency "memoist"
   spec.add_dependency "mini_mime"
+  spec.add_dependency "mutex_m"
   spec.add_dependency "rack"
   spec.add_dependency "rainbow"
   spec.add_dependency "recursive-open-struct"

data/lib/jets/builders/ruby_packager.rb

@@ -4,7 +4,7 @@ module Jets::Builders
   class RubyPackager
     include Util
 
-    GEM_REGEXP = /-(arm|x)\d+.*-(darwin|linux)/
+    GEM_REGEXP = /-(arm|x)\d+.*-(darwin|linux|gnu)|-(aarch64|x86_64|arm64|i386|powerpc|sparc|mips|riscv|loongarch|sw_64|hppa|ia64|s390).*-(darwin|linux|gnu)/
 
     attr_reader :full_app_root
     def initialize(relative_app_root)
@@ -77,7 +77,7 @@ module Jets::Builders
       # For example we add the jets-rails to the Gemfile.
       copy_back_gemfile_lock
 
-      puts 'Bundle install completed'
+      puts "Bundle install completed"
     end
 
     # Example `bundle check` error:
@@ -92,7 +92,7 @@ module Jets::Builders
     #     The Gemfile's dependencies are satisfied
     #
     def bundle_check
-      out = ''
+      out = ""
       Bundler.with_unbundled_env do
         out = `cd #{cache_area} && bundle check 2>&1`
       end
@@ -124,7 +124,7 @@ module Jets::Builders
       puts "Tidying project: removing ignored files to reduce package size."
       tidy_project(@full_app_root)
       # The rack sub project has it's own gitignore.
-      tidy_project(@full_app_root+"/rack")
+      tidy_project(@full_app_root + "/rack")
     end
 
     def tidy_project(path)
@@ -158,7 +158,7 @@ module Jets::Builders
 
       # IE: /tmp/jets/demo/cache/vendor/gems/ruby/2.5.0/bundler/gems/webpacker-a8c46614c675
       Dir.glob("#{cache_area}/vendor/gems/ruby/2.5.0/bundler/gems/*").each do |path|
-        sha = path.split('-').last[0..6] # only first 7 chars of the git sha
+        sha = path.split("-").last[0..6] # only first 7 chars of the git sha
         unless git_shas.include?(sha)
           FileUtils.rm_rf(path) # REMOVE old submodule directory
         end
@@ -202,7 +202,7 @@ module Jets::Builders
       # amount is the number of lines to remove
       new_lines, capture, count, amount = [], true, 0, 2
       lines.each do |l|
-        capture = false if l.include?('BUNDLED WITH')
+        capture = false if l.include?("BUNDLED WITH")
         if capture
           new_lines << l
         end
@@ -215,7 +215,7 @@ 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|
-        l.sub!(GEM_REGEXP, '') if l =~ GEM_REGEXP
+        l.sub!(GEM_REGEXP, "") if GEM_REGEXP.match?(l)
         new_lines << l
       end
 
@@ -236,11 +236,11 @@ module Jets::Builders
           next
         end
 
-        in_platforms_section = l.include?('PLATFORMS')
+        in_platforms_section = l.include?("PLATFORMS")
         new_lines << l
       end
 
-      content = new_lines.join('')
+      content = new_lines.join("")
       IO.write(gemfile_lock, content)
     end
 
@@ -261,12 +261,12 @@ module Jets::Builders
     # Dont know why this is the case.
     def create_bundle_config(frozen: false)
       FileUtils.rm_rf("#{cache_area}/.bundle")
-      frozen_line = %Q|BUNDLE_FROZEN: "true"\n| if frozen
-      text =<<-EOL
----
-#{frozen_line}BUNDLE_PATH: "vendor/gems"
-BUNDLE_WITHOUT: "development:test"
-EOL
+      frozen_line = %(BUNDLE_FROZEN: "true"\n) if frozen
+      text = <<~EOL
+        ---
+        #{frozen_line}BUNDLE_PATH: "vendor/gems"
+        BUNDLE_WITHOUT: "development:test"
+      EOL
       bundle_config = "#{cache_area}/.bundle/config"
       FileUtils.mkdir_p(File.dirname(bundle_config))
       IO.write(bundle_config, text)

data/lib/jets/cfn/template.rb

@@ -4,7 +4,7 @@ module Jets::Cfn
 
     attr_reader :path
 
-    def initialize(path, options={})
+    def initialize(path, options = {})
       @path = path
       @options = options
     end
@@ -25,7 +25,8 @@ module Jets::Cfn
       end
     end
 
-  private
+    private
+
     def upload_to_s3?
       return false if @options[:stack_type] == :minimal # bucket not yet available
       bucket_name.present?
@@ -48,8 +49,7 @@ module Jets::Cfn
     end
 
     def upload_file_to_s3
-      obj = s3_resource.bucket(bucket_name).object(s3_key)
-      obj.upload_file(path)
+      transfer_manager.upload_file(path, bucket: bucket_name, key: s3_key)
 
       "https://s3.amazonaws.com/#{bucket_name}/#{s3_key}"
     end
@@ -58,6 +58,10 @@ module Jets::Cfn
       @s3_key ||= "jets/cfn-templates/#{File.basename(path)}"
     end
 
+    def transfer_manager
+      @transfer_manager ||= Aws::S3::TransferManager.new
+    end
+
     class << self
       # Caches reduce filesystem IO calls
       @@cache = {}
@@ -81,7 +85,7 @@ module Jets::Cfn
           template[:Outputs].keys.include?(key.to_sym)
         end
 
-        name = File.basename(found_template).sub(/\.yml$/,'')
+        name = File.basename(found_template).sub(/\.yml$/, "")
         name.underscore.camelize # IE: ApiResources1
       end
     end

data/lib/jets/cfn/upload.rb

@@ -1,12 +1,16 @@
-require 'active_support/number_helper'
-require 'digest'
-require 'rack/mime'
+require "active_support/number_helper"
+require "digest"
+require "rack/mime"
 
 module Jets::Cfn
   class Upload
     include Jets::AwsServices
     include ActiveSupport::NumberHelper # number_to_human_size
 
+    def transfer_manager
+      @transfer_manager ||= Aws::S3::TransferManager.new
+    end
+
     def upload
       upload_cfn_templates
       upload_zip_files
@@ -17,7 +21,7 @@ module Jets::Cfn
       Jets.s3_bucket
     end
 
-    def upload_cfn_templates(version=nil)
+    def upload_cfn_templates(version = nil)
       puts "Uploading CloudFormation templates to S3." unless version # hide message when version is passed in
       expression = "#{Jets::Names.templates_folder}/*"
       if version # outside of each loop to avoid repeating
@@ -26,13 +30,11 @@ module Jets::Cfn
         checksum = Jets::Builders::Md5.checksums["stage/code"]
         version = "shas/#{checksum}"
       end
-      checksum = Jets::Builders::Md5.checksums["stage/code"]
       Dir.glob(expression).each do |path|
         next unless File.file?(path)
-        key = ["jets/cfn-templates", version, File.basename(path)].compact.join('/')
-        obj = s3_resource.bucket(bucket_name).object(key)
-        puts "Uploading #{path} to s3://#{bucket_name}/#{key}".color(:green) if ENV['JETS_DEBUG']
-        obj.upload_file(path)
+        key = ["jets/cfn-templates", version, File.basename(path)].compact.join("/")
+        puts "Uploading #{path} to s3://#{bucket_name}/#{key}".color(:green) if ENV["JETS_DEBUG"]
+        transfer_manager.upload_file(path, bucket: bucket_name, key: key)
       end
     end
 
@@ -50,17 +52,16 @@ module Jets::Cfn
       puts "Uploading #{path} (#{file_size}) to S3"
       start_time = Time.now
       s3_key = "jets/code/#{File.basename(path)}"
-      obj = s3_resource.bucket(bucket_name).object(s3_key)
-      obj.upload_file(path)
+      transfer_manager.upload_file(path, bucket: bucket_name, key: s3_key)
       puts "Uploaded to s3://#{bucket_name}/#{s3_key}".color(:green)
-      puts "Time to upload code to s3: #{pretty_time(Time.now-start_time).color(:green)}"
+      puts "Time to upload code to s3: #{pretty_time(Time.now - start_time).color(:green)}"
     end
 
     def upload_assets
       puts "Checking for modified public assets and uploading to S3."
       start_time = Time.now
       upload_public_assets
-      puts "Time for public assets to s3: #{pretty_time(Time.now-start_time).color(:green)}"
+      puts "Time for public assets to s3: #{pretty_time(Time.now - start_time).color(:green)}"
     end
 
     def upload_public_assets
@@ -87,37 +88,36 @@ module Jets::Cfn
     end
 
     def upload_to_s3(full_path)
-      if identical_on_s3?(full_path) && !ENV['JETS_ASSET_UPLOAD_FORCE']
-        puts "Asset is identical on s3: #{full_path}" if ENV['JETS_DEBUG_ASSETS']
+      if identical_on_s3?(full_path) && !ENV["JETS_ASSET_UPLOAD_FORCE"]
+        puts "Asset is identical on s3: #{full_path}" if ENV["JETS_DEBUG_ASSETS"]
         return
       end
 
       key = s3_key(full_path)
-      obj = s3_resource.bucket(bucket_name).object(key)
       content_type = content_type_headers(full_path)
-      if ENV['JETS_DEBUG_ASSETS']
+      if ENV["JETS_DEBUG_ASSETS"]
         puts "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
       end
-      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type))
+      transfer_manager.upload_file(full_path, bucket: bucket_name, key: key, acl: "public-read", cache_control: cache_control, **content_type)
     end
 
     CONTENT_TYPES_BY_EXTENSION = {
-      '.css'  => 'text/css',
-      '.html' => 'text/html',
-      '.js'   => 'application/javascript',
+      ".css" => "text/css",
+      ".html" => "text/html",
+      ".js" => "application/javascript"
     }
     def content_type_headers(full_path)
       ext = File.extname(full_path)
       content_type = CONTENT_TYPES_BY_EXTENSION[ext] || Rack::Mime.mime_type(ext)
       if content_type
-        { content_type: content_type }
+        {content_type: content_type}
       else
         {}
       end
     end
 
     def s3_key(full_path)
-      relative_path = full_path.sub("#{Jets.root}/", '')
+      relative_path = full_path.sub("#{Jets.root}/", "")
       "jets/#{relative_path}"
     end
 

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "5.0.14"
+  VERSION = "5.0.15"
 end

data/lib/jets.rb

@@ -1,6 +1,8 @@
 $stdout.sync = true unless ENV["JETS_STDOUT_SYNC"] == "0"
 $:.unshift(File.expand_path("../", __FILE__))
 
+require "logger" # must require super early
+
 require "active_support"
 require "active_support/concern"
 require "active_support/core_ext"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 5.0.14
+  version: 5.0.15
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-20 00:00:00.000000000 Z
+date: 2025-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.8
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.8
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -374,20 +388,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jets-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: jets-git
   requirement: !ruby/object:Gem::Requirement
@@ -458,6 +486,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement