jets 4.0.13 → 4.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fdc9ebb0aed23d0ba8ac7cce47d6d57a9a241e318c4be1a22a2de4f9665e475
-  data.tar.gz: 64376f75c4e4d9dfe067b65af88ba5df09c17b6406e7eaa6f58c90c01c0c11af
+  metadata.gz: 108be85a1805da5a04aa2bca0c9b923a558f43a49d7b5b40707294ff442c84e5
+  data.tar.gz: ce8de5d61abb74c397ec7017847153a1173ede8c0657721e96e1d97584948758
 SHA512:
-  metadata.gz: 26b5afe7020c53055d09bb7a4f3ef5893e72b838b6c78b95ed93dc8b72457b4e72e0bc148b807bbb2b17cd96f9270241088dfc057e8b6e684d7fac5a9e766607
-  data.tar.gz: 3660411643afa401dbbbb8198e68eceb853566448ba3faec2ec853ae6be2c84780a3e69558fd8d8d38623d80bdd47b5cbbfac36495e3db6bcdac092aacf1893b
+  metadata.gz: b83a363461f11e43bf5a1273dfb1a5e792f85ec83e627062624e098014f3f9200a1647e60c2ffcd26ed90b01c348e71de07291b48028f3c9aa788476a17d1a17
+  data.tar.gz: bf40c7291462c4479742695993158be55162163dd2e6bcef3f7c96df9f65bf995f54bf9ac792d3e744a8726506cba1f9c6e266c827d1752979b932c7bc614611

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/).
 
+## [4.0.15] - 2025-10-10
+- clean up remove comment
+
+## [4.0.14] - 2025-10-08
+- require logger before bundler in bin/webpack
+
 ## [4.0.13] - 2025-10-08
 - require logger and pin activemodel 6.1.7
 

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)
@@ -76,7 +76,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:
@@ -91,7 +91,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
@@ -123,7 +123,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)
@@ -157,7 +157,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)
           # puts "Removing old submoduled gem: #{path}" # uncomment to see and debug
           FileUtils.rm_rf(path) # REMOVE old submodule directory
@@ -191,7 +191,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
@@ -204,7 +204,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
 
@@ -225,11 +225,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
 
@@ -250,12 +250,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_source.rb

@@ -44,8 +44,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
@@ -57,5 +56,9 @@ module Jets::Cfn
     def s3_key
       @s3_key ||= "jets/cfn-templates/#{File.basename(path)}"
     end
+
+    def transfer_manager
+      @transfer_manager ||= Aws::S3::TransferManager.new
+    end
   end
 end

data/lib/jets/cfn/upload.rb

@@ -1,6 +1,6 @@
-require 'action_view'
-require 'digest'
-require 'rack/mime'
+require "action_view"
+require "digest"
+require "rack/mime"
 
 module Jets::Cfn
   class Upload
@@ -13,6 +13,10 @@ module Jets::Cfn
       @bucket_name = bucket_name
     end
 
+    def transfer_manager
+      @transfer_manager ||= Aws::S3::TransferManager.new
+    end
+
     def upload
       upload_cfn_templates
       upload_zip_files
@@ -26,8 +30,7 @@ module Jets::Cfn
         next unless File.file?(path)
 
         key = "jets/cfn-templates/#{File.basename(path)}"
-        obj = s3_resource.bucket(bucket_name).object(key)
-        obj.upload_file(path)
+        transfer_manager.upload_file(path, bucket: bucket_name, key: key)
       end
     end
 
@@ -45,17 +48,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
@@ -88,32 +90,31 @@ module Jets::Cfn
     end
 
     def upload_to_s3(full_path)
-      return if identical_on_s3?(full_path) && !ENV['JETS_ASSET_UPLOAD_FORCE']
+      return if identical_on_s3?(full_path) && !ENV["JETS_ASSET_UPLOAD_FORCE"]
 
       key = s3_key(full_path)
-      obj = s3_resource.bucket(bucket_name).object(key)
       content_type = content_type_headers(full_path)
       Jets.logger.debug "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
-      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
 
@@ -152,6 +153,5 @@ module Jets::Cfn
         "#{minutes.to_i}m #{seconds.to_i}s"
       end
     end
-
   end
-end
+end

data/lib/jets/commands/upgrade/templates/bin/webpack

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
 ENV["JETS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= "development"
+ENV["NODE_ENV"] ||= "development"
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
+require "logger" # must require logger before bundler
 require "rubygems"
 require "bundler/setup"
 
@@ -16,4 +17,4 @@ require "webpacker/webpack_runner"
 APP_ROOT = File.expand_path("..", __dir__)
 Dir.chdir(APP_ROOT) do
   Webpacker::WebpackRunner.run(ARGV)
-end
+end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "4.0.13"
+  VERSION = "4.0.15"
 end

metadata

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