jets 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56b1cd2d4dadd8582bfaf2eeda623bed469ae4effd0cd3aff9f2c80741721b23
-  data.tar.gz: 4abf083f6a7d090ed0bf0adf1c16b24ea6f8ec98714c0335ba165f92b5115766
+  metadata.gz: '09353481e33c3e69347755182cf55dab3b16e50d351bf263d21e20fb6516aa5f'
+  data.tar.gz: 185f9c67d33250cfd3d406612d3bd34d03179d5abb6c86a540218f2666fc448f
 SHA512:
-  metadata.gz: aae65dfb73f92802e3a8e44b7e4171a97345ba7912143ad03d644e1ded48822541fba035d4d1c6707c0e2aed2d31c595be637c8cdc9c9eb19be13627b2576afb
-  data.tar.gz: 3a71ac74963d2d81cb75f57bcb2a32df1a34a890f2d60f522d4a53640f8bee3ff2c6fc7ddcca73990c232724436597ecf0f2b0cc6bab2513c3d4c15c5ea99d5d
+  metadata.gz: 45bd552d7be3599219c725499a406907c24c9344cae56cee664a0a86f292efd6b9dbe81f27f6caabc94f19efb59080c3ff26f53214289d1f0ee11f76083ddaad
+  data.tar.gz: 536a79ad1957f08184600d86c126d2877ab8e254b7568d1e1b265dc288cae36017b50b254ca0acb06cbbce32111ae6ab37e0303152e9927653d837196f16f3d5

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/).
 
+## [5.0.3] - 2023-12-15
+- [#691](https://github.com/rubyonjets/jets/pull/691) jets deploy fix for empty project
+- [#692](https://github.com/rubyonjets/jets/pull/692) fix jets deploy for empty project
+- [#693](https://github.com/rubyonjets/jets/pull/693) do not include sprockets-jets in new app generator for api mode
+- [#694](https://github.com/rubyonjets/jets/pull/694) fix jets deploy for empty project
+
 ## [5.0.2] - 2023-12-11
 - [#688](https://github.com/rubyonjets/jets/pull/688) improve releases:info output
 

data/lib/jets/builders/code_builder.rb

@@ -232,7 +232,7 @@ module Jets::Builders
       # Checking this way because when using jets standalone for Afterburner mode we don't want to run into
       # bundler gem collisions.  TODO: figure out the a better way to handle the collisions.
       lines = IO.readlines("#{Jets.root}/Gemfile")
-      lines.detect { |l| l =~ /#{name}/ && l !~ /\s.*#/ }
+      lines.detect { |l| l =~ /gem ['"]#{name}/ && l !~ /^\s*?#/ }
     end
 
     # Cleans out non-cached files like code-*.zip in Jets.build_root
@@ -305,7 +305,7 @@ module Jets::Builders
         puts "Skip packaging ruby".color(:yellow) # useful for developing handlers
         return
       end
-      return if Jets.poly_only?
+      return unless Jets.gem_layer?
 
       check_agree
       ruby_packager.install
@@ -322,7 +322,7 @@ module Jets::Builders
     end
 
     def build_lambda_layer
-      return if Jets.poly_only?
+      return unless Jets.gem_layer?
       lambda_layer = LambdaLayer.new
       lambda_layer.build
     end

data/lib/jets/builders/handler_generator.rb

@@ -45,6 +45,14 @@ module Jets::Builders
           generate_handler(vars)
         end
       end
+
+      if app_files.empty? && Jets.gem_layer?
+        # When there are no app files, still need to generate a shim for JetsController
+        lib = File.expand_path('../../..', __dir__)
+        path = "#{lib}/engines/internal/app/controllers/jets/public_controller.rb"
+        vars = Jets::Builders::ShimVars::App.new(path)
+        generate_handler(vars)
+      end
     end
 
     def generate_handler(vars)

data/lib/jets/cfn/builder/parent.rb

@@ -44,7 +44,7 @@ class Jets::Cfn::Builder
       add_resource(resource)
       add_outputs(resource.outputs)
 
-      return if Jets.poly_only?
+      return unless Jets.gem_layer?
       resource = Jets::Cfn::Resource::Lambda::GemLayer.new
       add_resource(resource)
       add_outputs(resource.outputs)

data/lib/jets/cfn/builder.rb

@@ -86,8 +86,8 @@ module Jets::Cfn
       builder_class = "Jets::Cfn::Builder::#{app_class}".constantize
 
       app_class = Jets::Klass.from_path(path)
-      if Jets.poly_only? && app_class == Jets::PreheatJob
-        return # No prewarm when there's only poly functions
+      if !Jets.gem_layer? && app_class == Jets::PreheatJob
+        return # No prewarm when there's only poly functions and no gem layer
       end
 
       # Builder class fully qualified name:

data/lib/jets/cfn/params/common.rb

@@ -5,7 +5,7 @@ module Jets::Cfn::Params
         IamRole: "!GetAtt IamRole.Arn",
         S3Bucket: "!Ref S3Bucket",
       }
-      parameters[:GemLayer] = "!Ref GemLayer" unless Jets.poly_only?
+      parameters[:GemLayer] = "!Ref GemLayer" if Jets.gem_layer?
       parameters
     end
 

data/lib/jets/cfn/ship.rb

@@ -116,7 +116,7 @@ module Jets::Cfn
       end
       return unless @options[:stack_type] == :full # s3 bucket is available
       return unless Jets.config.prewarm.enable
-      return if Jets.poly_only?
+      return unless Jets.gem_layer?
 
       puts "Prewarming application."
       Jets::PreheatJob.prewarm!

data/lib/jets/cfn/upload.rb

@@ -138,6 +138,9 @@ module Jets::Cfn
     # If only max_age is provided, then we'll generate a cache_control header.
     # Using max_age is the shorter and simply way of setting the cache_control header.
     def cache_control
+      # default when sprockets-jets not installed
+      return "public, max-age=3600" unless Jets.config.respond_to?(:assets)
+
       cache_control = Jets.config.assets.cache_control
       unless cache_control
         max_age = Jets.config.assets.max_age # defaults to 3600 in jets/application.rb

data/lib/jets/core.rb

@@ -207,6 +207,10 @@ module Jets::Core
     Jets.config.cfn.build.controllers == "one_lambda_for_all_controllers"
   end
 
+  def gem_layer?
+    !Jets.poly_only? || Jets.one_lambda_for_all_controllers?
+  end
+
   # Do not memoize here. The JetsBucket.name does it's own special memoization.
   def s3_bucket
     Jets::Cfn::Resource::S3::JetsBucket.name

data/lib/jets/generators/overrides/app/templates/Gemfile.tt

@@ -2,9 +2,12 @@ source "https://rubygems.org"
 
 gem "jets", "~> <%= Jets::VERSION %>"
 
+<%- if options[:mode] == 'html'-%>
+gem "sprockets-jets"
+<% end -%>
+
 <%- if options[:mode] != 'job' && !options[:database].nil? -%>
 <%= database_gemfile_entry %>
-gem "sprockets-jets"
 <%- end -%>
 <%- if options[:mode] == 'html' -%>
 gem "importmap-jets"

data/lib/jets/stack/builder.rb

@@ -21,7 +21,7 @@ class Jets::Stack
       return unless elements
 
       if section == :parameters
-        elements[:GemLayer] = {Type: "String"} unless Jets.poly_only?
+        elements[:GemLayer] = {Type: "String"} if Jets.gem_layer?
       end
       @template[section] = elements
     end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "5.0.2"
+  VERSION = "5.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer