jets 5.0.0.beta1 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4381b93c9ea3d4e8a1f44bbe065e85fc0c6da59cc1d59ef7cc3deb29411b107f
-  data.tar.gz: 6afa841f9b10dcf4526179ddfe5dd9d211ce38d9117f2442b092bb1f8d2bc424
+  metadata.gz: a4a384d3b0e4d6523695e38deddbb180904b542b7e03cc095ead1844f02a3571
+  data.tar.gz: b01933003b19b5ae79c4e6e82427e930a1c82197ebf7efb125d150ea405ef3f5
 SHA512:
-  metadata.gz: 64cc06c217190f64c0e5e446bd6aad780048c5673f64f6611bc3871ecfc295083440be55d98d222d5955d19285ba3252cb371043f679d48e74b6a676541ce3df
-  data.tar.gz: 8be226ddfa30be1b57dca669eff636b9e07a0ab8bc63e77901a1f398e2c9ab7cbc7a9f6589a6e98135f4abffc5492777e0cda9543d5c598fda1d77dbcfb0658a
+  metadata.gz: 0b40b236e756e6a93649082776f7ea948250619703a51cd98425cc7876085933975011120547bedc098c3a5fe0000aecfe545adb01b8d9c1de76cb4f4e3a36ae
+  data.tar.gz: 4cc1b4cdc76eb7fd9d4397b2194300a4974c3d3afe94e954c2073a300ccfcc612f16fee657e86214c0c5c96fb983d1003c88db7e2e04d176516fbc9518f5c37a

data/CHANGELOG.md

@@ -3,7 +3,17 @@
 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.0] - Unreleased
+## [5.0.1] - 2023-12-11
+- [#680](https://github.com/rubyonjets/jets/pull/680) fix apigw gateway replacement warning prompt
+- [#682](https://github.com/rubyonjets/jets/pull/682) Replace puts with Jets.logger.info in jobs
+- [#683](https://github.com/rubyonjets/jets/pull/683) Fix broken links in README and CONTRIBUTING
+- [#684](https://github.com/rubyonjets/jets/pull/684) improve cli usage invalid command and options handling
+- [#685](https://github.com/rubyonjets/jets/pull/685) rollback usage cleanup
+- [#686](https://github.com/rubyonjets/jets/pull/686) remove need for sprockets-jets dependency
+- [#687](https://github.com/rubyonjets/jets/pull/687) jets releases:info command
+- default logging.event to false for generated production
+
+## [5.0.0] - 2023-12-05
 Single Lambda Function for Controllers
 * For controllers, a single Lambda function is deployed going forward.
 * APIGW serves as proxy endpoint for requests to the single Lambda function. Techniquely, there are 2 APIGW endpoints.
@@ -55,10 +65,13 @@ Breaking changes:
 * Jets.config.prewarm.concurrency option removed.
 * dynomite decoupling and integration improvements
 
+## [4.0.10] - 2023-12-04
+- [#678](https://github.com/boltops-tools/jets/pull/678) handle option method or http_method from route state
 
 ## [4.0.9] - 2023-12-03
 - [#674](https://github.com/boltops-tools/jets/pull/674) Fix broken --mode jobs new project generation
 - [#675](https://github.com/boltops-tools/jets/pull/675) Add resource tags to CloudFormation stack
+
 ## [4.0.8] - 2023-12-03
 - [#677](https://github.com/boltops-tools/jets/pull/677) pin dynomite 1.2.7
 
@@ -327,7 +340,7 @@ Breaking Changes:
 - #424 md5 fix subtle bug when code doesnt get uploaded from newly generated shims
 - #425 add hosted zone id support
 - #426 use headers origin for actual host in case of cloudfront in front
-- #428 fixes to JETS_BUILD_NO_INTERNET env var option
+- #428 fixes to JETS_NO_INTERNET env var option
 - #429 fix simple function tmp_loader
 
 ## [2.3.11]

data/CONTRIBUTING.md

@@ -1 +1 @@
-http://rubyonjets.com/docs/contributing/
+https://rubyonjets.com/docs/more/contributing/

data/README.md

@@ -16,12 +16,13 @@ Please **watch/star** this repo to help grow and support the project.
 
 ## What is Ruby on Jets?
 
-Jets is a Ruby Serverless Framework.  Jets allows you to create serverless applications with a beautiful language: Ruby.  It includes everything required to build an application and deploy it to AWS Lambda.
+Jets is a Ruby Serverless Framework. Jets allows you to create serverless applications with a beautiful language: Ruby. It includes everything required to build and deploy an application to AWS Lambda.
 
-It is key to understand AWS Lambda and API Gateway to understand Jets conceptually.  Jets maps your code to Lambda functions and API Gateway resources.
+Understanding AWS Lambda and API Gateway is key to understanding Jets conceptually. Jets map your code to Lambda functions and other AWS Resources like API Gateway and Event Rules.
 
-* **AWS Lambda** is Functions as a Service. It allows you to upload and run functions without worrying about the underlying infrastructure.
+* **AWS Lambda** is functions as a service. It allows you to upload and run functions without worrying about the underlying infrastructure.
 * **API Gateway** is the routing layer for Lambda. It is used to route REST URL endpoints to Lambda functions.
+* **EventBridge Rules** are events as a service. You can automatically run Lambda functions triggered from AWS services. You decide what events to catch and how to react to them.
 
 The official documentation is at [Ruby on Jets](http://rubyonjets.com).
 
@@ -42,14 +43,14 @@ end
 
 Here's the function in the Lambda console:
 
-![Code Example in AWS Lambda console](https://raw.githubusercontent.com/tongueroo/jets/master/docs/img/docs/jets-simple-lambda-function-console.png)
+![Code Example in AWS Lambda console](https://img.boltops.com/tools/jets/readme/simple-lambda-function.png)
 
 
-Though simple functions are supported by Jets, they do not add much value as other ways to write Ruby code with Jets. Classes like [Controllers](http://rubyonjets.com/docs/controllers/) and [Jobs](http://rubyonjets.com/docs/jobs/) add many conveniences and are more powerful to use. We’ll cover them next.
+Though simple functions are supported by Jets, they do not add as much value as other ways to write Ruby code with Jets. Classes like [Controllers](http://rubyonjets.com/docs/controllers/) and [Jobs](http://rubyonjets.com/docs/jobs/) add many conveniences and are more powerful to use. We’ll cover them next.
 
 ### Jets Controllers
 
-A Jets controller handles a web request and renders a response.  Here's an example:
+A Jets controller handles a web request and renders a response. Here's an example:
 
 app/controllers/posts_controller.rb:
 
@@ -69,11 +70,9 @@ class PostsController < ApplicationController
 end
 ```
 
-Helper methods like `params` provide the parameters from the API Gateway event. The `render` method renders a Lambda Proxy structure back that API Gateway understands.
+Helper methods like `params` provide the parameters from the API Gateway event. The `render` method returns a Lambda Proxy structure that API Gateway understands.
 
-Jets creates Lambda functions for each public method in your controller. Here they are in the Lambda console:
-
-![Lambda Functions for each public method in AWS Console](https://raw.githubusercontent.com/tongueroo/jets/master/docs/img/docs/demo-lambda-functions-controller.png)
+Jets creates single Lambda functions to handle your Jets Controller requests. The Lambda Function handler is a shim that routes to your controller action.
 
 ### Jets Routing
 
@@ -83,23 +82,14 @@ config/routes.rb:
 
 ```ruby
 Jets.application.routes.draw do
-  get  "posts", to: "posts#index"
-  get  "posts/new", to: "posts#new"
-  get  "posts/:id", to: "posts#show"
-  post "posts", to: "posts#create"
-  get  "posts/:id/edit", to: "posts#edit"
-  put  "posts", to: "posts#update"
-  delete  "posts", to: "posts#delete"
-
-  resources :comments # expands to the RESTful routes above
-
+  resources :posts
   any "posts/hot", to: "posts#hot" # GET, POST, PUT, etc request all work
 end
 ```
 
 The `routes.rb` gets translated to API Gateway resources:
 
-![API Gateway Resources generated from routes in AWS console](https://raw.githubusercontent.com/tongueroo/jets/master/docs/img/quick-start/demo-api-gateway.png)
+![API Gateway Resources generated from routes in AWS console](https://img.boltops.com/tools/jets/readme/apigw.png)
 
 Test your API Gateway endpoints with curl or postman. Note, replace the URL endpoint with the one that is created:
 
@@ -111,7 +101,7 @@ Test your API Gateway endpoints with curl or postman. Note, replace the URL endp
 
 ### Jets Jobs
 
-A Jets job handles asynchronous background jobs performed outside of the web request/response cycle. Here's an example:
+A Jets job handles asynchronous background jobs outside the web request/response cycle. Here's an example:
 
 app/jobs/hard_job.rb:
 
@@ -129,9 +119,13 @@ class HardJob < ApplicationJob
 end
 ```
 
-`HardJob#dig` runs every 10 hours and `HardJob#lift` runs every 12 hours.  The `rate` and `cron` methods created CloudWatch Event Rules. Example:
+![Jets Jobs in AWS Lambda Console](https://img.boltops.com/tools/jets/readme/jets-jobs.png)
+
+`HardJob#dig` runs every 10 hours, and `HardJob#lift` runs every 12 hours. The `rate` and `cron` methods created CloudWatch Event Rules. Example:
+
+![CloudWatch Event Rules in AWS Console](https://img.boltops.com/tools/jets/readme/jets-jobs-event-rules.png)
 
-![CloudWatch Event Rules in AWS Console](https://raw.githubusercontent.com/tongueroo/jets/master/docs/img/docs/demo-job-cloudwatch-rule.png)
+This simple example uses Scheduled Events. There are many more possibilities, see the [Events Docs](https://docs.rubyonjets.com/docs/events/).
 
 ### Jets Deployment
 
@@ -141,46 +135,36 @@ You can test your application with a local server that mimics API Gateway: [Jets
 
 After deployment, you can test the Lambda functions with the AWS Lambda console or the CLI.
 
-### AWS Lambda Console
-
-![Lambda Console](https://s3.amazonaws.com/boltops-demo/images/screenshots/lambda-console-posts-controller-index.png)
-
 ### Live Demos
 
 Here are some demos of Jets applications:
 
 * [Quintessential CRUD Jets app](https://demo.rubyonjets.com/)
 * [API Demo](https://api.demo.rubyonjets.com/)
-* [Jets Afterburner: Easy Rails Support](https://afterburner.demo.rubyonjets.com/)
-* [Mega Mode: Jets and Rails Combined](https://mega.demo.rubyonjets.com/)
 * [Image Upload with CarrierWave](https://upload.demo.rubyonjets.com/)
 
-Please feel free to add your own example to the [jets-examples](https://github.com/tongueroo/jets-examples) repo.
-
-### Rails Support
-
-[Jets Afterburner Mode](http://rubyonjets.com/docs/rails-support/) provides Rails support with little effort.  This allows you to run a Rails application on AWS Lambda. Also here's a Tutorial Blog Post: [Jets Afterburner: Rails Support](https://blog.boltops.com/2018/12/21/jets-afterburner-serverless-rails-on-aws-lambda-in-5-minutes).
+Please feel free to add your examples to the [rubyonjets/examples](https://github.com/rubyonjets/examples) repo.
 
 ### More Info
 
-For more documentation, check out the official docs: [Ruby on Jets](http://rubyonjets.com/).  Here's a list of useful links:
+For more documentation, check out the official docs: [Ruby on Jets](http://rubyonjets.com/). Here's a list of useful links:
 
 * [Quick Start](http://rubyonjets.com/quick-start/)
 * [Local Jets Server](http://rubyonjets.com/docs/local-server/)
 * [REPL Console](http://rubyonjets.com/docs/repl-console/)
 * [Project Structure](http://rubyonjets.com/docs/structure/)
-* [App Configuration](http://rubyonjets.com/docs/app-config/)
-* [Database Support](http://rubyonjets.com/docs/database-support/)
-* [Polymorphic Support](http://rubyonjets.com/docs/polymorphic-support/)
+* [App Configuration](http://rubyonjets.com/docs/config/)
+* [Database Support](http://rubyonjets.com/docs/database/)
+* [Polymorphic Support](http://rubyonjets.com/docs/polymorphic/)
 * [Rails Support](http://rubyonjets.com/docs/rails-support/)
 * [Tutorials](http://rubyonjets.com/docs/tutorials/)
 * [Prewarming](http://rubyonjets.com/docs/prewarming/)
-* [Custom Resources](http://rubyonjets.com/docs/associated-resources/)
-* [Shared Resources](http://rubyonjets.com/docs/shared-resources/)
+* [Custom Resources](http://rubyonjets.com/docs/custom/)
+* [Shared Resources](http://rubyonjets.com/docs/custom/shared-resources/)
 * [Installation](http://rubyonjets.com/docs/install/)
 * [CLI Reference](http://rubyonjets.com/reference/)
-* [Contributing](http://rubyonjets.com/docs/contributing/)
-* [Support Jets](http://rubyonjets.com/support-jets/)
+* [Contributing](http://rubyonjets.com/docs/more/contributing/)
+* [Support Jets](http://rubyonjets.com/donate/)
 * [Example Projects](https://github.com/tongueroo/jets-examples)
 
 ## Learning Content

data/jets.gemspec

@@ -54,7 +54,8 @@ 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"
+  spec.add_dependency "jets-api", ">= 0.1.4"
+  spec.add_dependency "jets-git"
   spec.add_dependency "jets-html-sanitizer"
   spec.add_dependency "kramdown"
   spec.add_dependency "memoist"

data/lib/jets/aws_services/stack_status.rb

@@ -4,7 +4,7 @@ module Jets::AwsServices
     @@stack_exists_cache = [] # helps with CloudFormation rate limit
     def stack_exists?(stack_name)
       return false if Jets.env.test?
-      return true if ENV['JETS_BUILD_NO_INTERNET']
+      return true if ENV['JETS_NO_INTERNET']
       return true if @@stack_exists_cache.include?(stack_name)
 
       exist = nil

data/lib/jets/builders/code_builder.rb

@@ -76,7 +76,7 @@ module Jets::Builders
     end
 
     def exist_on_s3?(filename)
-      return false if ENV['JETS_BUILD_NO_INTERNET']
+      return false if ENV['JETS_NO_INTERNET']
       s3_key = "jets/code/#{filename}"
       begin
         Jets.logger.debug "Checking s3://#{s3_bucket}/#{s3_key}"
@@ -131,6 +131,7 @@ module Jets::Builders
     # We do not want to grab this as part of the live request because it is slow.
     def store_s3_base_url
       return if Jets.config.mode == "job"
+      return unless gemfile_include?("sprockets-jets")
       write_s3_base_url("#{stage_area}/code/config/s3_base_url.txt")
     end
 
@@ -192,9 +193,7 @@ module Jets::Builders
         puts "Skip compiling assets".color(:yellow) # useful for debugging
         return true
       end
-      return true if Jets.config.mode == "job"
-      return true unless Jets.config.respond_to?(:assets)
-      Jets.config.assets.enable_webpack
+      Jets.config.mode == "job"
     end
 
     # Different url for these. Examples:
@@ -233,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}/ }
+      lines.detect { |l| l =~ /#{name}/ && l !~ /\s.*#/ }
     end
 
     # Cleans out non-cached files like code-*.zip in Jets.build_root

data/lib/jets/builders/templates/handlers/one_lambda_for_all_controllers.rb

@@ -8,7 +8,7 @@ def lambda_handler(event:, context:)
     return
   end
 
-  <% if @vars.process_type == "controller" -%>
+<% if @vars.process_type == "controller" -%>
   route = Jets::Router.find_route_by_event(event)
   controller = route.controller_name
   action = route.action_name

data/lib/jets/cfn/deployment.rb

@@ -13,33 +13,73 @@ module Jets::Cfn
 
     def create
       Jets.boot # needed since Jets is lazy loaded
-      return if Jets.config.pro.disable
-      return unless Jets::Api.token
-      stack = find_stack(@stack_name)
-      return unless stack
+      return if disabled?
+      @stack = find_stack(@stack_name)
+      record_deployment if @stack
+    end
 
-      record_deployment(stack)
+    def delete
+      Jets.boot # needed since Jets is lazy loaded
+      return if disabled?
+      @stack = find_stack(@stack_name)
+      delete_deployment if @stack
     end
 
-    def record_deployment(stack)
-      deploy_user = ENV['JETS_DEPLOY_USER'] || ENV['USER']
-      resp = Jets::Api::Release.create(
-        stack_arn: stack.stack_id,
-        stack_status: stack.stack_status,
-        message: message,
-        deploy_user: deploy_user,
-      )
-      check_for_error_message!(resp)
+    def delete_deployment
+      resp = Jets::Api::Stack.retrieve("current")
+      return if resp["error"] == "not_found"
+      return unless resp["id"]
+      resp = Jets::Api::Stack.delete(resp["id"])
+      puts resp["message"] # IE: Stack demo-dev deleted
+      resp
+    rescue Jets::Api::RequestError => e
+      puts "WARNING: Unable to delete release and stack. #{e.class}: #{e.message}"
+    end
+
+    def record_deployment
+      params = stack_params.merge(git_info.params)
+      params["message"] = create_message
+      resp = Jets::Api::Release.create(params)
+      # Instead of check_for_error_message!(resp) we want to customize it a bit
+      if resp && resp["error"]
+        $stderr.puts "WARN: There was an error creating the release."
+        $stderr.puts "WARN: #{resp["error"]}"
+        exit 1
+      end
       puts "Release version: #{resp["version"]}" if resp["version"]
       resp
     rescue Jets::Api::RequestError => e
       puts "WARNING: Unable to create release. #{e.class}: #{e.message}"
     end
 
-    def message
-      return @options[:message][0..255] if @options[:message]
-      # else default message
-      @rollback_version ? "Rollback to #{@rollback_version}" : "Deploy"
+    def stack_params
+      {
+        stack_arn: @stack.stack_id,
+        stack_status: @stack.stack_status,
+        message: create_message,
+        deploy_user: deploy_user,
+      }
+    end
+
+    def deploy_user
+      ENV['JETS_DEPLOY_USER'] || git_info.user.first_name || ENV['USER']
+    end
+
+    def git_info
+      Jets::Git::Info.new(@options)
+    end
+    memoize :git_info
+
+    def create_message
+      if @options[:message]
+        @options[:message][0..255]
+      else
+        @rollback_version ? "Rollback to #{@rollback_version}" : "Deploy"
+      end
+    end
+
+    def disabled?
+      Jets.config.pro.disable || !Jets::Api.token
     end
   end
 end

data/lib/jets/cfn/resource/api_gateway/rest_api/logical_id.rb

@@ -4,7 +4,7 @@ class Jets::Cfn::Resource::ApiGateway::RestApi
     include Jets::AwsServices
 
     def get
-      return default if ENV['JETS_BUILD_NO_INTERNET']
+      return default if ENV['JETS_NO_INTERNET']
       return default unless stack_exists?(parent_stack_name) && api_gateway_exists?
 
       if changed?
@@ -17,7 +17,7 @@ class Jets::Cfn::Resource::ApiGateway::RestApi
 
     def auto_replace_prompt
       return if ENV['JETS_API_AUTO_REPLACE']
-      return unless ARGV[0] == "deploy"
+      return unless Jets::Command.original_cli_command == "deploy"
       case Jets.config.api.auto_replace
       when nil
         puts message.routes_changed

data/lib/jets/cfn/resource/api_gateway/rest_api/routes/change/base.rb

@@ -14,8 +14,9 @@ class Jets::Cfn::Resource::ApiGateway::RestApi::Routes::Change
       return [] if data.nil?
 
       data.map do |item|
+        http_method = item.dig('options','method') || item.dig('options','http_method')
         Jets::Router::Route.new(
-          http_method: item['http_method'],
+          http_method: http_method,
           path: item['path'],
           to: item['to'],
           engine: item['engine'],

data/lib/jets/cfn/resource/api_gateway/rest_api/routes/change.rb

@@ -5,13 +5,19 @@ class Jets::Cfn::Resource::ApiGateway::RestApi::Routes
 
     def changed?
       return false unless parent_stack_exists?
-      return false if Jets.config.cfn.build.routes == "one_apigw_method_for_all_routes"
+      return true if reset?
+
       # Note: Variable.changed? will likely always true in one_apigw_method_for_all_routes mode
-      # since parent variables are allowed to vary.
+      # since parent variables are allowed to vary in Jets v5.
+      if Jets.config.cfn.build.routes == "one_apigw_method_for_all_routes"
+        MediaTypes.changed? || To.changed?
+      else
+        MediaTypes.changed? || To.changed? || Variable.changed? || Page.changed?
+      end
+    end
 
-      # JETS_REPLACE_API is legacy.  JETS_API_REPLACE is the new var
-      MediaTypes.changed? || To.changed? || Variable.changed? || Page.changed? ||
-        ENV['JETS_RESET'] || ENV['JETS_API_REPLACE'] || ENV['JETS_REPLACE_API']
+    def reset?
+      ENV['JETS_RESET'] || ENV['JETS_API_REPLACE'] || ENV['JETS_REPLACE_API']
     end
 
     def parent_stack_exists?

data/lib/jets/cfn/resource/s3/jets_bucket.rb

@@ -47,13 +47,13 @@ module Jets::Cfn::Resource::S3
       @@name = nil
       def name
         return @@name if @@name
-        return "fake-bucket" if ENV['JETS_BUILD_NO_INTERNET'] || ENV['JETS_TEMPLATES']
+        return "fake-bucket" if ENV['JETS_NO_INTERNET'] || ENV['JETS_TEMPLATES']
 
         resp = nil
         begin
           resp = cfn.describe_stacks(stack_name: Jets::Names.parent_stack_name)
         rescue Aws::CloudFormation::Errors::ValidationError => e
-          if e.message.include?('does not exist') && ARGV[0] == 'build' # jets build
+          if e.message.include?('does not exist') && Jets::Command.original_cli_command == 'build' # jets build
             return "no-bucket-yet" # for jets build without s3 bucket yet
           else
             raise

data/lib/jets/command/api_helpers.rb

@@ -18,6 +18,7 @@ module Jets
           $stderr.puts "ERROR: #{resp["error"]}"
           exit 1
         end
+        resp
       end
 
       def paging_params

data/lib/jets/command/base.rb

@@ -99,6 +99,11 @@ module Jets
           end
 
           dispatch(command, args.dup, nil, config)
+        rescue Thor::InvocationError => e
+          puts e.message.color(:red) # message already has ERROR prefix
+          self.full_namespace = full_namespace # store for help. clean:log => log
+          dispatch("help", [], nil, config)
+          exit 1
         end
 
         def printing_commands

data/lib/jets/command/help/gems/check.md

@@ -1,6 +1 @@
-Check if pre-built Lambda gems are available from the gems source. You can configure the gem in config/application.rb:
-
-    # Sources for check for pre-compiled Lambda gems. Checks the list in order.
-    Jets.application.configure do
-      config.gems.source = "https://api.serverlessgems.com/api/v1"
-    end
+Check if precompiled gems are available from Jets Pro.

data/lib/jets/command/help/logs.md

@@ -7,7 +7,7 @@ This defaults to the controller Lambda function in the `one_lambda_for_all_contr
 
 If you want to follow the logs use the `-f` flag.
 
-    ❯ jets logs
+    ❯ jets logs -f
     Tailing logs for /aws/lambda/demo-dev-controller
 
 If you want to see the production logs:

data/lib/jets/command/help/releases.md

@@ -5,33 +5,15 @@
     +---------+-----------------+--------------+---------+
     | Version |     Status      | Released At  | Message |
     +---------+-----------------+--------------+---------+
-    | 27      | UPDATE_COMPLETE | 10 hours ago | Deploy  |
-    | 26      | UPDATE_COMPLETE | 11 hours ago | Deploy  |
-    | 25      | UPDATE_COMPLETE | 11 hours ago | Deploy  |
-    | 24      | UPDATE_COMPLETE | 11 hours ago | Deploy  |
-    | 23      | DELETE_COMPLETE | 14 hours ago | Deleted |
-    | 22      | UPDATE_COMPLETE | 14 hours ago | Deploy  |
-    | 21      | UPDATE_COMPLETE | 14 hours ago | Deploy  |
-    | 20      | UPDATE_COMPLETE | 14 hours ago | Deploy  |
-    | 19      | DELETE_COMPLETE | 14 hours ago | Deleted |
-    | 18      | UPDATE_COMPLETE | 14 hours ago | Deploy  |
-    | 17      | UPDATE_COMPLETE | 17 hours ago | Deploy  |
-    | 16      | UPDATE_COMPLETE | 18 hours ago | Deploy  |
-    | 15      | UPDATE_COMPLETE | 18 hours ago | Deploy  |
-    | 14      | DELETE_COMPLETE | 18 hours ago | Deleted |
-    | 13      | UPDATE_COMPLETE | 19 hours ago | Deploy  |
-    | 12      | UPDATE_COMPLETE | 19 hours ago | Deploy  |
-    | 11      | UPDATE_COMPLETE | 19 hours ago | Deploy  |
-    | 10      | DELETE_COMPLETE | 19 hours ago | Deleted |
-    | 9       | UPDATE_COMPLETE | 21 hours ago | Deploy  |
-    | 8       | UPDATE_COMPLETE | 21 hours ago | Deploy  |
-    | 7       | DELETE_COMPLETE | 21 hours ago | Deleted |
-    | 6       | UPDATE_COMPLETE | 21 hours ago | Deploy  |
-    | 5       | DELETE_COMPLETE | 22 hours ago | Deleted |
-    | 4       | UPDATE_COMPLETE | 22 hours ago | Deploy  |
-    | 3       | UPDATE_COMPLETE | 22 hours ago | Deploy  |
+    | 3       | UPDATE_COMPLETE | 10 hours ago | Deploy  |
+    | 2       | UPDATE_COMPLETE | 18 hours ago | Deploy  |
+    | 1       | UPDATE_COMPLETE | 22 hours ago | Deploy  |
     +---------+-----------------+--------------+---------+
 
 The shown releases are paginated. If you need to see more releases you can use the `--page` option.
 
     $ jets releases --page 2
+
+## Other Commands
+
+  releases:info      View detailed information for a release

data/lib/jets/command/rake_decorate.rb

@@ -0,0 +1,38 @@
+module Jets::Command
+  module RakeDecorate
+    # Decorate this method because this does not get called until runtime.
+    # It's "lazy loaded" so we can avoid the Rails const being defined in general.
+    def [](task_name, scopes=nil)
+      super # => Rake::TaskManager#[]
+    rescue RuntimeError => e
+      # We require dummy/rails since this time because all the rake tasks have been loaded
+      # and we need to load dummy/rails to get the database configurations. Normally,
+      # we do not want to require dummy/rails because it defines the Rails.
+      # However, a "command not found" error, more accurately,
+      # a "rake task not found" error, has already been encountered.
+      # Also:
+      # require "dummy/rails" to prevent another error.
+      #   from lib/active_record/railties/databases.rake
+      #
+      #   NoMethodError: undefined method `env' for Rails:Module (NoMethodError)
+      #     database_configs = ActiveRecord::DatabaseConfigurations.new(databases).configs_for(env_name: Rails.env)
+      #
+      require "jets/overrides/dummy/rails"
+
+      # Original error message from rake is something like this
+      #
+      #   Don't know how to build task 'foo:bar' (See the list of available tasks with `jets --tasks`)
+      #
+      # With an ugly backtrace.
+      # We override the error message to be more user friendly.
+      #
+      # All of that in order for
+      #   jets foo:bar
+      # to show a pretty error message.
+      $stderr.puts "ERROR: Could not find command: #{task_name.inspect}".color(:red)
+      require "jets/commands/help/help_command"
+      Jets::Command::HelpCommand.new.help
+      exit 1
+    end
+  end
+end

data/lib/jets/command.rb

@@ -17,6 +17,8 @@ module Jets
 
     HELP_MAPPINGS = %w(-h -? --help)
 
+    cattr_accessor :original_cli_command
+
     class << self
       def hidden_commands # :nodoc:
         @hidden_commands ||= []
@@ -29,6 +31,7 @@ module Jets
       # Receives a namespace, arguments, and the behavior to invoke the command.
       def invoke(full_namespace, args = [], **config)
         namespace = full_namespace = full_namespace.to_s
+        Jets::Command.original_cli_command = full_namespace
 
         if char = namespace =~ /:(\w+)$/
           command_name, namespace = $1, namespace.slice(0, char)
@@ -47,6 +50,12 @@ module Jets
         if command && command.all_commands[command_name]
           command.perform(full_namespace, command_name, args, config)
         else
+          # Decorate the rake [] method in order to rescue the error and print out
+          # a user friendly message. This works to catch rake errors but
+          # unsure why cannot just rescue RuntimeError here.
+          # More details in the RakeDecorate module.
+          require "rake/application"
+          Rake::Application.send(:include, RakeDecorate)
           args = ["--describe", full_namespace] if HELP_MAPPINGS.include?(args[0])
           find_by_namespace("rake").perform(full_namespace, args, config)
         end
@@ -89,7 +98,6 @@ module Jets
         commands.each { |command| puts("  #{command}") }
       end
 
-      private
         COMMANDS_IN_USAGE = %w(
           generate
           console
@@ -117,6 +125,7 @@ module Jets
           (visible_commands - COMMANDS_IN_USAGE - PRO_COMMANDS).sort
         end
 
+      private
         def command_type # :doc:
           @command_type ||= "command"
         end

data/lib/jets/commands/delete/delete_command.rb

@@ -33,14 +33,13 @@ module Jets::Command
       cfn.delete_stack(stack_name: parent_stack_name)
       puts "Deleting #{Jets.project_namespace.color(:green)}..."
 
+      stack = find_stack(parent_stack_name)
       if @options[:wait]
-        stack = find_stack(parent_stack_name)
         wait_for_stack
-        Jets::Cfn::Deployment.new(stack_name: stack.stack_id, message: "Deleted").create
       end
+      Jets::Cfn::Deployment.new(stack_name: stack.stack_id).delete
 
       delete_logs
-
       puts "Project #{Jets.project_namespace.color(:green)} deleted!"
     end
 

data/lib/jets/commands/releases/releases_command.rb

@@ -1,11 +1,27 @@
 module Jets::Command
   class ReleasesCommand < Base # :nodoc:
-    desc "history", "List deploy history"
-    long_desc Help.text(:history)
+    desc "releases", "List releases"
+    long_desc Help.text(:releases)
     paging_options(order: 'desc').call
+    option :sha, desc: "Show release git sha"
     def perform
       Release.new(options.merge(paging_params)).list
     end
+
+    desc "releases:info", "View detailed information for a release"
+    long_desc Help.text(:info)
+    def info(version=nil)
+      if version.nil?
+        puts "ERROR: Must provide a version".color(:red)
+        puts <<~EOL
+          Example:
+
+            jets releases:info 3
+        EOL
+        exit 1
+      end
+      Release.new(options.merge(version: version)).show
+    end
   end
 
   class Release
@@ -35,19 +51,26 @@ module Jets::Command
         show_items(data)
       end
     rescue Jets::Api::RequestError => e
-      puts "ERROR: Unable to list history. #{e.class}: #{e.message}"
+      puts "ERROR: Unable to list releases. #{e.class}: #{e.message}"
     end
 
     def show_items(items)
       presenter = CliFormat::Presenter.new
-      presenter.header = ["Version", "Status", "Released At", "Message"]
+      header = ["Version", "Status", "Released At", "Message"]
+      header << "Git Sha" if @options[:sha]
+      presenter.header = header
       items.each do |item|
         version = item["version"]
         status = item["stack_status"]
         released_at = item["pretty_created_at"] || item["created_at"]
         message = item["message"] || "Deployed"
+        message = message[0..50]
 
         row = [version, status, format_time(released_at), message]
+        if @options[:sha]
+          sha = item["git_sha"].to_s[0..7] if item["git_sha"]
+          row << sha
+        end
         presenter.rows << row
       end
       presenter.show
@@ -66,7 +89,37 @@ module Jets::Command
       resp = Jets::Api::Release.retrieve(version)
       check_for_error_message!(resp)
     rescue Jets::Api::RequestError => e
-      puts "ERROR: Unable to get history. #{e.class}: #{e.message}"
+      puts "ERROR: Unable to get release. #{e.class}: #{e.message}"
+    end
+
+    def show
+      release = get(@options[:version])
+      release_at = release['pretty_created_at'] || release['created_at']
+
+      data = [
+        ["Version", release['version']],
+        ["Status", release['stack_status']],
+        ["Released At", format_time(release_at)],
+        ["Message", release['message']],
+        ["User", release['deploy_user']],
+        ["Git Branch", release['git_branch']],
+        ["Git Sha", release['git_sha']],
+        ["Git Message", release['git_message']],
+        ["Git Url", release['git_url']],
+        ["Git Dirty", release['git_dirty']],
+        ["Jets Env", release['jets_env']],
+        ["Jets Extra", release['jets_extra']],
+        ["Jets Version", release['jets_version']],
+        ["Ruby Version", release['ruby_version']],
+        ["Region", release['region']],
+      ]
+      column1_width = data.map { |row| row[1].nil? ? 0 : row[0].to_s.length }.max
+      column2_width = data.map { |row| row[1].nil? ? 0 : row[1].to_s.length }.max
+
+      puts Jets.project_namespace
+      data.each do |row|
+        puts "#{row[0].ljust(column1_width)}   #{row[1]}" unless row[1].nil?
+      end
     end
   end
 end

data/lib/jets/commands/rollback/rollback_command.rb

@@ -4,7 +4,7 @@ module Jets::Command
   class RollbackCommand < Base # :nodoc:
     desc "rollback", "Rollback to a previous release"
     long_desc Help.text(:rollback)
-    def perform(version=nil)
+    def perform(version)
       Rollback.new(options.merge(version: version)).run
     end
   end
@@ -15,14 +15,6 @@ module Jets::Command
     def initialize(options={})
       @options = options
       @version = options[:version]
-      # Handle more gracefully than the way Jets does it currently
-      if @version.nil?
-        puts <<~EOL
-          ERROR: version required
-          Usage: jets rollback VERSION
-        EOL
-        exit 1
-      end
     end
 
     def run

data/lib/jets/core.rb

@@ -88,7 +88,13 @@ module Jets::Core
   def parsed_project_name
     lines = IO.readlines("#{Jets.root}/config/application.rb")
     project_name_line = lines.find { |l| l =~ /config\.project_name.*=/ && l !~ /^\s+#/ }
-    project_name_line.gsub(/.*=/,'').strip.gsub(/["']/,'') if project_name_line
+    if project_name_line
+      parsed = project_name_line.gsub(/.*=/,'').strip
+      # The +? makes it non-greedy
+      # See: https://ruby-doc.org/core-2.5.1/Regexp.html#class-Regexp-label-Repetition
+      md = parsed.match(/['"](.+?)['"]/)
+      md ? md[1] : raise("Unable to parse project name from config/application.rb: #{project_name_line}")
+    end
   end
   memoize :parsed_project_name
 

data/lib/jets/dotenv/ssm.rb

@@ -37,7 +37,7 @@ class Jets::Dotenv
     end
 
     def fetch_ssm_value(key, value)
-      return "fake-ssm-value" if ENV['JETS_BUILD_NO_INTERNET']
+      return "fake-ssm-value" if ENV['JETS_NO_INTERNET']
 
       name = ssm_name(key, value)
       response = ssm.get_parameter(name: name, with_decryption: true)
@@ -45,6 +45,9 @@ class Jets::Dotenv
     rescue Aws::SSM::Errors::ParameterNotFound
       @missing << [key, value, name]
       ''
+    rescue Aws::SSM::Errors::ValidationException
+      puts "ERROR: Invalid SSM parameter name: #{name.inspect}".color(:red)
+      raise
     end
 
     def ssm_name(key, value)

data/lib/jets/generators/overrides/app/helpers.rb

@@ -56,7 +56,6 @@ module Jets::Generators::Overrides::App
     end
 
     def copy_project
-      # directory ".", project_folder, copy_options
       directory ".", ".", copy_options
     end
 
@@ -69,9 +68,6 @@ module Jets::Generators::Overrides::App
       excludes.uniq!
 
       unless @database
-        # Do not even generate the config/database.yml because
-        # Jets webpacker:install bombs and tries to load the db since it sees a
-        # config/database.yml but there's no database pg gem configured.
         excludes += %w[
           database.yml
           db

data/lib/jets/generators/overrides/app/templates/.env

@@ -0,0 +1,10 @@
+# Variables in here are available and shared across all environments: development, production, etc
+# Docs: https://docs.rubyonjets.com/docs/env-files/
+
+# Examples:
+# DATABASE_URL="mysql2://user:pass@host.com/db_name?pool=5" # raw value as-is
+# SSM can be use to reference a parameter store value
+# DATABASE_URL=SSM                       # conventionally references /PROJECT_NAME/JETS_ENV/DATABASE_URL
+# DATABASE_URL=SSM                       # /demo/development/DATABASE_URL
+# DATABASE_URL=SSM:database-url          # /demo/development/database-url
+# DATABASE_URL=SSM:/path/to/database-url # /path/to/database-url

data/lib/jets/generators/overrides/app/templates/.jetsignore

@@ -0,0 +1,6 @@
+# Additional files not to add to the zip file that jets creates for code deploy.
+# .gitignore files are also not added.
+# This adds additional files.
+#
+# Ignoring /public/files since should be served by s3 when using asset_path helper
+/public/files

data/lib/jets/generators/overrides/app/templates/config/environments/development.rb.tt

@@ -3,7 +3,7 @@ Jets.application.configure do
 
   config.cache_classes = false
   config.eager_load = false
-  config.logging.event = false # dont show large event in local development logging
+  config.logging.event = false # can be useful for CloudWatch
 
 <%- unless options[:mode] == 'job' -%>
   # Show full error reports.

data/lib/jets/generators/overrides/app/templates/config/environments/production.rb.tt

@@ -2,7 +2,7 @@ Jets.application.configure do
   config.cache_classes = true
   config.eager_load = true
   config.log_level = :info
-  config.logging.event = true # useful for CloudWatch logs
+  config.logging.event = false # can be useful for CloudWatch
 
 <%- unless options[:mode] == 'job' -%>
   config.consider_all_requests_local       = false

data/lib/jets/job/base.rb

@@ -38,7 +38,7 @@ module Jets::Job
           call = Jets::Commands::Call::Caller.new(function_name, JSON.dump(event), invocation_type: "Event")
           call.run
         else
-          puts "INFO: Not on AWS Lambda. In local mode perform_later executes the job with perform_now instead."
+          Jets.logger.info "INFO: Not on AWS Lambda. In local mode perform_later executes the job with perform_now instead."
           perform_now(meth, event, context)
         end
       end

data/lib/jets/job/dsl/dynamodb_event.rb

@@ -1,7 +1,7 @@
 module Jets::Job::Dsl
   module DynamodbEvent
     def dynamodb_event(table_name_without_namespace, options={})
-      return if ENV['JETS_BUILD_NO_INTERNET'] # Disable during build since jets build tries to init this
+      return if ENV['JETS_NO_INTERNET'] # Disable during build since jets build tries to init this
 
       table_name = add_dynamodb_table_namespace(table_name_without_namespace)
       stream_arn = full_dynamodb_stream_arn(table_name)

data/lib/jets/router/matcher.rb

@@ -32,7 +32,7 @@ module Jets::Router
       # Checking the request_method_from_hidden_method_field so that handler can find the right route
       # super early in the process. Otherwise lambda routes to the wrong controller action.
       @request_method = request_method || @request.request_method_from_hidden_method_field || @request.request_method.to_s.upcase
-      @request_path = @request.path
+      @request_path = strip_format(@request.path)
       route = find_route
       match_constraints(route) if route
     end
@@ -43,7 +43,7 @@ module Jets::Router
     def find_by_env(env)
       @env = env
       @request_method = env["REQUEST_METHOD"] || "GET"
-      @request_path = env["PATH_INFO"]
+      @request_path = strip_format(env["PATH_INFO"])
       find_route
     end
 
@@ -87,12 +87,16 @@ module Jets::Router
     end
     memoize :mount
 
+    def strip_format(path)
+      path.sub(/\..+$/, '') # Remove format from the end of the path
+    end
+
     def match?(route)
       # Immediately stop checking when the request http_method: GET, POST, ANY, etc
       # doesnt match.
       return false if request_method != route.http_method && route.http_method != "ANY"
 
-      route_path = route.path
+      route_path = strip_format(route.path)
       route_path = "#{mount.at}#{route_path}" if mount
 
       if request_path == route_path

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "5.0.0.beta1"
+  VERSION = "5.0.1"
 end

data/lib/jets.rb

@@ -14,6 +14,7 @@ require "json"
 require "memoist"
 require "rainbow/ext/string"
 require "jets-api"
+require "jets-git"
 
 require "jets/core_ext"
 require "jets/autoloaders"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1
+  version: 5.0.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-03 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -376,6 +376,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jets-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: jets-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -859,6 +873,7 @@ files:
 - lib/jets/command/help/upgrade.md
 - lib/jets/command/help/url.md
 - lib/jets/command/helpers/editor.rb
+- lib/jets/command/rake_decorate.rb
 - lib/jets/commands.rb
 - lib/jets/commands/application/application_command.rb
 - lib/jets/commands/build/build_command.rb
@@ -962,7 +977,9 @@ files:
 - lib/jets/generators/overrides/app/USAGE
 - lib/jets/generators/overrides/app/app_generator.rb
 - lib/jets/generators/overrides/app/helpers.rb
-- lib/jets/generators/overrides/app/templates/.gitignore
+- lib/jets/generators/overrides/app/templates/.env
+- lib/jets/generators/overrides/app/templates/.gitignore.tt
+- lib/jets/generators/overrides/app/templates/.jetsignore
 - lib/jets/generators/overrides/app/templates/.rspec
 - lib/jets/generators/overrides/app/templates/Gemfile.tt
 - lib/jets/generators/overrides/app/templates/README.md
@@ -1187,9 +1204,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.20
 signing_key: