jets 6.0.0.beta1 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557cd5532ad372ba0ea9be975103f5dfb77a63b3472d0582f98570cd75a114e7
-  data.tar.gz: 773a6bf556945018ae87c73f3c37ee3294be02f463209db3e2c8712ae9757e4f
+  metadata.gz: f47ac05e6c483fddfa95f18d2899386df9e228893b7ddc425ce9a5e6ef4df0c4
+  data.tar.gz: d18b78a75e123a66b954f35339e541df75d6e85a4dd16f1ac56ca090d00aeb6d
 SHA512:
-  metadata.gz: eb08a46c81660e3d0c503427d2fbd4426b4d37a3a7dc27e855a34930bc3f5be6e812ddd9507dca82383e95b6d2aea360b3f92c8f10b03d95b9cd22b8cffd57cf
-  data.tar.gz: 043127d02de6be061b8a3c1ad158bb206edf63ac4e4253685884987bbfac1421d1ef53974afa0ee8ba8c5912061b80df3b222538fe1f3dd0fd1aa17d07b18e40
+  metadata.gz: 1771244d6fed908320775d6cbeffd08d7b26defe3a57bc0c8a3e1db6e2ee92eaf49c0e277e138d9186215cdfa3b40b34508b0159aaa7d0b350ae40d464987100
+  data.tar.gz: '099a72152faeaad8bbbacfde6859e320025840a756115d55ee908a838da4d538d6ee5b06d3f498ac07864d4477ac4fcd455056261db5951d28253906d52be225'

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -27,7 +27,7 @@ Thanks!
 Make sure that you've done all of these.  To mark a checkbox done, replace [ ] with [x]. Or after you create the issue you can click the checkbox.
 -->
 
-- [ ] Upgrade Jets: Are you using the latest version of Jets? This allows Jets to fix issues fast. There's a `jets upgrade` command that makes this a simple task. There's also an Upgrading Guide: http://rubyonjets.com/docs/upgrading/
+- [ ] Upgrade Jets: Are you using the latest version of Jets? This allows Jets to fix issues fast.
 - [ ] Reproducibility: Are you reporting a bug others will be able to reproduce and not asking a question. If you're unsure or want to ask a question, do so on https://community.boltops.com
 - [ ] Code sample: Have you put together a code sample to reproduce the issue and make it available?  Code samples help speed up fixes dramatically. If it's an easily reproducible issue, then code samples are not needed. If you're unsure, please include a code sample.
 

data/CHANGELOG.md

@@ -3,7 +3,15 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
-## [6.0.0] - Unrelease
+## [6.0.1] - 2024-05-27
+- [#727](https://github.com/rubyonjets/jets/pull/727) small fixes
+- associated outputs concept
+- jets concurrency show lambda function name
+- jets git:push command
+- pretty time helper
+- update github issue template bug report
+
+## [6.0.0] - 2024-05-23
 
 * Rails Support
 * Hooks Support

data/Gemfile

@@ -5,10 +5,6 @@ gemspec
 
 # required here for specs
 group :development, :test do
-  gem "mysql2", "~> 0.5.2"
-  gem "dynomite", "~> 2.0.0"
-end
-
-group :test do
-  gem "actionpack", "~> 7.1.3" # jets shim specs
+  gem "dynomite", ">= 2.0.0"
+  gem "mysql2", ">= 0.5.2"
 end

data/Rakefile

@@ -9,12 +9,6 @@ RSpec::Core::RakeTask.new
 
 require_relative "lib/jets"
 
-desc "Generates cli reference docs as markdown"
-task :docs do
-  require "cli_markdown_jets"
-  CliMarkdown::Creator.new.create_all
-end
-
 # Thanks: https://docs.ruby-lang.org/en/2.1.0/RDoc/Task.html
 require "rdoc/task"
 require "jets/rdoc"

data/lib/jets/autoloaders/main.rb

@@ -14,16 +14,13 @@ module Jets
         memoize :loader
 
         def configure(root = Jets.root)
-          all_loaders = Zeitwerk::Registry.loaders
-          already_configured_dirs = all_loaders.map(&:dirs).flatten
-
           full_path = proc { |path| "#{root}/#{path}" }
           autoload_paths = config.autoload_paths.map(&full_path)
           extension_paths = config.extension_paths.map(&full_path)
           load_paths = autoload_paths + extension_paths
 
           load_paths.each do |path|
-            next if already_configured_dirs.include?(path)
+            next if already_configured_dir?(path)
             next unless File.directory?(path)
             loader.push_dir(path)
           end
@@ -34,6 +31,23 @@ module Jets
           end
         end
 
+        def already_configured_dir?(path)
+          all_loaders = Zeitwerk::Registry.loaders
+          already_configured_dirs = all_loaders.map(&:dirs).flatten
+
+          # Normalize the path to avoid trailing slashes issues
+          normalized_path = File.expand_path(path)
+
+          # Check the path and its parent directories
+          while normalized_path != "/"
+            return true if already_configured_dirs.include?(normalized_path)
+            normalized_path = File.dirname(normalized_path)
+          end
+
+          # Check the root directory explicitly
+          already_configured_dirs.include?("/")
+        end
+
         # Call at end
         def setup
           loader.on_load do |cpath, value, abspath|

data/lib/jets/cfn/resource/associated_outputs.rb

@@ -0,0 +1,21 @@
+class Jets::Cfn::Resource
+  class AssociatedOutputs
+    extend Memoist
+
+    def initialize(outputs = {}, replacements = {})
+      @outputs = outputs
+      @replacements = replacements
+    end
+
+    def replacer
+      Replacer.new(@replacements)
+    end
+    memoize :replacer
+
+    def outputs
+      outputs = replacer.replace_placeholders(@outputs)
+      outputs.transform_values! { |value| value.camelize }
+      outputs.transform_keys! { |key| replacer.replace_value(key) }
+    end
+  end
+end

data/lib/jets/cli/ci/status.rb

@@ -1,11 +1,14 @@
 class Jets::CLI::Ci
   class Status < Base
+    include Jets::Util::FormatTime
+
     def run
       check_build_id!
       run_with_exception_handling do
         puts "Build id: #{build_id}"
         resp = codebuild.batch_get_builds(ids: [build_id])
         build = resp.builds.first
+        puts "Build end time: #{pretty_time(build.end_time)}"
         puts "Build status: #{colored(build.build_status)}"
       end
     end

data/lib/jets/cli/concurrency/get.rb

@@ -9,7 +9,7 @@ class Jets::CLI::Concurrency
     def run
       puts <<~EOL
         Settings for Function: #{@lambda_function.name}
-        Reserved concurreny: #{reserved_concurrency}
+        Reserved concurrency: #{reserved_concurrency}
         Provisioned concurrency: #{provisioned_concurrency}
       EOL
     end

data/lib/jets/cli/concurrency/set.rb

@@ -1,8 +1,8 @@
 class Jets::CLI::Concurrency
   class Set < Get
     def run
-      sure? "Will update the concurrency settings for #{Jets.project.namespace}"
-      puts "Updating concurrency settings for #{Jets.project.namespace}"
+      sure? "Will update the concurrency settings for #{@lambda_function.name}"
+      puts "Updating concurrency settings for #{@lambda_function.name}"
 
       if @options[:reserved]
         @lambda_function.reserved_concurrency = @options[:reserved]

data/lib/jets/cli/concurrency/unset.rb

@@ -1,8 +1,8 @@
 class Jets::CLI::Concurrency
   class Unset < Set
     def run
-      sure? "Will unset the concurrency settings for #{Jets.project.namespace}"
-      puts "Unsetting concurrency settings for #{Jets.project.namespace}"
+      sure? "Will unset the concurrency settings for #{@lambda_function.name}"
+      puts "Unsetting concurrency settings for #{@lambda_function.name}"
 
       if @options[:reserved]
         @lambda_function.reserved_concurrency = nil

data/lib/jets/cli/delete.rb

@@ -8,7 +8,11 @@ class Jets::CLI
 
     def are_you_sure?
       stack_name = Jets.project.namespace
-      message = "Will delete #{stack_name.color(:green)}"
+      message = <<~EOL
+        Will delete #{stack_name.color(:green)}
+
+        Uses remote runner to delete the stack and resources.
+      EOL
       unless stack_exists?(stack_name)
         message << <<~EOL
 

data/lib/jets/cli/functions.rb

@@ -14,7 +14,7 @@ class Jets::CLI
         resources = cfn.describe_stack_resources(stack_name: stack_name).stack_resources
         resources.each do |r|
           if r.resource_type == "AWS::Lambda::Function"
-            functions << r.physical_resource_id
+            functions << r.physical_resource_id if r.physical_resource_id # race condition. can be nil for a brief moment while provisioning
           end
         end
       end

data/lib/jets/cli/git/push.rb

@@ -0,0 +1,65 @@
+require "open3"
+
+class Jets::CLI::Git
+  class Push < Jets::CLI::Base
+    def initialize(options = {})
+      super
+      @args = options[:args] || []
+    end
+
+    def run
+      args = ["push"] + @args
+      puts "=> git #{args.join(" ")}"
+
+      IO.popen(["git", *args]) do |io|
+        io.each do |line|
+          puts line
+        end
+      end
+
+      return unless $?.success?
+
+      set_env_vars!
+      sleep 2 # wait ci to start
+      Jets::CLI::Ci::Logs.new(options).run
+    end
+
+    def set_env_vars!
+      env_vars = Jets.project.config.git.push.branch[push_branch] || {}
+      # IE: branch_name = {JETS_ENV: "xxx", AWS_PROFILE: "xxx"}
+      env_vars.each do |k, v|
+        ENV[k.to_s] = v
+      end
+    end
+
+    # man git-push
+    # git push
+    # git push origin
+    # git push origin :
+    # git push origin master
+    # git push origin HEAD
+    # git push mothership master:satellite/master dev:satellite/dev
+    # git push origin HEAD:master
+    # git push origin master:refs/heads/experimental
+    # git push origin :experimental
+    # git push origin +dev:master
+    def push_branch
+      args = @args.reject { |arg| arg.start_with?("-") } # remove options
+      case args.size
+      when 0
+        local.git_default_branch
+      when 1
+        local.git_current_branch
+      when 2
+        args.last
+      else
+        raise "ERROR: Too many arguments. Usage: jets git:push [REMOTE] [BRANCH]"
+      end
+    end
+
+    def local
+      Jets::Git::Local.new
+    end
+    memoize :local
+  end
+end

data/lib/jets/cli/git.rb

@@ -0,0 +1,8 @@
+class Jets::CLI
+  class Git < Jets::Thor::Base
+    desc "push", "Runs git push and jets ci:logs"
+    def push(*args)
+      Push.new(options.merge(args: args)).run
+    end
+  end
+end

data/lib/jets/cli/group/helpers.rb

@@ -11,13 +11,13 @@ module Jets::CLI::Group
     end
 
     def init_project_name
-      Jets.project.name # inferred from the folder name
+      # inferred from the folder name
+      Dir.pwd.split("/").last.gsub(/[^a-zA-Z0-9_]/, "-").squeeze("-")
     end
 
     def framework
-      Jets::CLI::Init::Detect.new.framework
+      Jets::Framework.name
     end
-    memoize :framework
 
     def package_type
       (framework == "rails") ? "image" : "zip"

data/lib/jets/cli/help/concurrency/info.md

@@ -0,0 +1,14 @@
+## Example
+
+    ❯ jets concurrency:info
+    Concurrency for demo-dev
+    +---------------------------+----------+
+    |         Function          | Reserved |
+    +---------------------------+----------+
+    | controller                | 25       |
+    | jets-prewarm_event-handle | 2        |
+    | total                     | 27       |
+    +---------------------------+----------+
+    Account Limits
+      Concurrent Executions: 1000
+      Unreserved Concurrent Executions: 730

data/lib/jets/cli/init/templates/config/jets/deploy.rb.tt

@@ -1,7 +1,36 @@
 Jets.deploy.configure do
+  # CloudFront Lambda URL https://docs.rubyonjets.com/docs/routing/lambda/cloudfront/distribution/
+  # config.lambda.url.cloudfront.enable = true
+  # config.lambda.url.cloudfront.cert.arn = acm_cert_arn(domain: "domain.com", region: "us-east-1")
+  # config.lambda.url.cloudfront.route53.enable = true
+
+  # CloudFront Assets
+  # config.assets.cloudfront.enable = true
+  # config.assets.cloudfront.cert.arn = acm_cert_arn(domain: "domain.com", region: "us-east-1")
+  # config.assets.cloudfront.route53.enable = true
+
+  # Release phase https://docs.rubyonjets.com/docs/hooks/remote/release/
+  # config.release.phase.command = "bundle exec rails db:migrate"
+
+  # Scaling https://docs.rubyonjets.com/docs/config/concurrency/
+  # config.lambda.controller.provisioned_concurrency = 1  # costs money, no cold start
+  # config.lambda.controller.reserved_concurrency = 25    # free and limits scaling
+
+  # IAM https://docs.rubyonjets.com/docs/iam/app/iam-policies/
+  # config.lambda.iam.policy = ["sns"]
+  # config.lambda.iam.managed_policy = ["AmazonS3FullAccess"]
+
+  # Docker https://docs.rubyonjets.com/docs/docker/dockerfile/managed/
+  # config.dockerfile.packages.apt.build_stage = ["default-libmysqlclient-dev"]
+  # config.dockerfile.packages.apt.deployment_stage = ["default-mysql-client"]
+
 <% unless framework == "rails" -%>
   # https://docs.rubyonjets.com/docs/config/package-type/
+<% if %w[rack sinatra].include?(framework) -%>
+  # config.package_type = "zip" # default: image IE: image or zip
+<% else -%>
   # config.package_type = "image" # default: image IE: image or zip
+<% end -%>
 
 <% end -%>
 <% if framework == "rails" -%>
@@ -9,35 +38,4 @@ Jets.deploy.configure do
   # config.job.enable = true
 
 <% end -%>
-  # Docker https://docs.rubyonjets.com/docs/docker/dockerfile/managed/
-  # config.dockerfile.packages.apt.build_stage = ["default-libmysqlclient-dev"]
-  # config.dockerfile.packages.apt.deployment_stage = ["default-mysql-client"]
-
-  # CloudFront Lambda URL https://docs.rubyonjets.com/docs/routing/lambda/cloudfront/distribution/
-  # config.lambda.url.cloudfront.enable = true
-  # config.lambda.url.cloudfront.cert.arn = acm_cert_arn("domain.com", region: "us-east-1")
-  # config.lambda.url.cloudfront.route53.enable = true
-
-  # WAF https://docs.rubyonjets.com/docs/routing/lambda/cloudfront/waf/
-  # config.lambda.url.cloudfront.web_acl_id = web_acl_arn(ssm_env, scope: "CLOUDFRONT")
-  # config.waf.rules = ["AWSManagedRulesSQLiRuleSet"]
-
-  # Scaling https://docs.rubyonjets.com/docs/config/provisioned-concurrency/
-  # config.lambda.controller.provisioned_concurrency = 1  # costs money, no cold start
-  # config.lambda.controller.reserved_concurrency = 10    # free and limits scaling
-
-  # Release phase https://docs.rubyonjets.com/docs/hooks/remote/release/
-  # config.release.phase.command = "bundle exec rails db:migrate"
-
-  # CI https://docs.rubyonjets.com/docs/ci/getting-started/
-  # use jets ci:init to add these settings automatically
-  # config.ci.source = {
-  #   Type: "GITHUB",
-  #   Location: "https://github.com/ORG/REPO"
-  # }
-  # config.ci.source_version = "main"
-  # config.ci.env.vars = {
-  #   BUNDLE_GITHUB__COM: "SSM:/#{ssm_env}/BUNDLE_GITHUB__COM",
-  #   JETS_API_KEY: "SSM:/#{ssm_env}/JETS_API_KEY"
-  # }
 end

data/lib/jets/cli/init/templates/env/.env.tt

@@ -5,7 +5,7 @@
 <% if framework == "rails" -%>
 RAILS_ENV=production
 RAILS_LOG_TO_STDOUT=1
-# SECRET_KEY_BASE=SSM  # SSM:/<%= init_project_name %>/dev/SECRET_KEY_BASE remember to set a secret key base
+# SECRET_KEY_BASE=SSM  # => SSM:/<%= init_project_name %>/dev/SECRET_KEY_BASE remember to set a secret key base
 <% end -%>
 
 # Examples:
@@ -14,5 +14,7 @@ RAILS_LOG_TO_STDOUT=1
 # KEY2=SSM:/abs/path/to/KEY2
 # Conventions https://docs.rubyonjets/docs/env/ssm/conventions/
 # SSM path under /<%= init_project_name %>/dev/ are autoloaded.
-# You can also control this behavior and then manually declare the SSM parameter.
-# DATABASE_URL=SSM  # SSM:/<%= init_project_name %>/dev/DATABASE_URL
+# For example, DATABASE_URL does not need to be declared here.
+# It can be conventionally autoloaded.
+# Below is an example of how to manually declare but it's not needed.
+# DATABASE_URL=SSM  # => SSM:/<%= init_project_name %>/dev/DATABASE_URL

data/lib/jets/cli/init.rb

@@ -16,7 +16,7 @@ class Jets::CLI
     private
 
     def sure_message
-      detected_message = "Detected #{framework} framework.\n" if framework
+      detected_message = "Detected #{framework.titleize} framework.\n" if framework
       <<~EOL
         #{detected_message}This will initialize the project for Jets.
 
@@ -26,6 +26,39 @@ class Jets::CLI
       EOL
     end
 
+    def configure_rails
+      # config/environments/production.rb adjustments
+      # Comment out public_file_server.enabled on new Rails 7.0 apps
+      #    config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
+      comment_out_line("config.public_file_server.enabled = ENV", env: "production")
+      config_environment("config.public_file_server.enabled = false\n\n", env: "production")
+      # Comment out config.asset_host = "http://assets.example.com" on new Rails 7.0 apps
+      #    config.asset_host = "http://assets.example.com"
+      comment_out_line('config.asset_host = "', env: "production")
+      asset_host = <<~EOL
+
+        # Assets https://docs.rubyonjets.com/docs/assets/cloudfront/
+        config.asset_host = ENV["JETS_ASSET_HOST"] unless ENV["JETS_ASSET_HOST"].blank?
+      EOL
+      config_environment(asset_host, env: "production")
+
+      jets_job = <<~EOL
+        # Jobs https://docs.rubyonjets.com/docs/jobs/enable/
+        # config.active_job.queue_adapter = :jets_job
+      EOL
+      config_environment(jets_job, env: "production")
+    end
+
+    def configure_hanami
+      after = "  class App < Hanami::App\n"
+      data = <<~EOL
+        # https://guides.hanamirb.org/v2.1/assets/using-a-cdn/
+        # https://docs.rubyonjets.com/docs/assets/cloudfront/
+        config.assets.base_url = ENV["JETS_ASSET_HOST"] if ENV["JETS_ASSET_HOST"]
+      EOL
+      inject_into_file "config/app.rb", optimize_indentation(data, 4), after: after, verbose: true
+    end
+
     public
 
     def are_you_sure?
@@ -46,21 +79,12 @@ class Jets::CLI
     end
 
     def configure_environment
-      return unless framework == "rails"
-      # config/environments/production.rb adjustments
-      # Comment out public_file_server.enabled on new Rails 7.0 apps
-      #    config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
-      comment_out_line("config.public_file_server.enabled = ENV", env: "production")
-      config_environment("config.public_file_server.enabled = false", env: "production")
-      # Comment out config.asset_host = "http://assets.example.com" on new Rails 7.0 apps
-      #    config.asset_host = "http://assets.example.com"
-      comment_out_line('config.asset_host = "', env: "production")
-      config_environment('config.asset_host = ENV["JETS_ASSET_HOST"] unless ENV["JETS_ASSET_HOST"].blank?', env: "production")
-      jets_job = <<~EOL
-        # Docs: https://docs.rubyonjets.com/docs/jobs/enable/
-        # config.active_job.queue_adapter = :jets_job
-      EOL
-      config_environment(jets_job, env: "production")
+      case framework
+      when "rails"
+        configure_rails
+      when "hanami"
+        configure_hanami
+      end
     end
   end
 end

data/lib/jets/cli/release/history.rb

@@ -3,6 +3,7 @@ require "tzinfo"
 
 class Jets::CLI::Release
   class History < Base
+    include Jets::Util::FormatTime
     rescue_api_error
 
     def run
@@ -29,11 +30,11 @@ class Jets::CLI::Release
       items.each do |item|
         version = item[:version]
         status = item[:stack_status]
-        released_at = item[:pretty_created_at] || item[:created_at]
+        released_at = item[:created_at]
         message = item[:message] || "Deployed"
         message = message[0..50]
 
-        row = [version, status, format_time(released_at), message]
+        row = [version, status, pretty_time(released_at), message]
         if @options[:sha]
           sha = item[:git_sha].to_s[0..7] if item[:git_sha]
           row << sha
@@ -42,27 +43,5 @@ class Jets::CLI::Release
       end
       presenter.show
     end
-
-    def format_time(string)
-      if string.include?("ago") # IE: 5 minutes ago
-        string
-      else
-        utc = DateTime.parse(string)
-
-        tz_override = ENV["JETS_TZ"] # IE: America/Los_Angeles
-        local = if tz_override
-          tz = TZInfo::Timezone.get(tz_override)
-          tz.utc_to_local(utc)
-        else
-          utc.new_offset(DateTime.now.offset) # local time
-        end
-
-        if tz_override
-          local.strftime("%b %-d, %Y %-l:%M:%S%P")
-        else
-          local.strftime("%b %-d, %Y %H:%M:%S")
-        end
-      end
-    end
   end
 end

data/lib/jets/cli/release/info.rb

@@ -27,8 +27,7 @@ class Jets::CLI::Release
       data = release_fields.map do |field|
         # special cases for values
         value = if field == :created_at
-          time_string = release[:pretty_created_at] || release[:created_at]
-          format_time(time_string)
+          pretty_time(release[:created_at])
         else
           release[field]
         end

data/lib/jets/cli/stop.rb

@@ -8,8 +8,8 @@ class Jets::CLI
         if stopped
           log.info <<~EOL
             Deploy has been stopped: #{build_id}
-            Note: If the deploy has already started the CloudFormation update,
-            it will continue. Please check the logs.
+            If the deploy has already started the CloudFormation update it will continue.
+            Please check the logs.
 
           EOL
           show_console_log_url(build_id)

data/lib/jets/cli/waf/templates/waf.rb.tt

@@ -9,18 +9,18 @@ Jets.deploy.configure do
   # config.waf.rules = []
 
   # Jets WAF Managed Rules
-  # config.waf.managed_rules.blanket_rate_limiter.enable = true # default: true
-  # config.waf.managed_rules.blanket_rate_limiter.limit = 1000
-  # config.waf.managed_rules.blanket_rate_limiter.evaluation_window_sec = 300
-  # config.waf.managed_rules.blanket_rate_limiter.aggregate_key_type = "IP"
+  # config.waf.custom_rules.blanket_rate_limiter.enable = true # default: true
+  # config.waf.custom_rules.blanket_rate_limiter.limit = 1000
+  # config.waf.custom_rules.blanket_rate_limiter.evaluation_window_sec = 300
+  # config.waf.custom_rules.blanket_rate_limiter.aggregate_key_type = "IP"
 
-  # config.waf.managed_rules.uri_rate_limiter.enable = true # default: false
-  # config.waf.managed_rules.uri_rate_limiter.limit = 100
-  # config.waf.managed_rules.uri_rate_limiter.logical_statement = "Or"
-  # config.waf.managed_rules.uri_rate_limiter.paths = ["/login", "/signup"] # default: ["/"]
-  # config.waf.managed_rules.uri_rate_limiter.evaluation_window_sec = 300
-  # config.waf.managed_rules.uri_rate_limiter.aggregate_key_type = "IP"
-  # config.waf.managed_rules.uri_rate_limiter.string_match_condition = "STARTS_WITH"
+  # config.waf.custom_rules.uri_rate_limiter.enable = true # default: false
+  # config.waf.custom_rules.uri_rate_limiter.limit = 100
+  # config.waf.custom_rules.uri_rate_limiter.logical_statement = "Or"
+  # config.waf.custom_rules.uri_rate_limiter.paths = ["/login", "/signup"] # default: ["/"]
+  # config.waf.custom_rules.uri_rate_limiter.evaluation_window_sec = 300
+  # config.waf.custom_rules.uri_rate_limiter.aggregate_key_type = "IP"
+  # config.waf.custom_rules.uri_rate_limiter.string_match_condition = "STARTS_WITH"
 
   # Docs: https://docs.rubyonjets.com/docs/routing/lambda/cloudfront/waf/
 end

data/lib/jets/cli.rb

@@ -15,6 +15,9 @@ module Jets
     desc "generate SUBCOMMAND", "generate subcommands"
     subcommand "generate", Generate
 
+    desc "git SUBCOMMAND", "git subcommands"
+    subcommand "git", Git
+
     desc "maintenance SUBCOMMAND", "maintenance subcommands"
     subcommand "maintenance", Maintenance
 

data/lib/jets/core/config/project.rb

@@ -7,6 +7,7 @@ module Jets::Core::Config
       :ignore_paths,
       :base64_encode,
       :dotenv,
+      :git,
       :tips
     )
     def initialize(*)
@@ -40,6 +41,10 @@ module Jets::Core::Config
 
       @base64_encode = true
 
+      @git = ActiveSupport::OrderedOptions.new
+      @git.push = ActiveSupport::OrderedOptions.new
+      @git.push.branch = ActiveSupport::OrderedOptions.new
+
       @tips = ActiveSupport::OrderedOptions.new
       @tips.enable = true
       @tips.concurrency_change = true
@@ -62,12 +67,23 @@ module Jets::Core::Config
       Jets::Core::Booter.require_config(:project)
       return @name if @name
 
-      if jets_info_project_name
-        jets_info_project_name
-      else
-        # when not set, conventionally infer app name from current directory
-        @name_inferred = true
-        Dir.pwd.split("/").last.gsub(/[^a-zA-Z0-9_]/, "-").squeeze("-")
+      project_name = jets_info_project_name
+      unless project_name
+        puts "ERROR: Jets project name not set".color(:red)
+        abort <<~EOL
+          Please set config.name in config/jets/project.rb or the JETS_PROJECT environment variable
+          Example:
+
+          config/jets/project.rb
+
+              Jets.project.configure do
+                config.name = "demo"
+              end
+
+          Or set the JETS_PROJECT environment variable:
+
+              export JETS_PROJECT=demo
+        EOL
       end
     end
     memoize :name

data/lib/jets/framework.rb

@@ -0,0 +1,51 @@
+module Jets
+  class Framework
+    class << self
+      extend Memoist
+      def env_var
+        "#{name.upcase}_ENV" if name # can be nil
+      end
+
+      def env
+        return unless env_var
+        ENV[env_var] || "production" # for Dockerfile default to production
+      end
+
+      def name
+        gems.each do |gem|
+          frameworks.each do |framework|
+            if gem == framework
+              # Special case for puma. If puma is detected, it means it is a rack app.
+              if framework == "puma"
+                return "rack"
+              else
+                return framework
+              end
+            end
+          end
+        end
+        nil
+      end
+      memoize :name
+
+      def frameworks
+        %w[
+          rails
+          sinatra
+          hanami
+          rack
+          puma
+        ]
+      end
+
+      def gems
+        return [] unless File.exist?("Gemfile")
+        Bundler.with_unbundled_env do
+          gemfile_content = File.read("Gemfile")
+          dsl = Bundler::Dsl.evaluate(Bundler.default_gemfile, gemfile_content, {})
+          dsl.dependencies.map(&:name)
+        end
+      end
+    end
+  end
+end

data/lib/jets/git/codebuild.rb

@@ -23,7 +23,7 @@ module Jets::Git
     end
 
     def git_url
-      "#{host}/#{full_repo}"
+      "#{host}/#{full_repo}" if host && full_repo
     end
 
     def host

data/lib/jets/git/local.rb

@@ -65,5 +65,9 @@ module Jets::Git
       end
       default
     end
+
+    def git_current_branch
+      `rev-parse --abbrev-ref HEAD`.strip
+    end
   end
 end

data/lib/jets/lambda/definition.rb

@@ -5,7 +5,7 @@ module Jets::Lambda
     attr_accessor :class_name, :type
     attr_reader(
       :meth, :properties, :provisioned_concurrency, :iam_policy, :managed_iam_policy,
-      :lang, :associated_resources
+      :lang, :associated_resources, :associated_outputs
     )
     def initialize(class_name, meth, options = {})
       @class_name = class_name.to_s
@@ -18,6 +18,7 @@ module Jets::Lambda
       @managed_iam_policy = options[:managed_iam_policy]
       @lang = options[:lang] || :ruby
       @associated_resources = options[:associated_resources] || {}
+      @associated_outputs = options[:associated_outputs] || {}
       @replacements = options[:replacements] || {} # added to baseline replacements
     end
 

data/lib/jets/lambda/dsl.rb

@@ -169,6 +169,11 @@ module Jets::Lambda::Dsl
     # User-friendly short resource method. Users will use this.
     alias_method :resource, :associated_resources
 
+    def associated_outputs(outputs = {})
+      @associated_outputs ||= []
+      @associated_outputs << outputs
+    end
+
     # Using this odd way of setting these properties so we can keep the
     # resource(*definitions) signature simple. Using keyword arguments at the end
     # interfere with being able to pass in any keys for the properties hash at the end.
@@ -282,6 +287,7 @@ module Jets::Lambda::Dsl
         iam_policy: @iam_policy,
         managed_iam_policy: @managed_iam_policy,
         associated_resources: @associated_resources,
+        associated_outputs: @associated_outputs,
         lang: lang,
         replacements: replacements(meth))
 

data/lib/jets/shim/adapter/fallback.rb

@@ -11,18 +11,22 @@ module Jets::Shim::Adapter
 
     class << self
       def handler(event, context = nil, target = nil)
-        puts "The default fallback handler is being called because a handler for it could not be found"
-        puts "For debugging, here is the"
+        puts <<~EOL
+          WARN: handler for it could not be found. The default fallback handler is being used.
+          The default fallback handler simply prints out the event payload for debugging, it will be printed below.
+          Usually the default handler is not what you want.
+          You might be using a test event payload for testing which does not represent a real event.
+          Please double check the event payload.
+        EOL
         if ENV["_HANDLER"] # on AWS Lambda
           puts "event: #{JSON.dump(event)}"
         else
           puts "event:"
           puts JSON.pretty_generate(event)
         end
-        puts "Please double check the event payload.\n\n"
 
         if target
-          puts "ERROR: event handler target not found: #{target}".color(:red)
+          puts "WARN: Event handler target not found: #{target}".color(:red)
           target_class, target_method = target.split(".")
           target_class = target_class.camelize
           target_method ||= "perform"
@@ -40,7 +44,8 @@ module Jets::Shim::Adapter
 
         else
           puts <<~EOL
-            You can also configure a custom fallback handler in the config/jets/shim.rb file.
+            You can also configure a custom fallback handler with a config/jets/shim.rb file.
+            Though custom handlers rarely needed and you should double check the event payload.
             Example:
 
             config/jets/shim.rb
@@ -55,7 +60,7 @@ module Jets::Shim::Adapter
         end
         # Custom Jets error message
         {
-          errorMessage: "event handler not found. Look at logs for details",
+          errorMessage: "Event handler not found. Look at logs for details",
           errorType: "JetsEventHandlerNotFound"
         }
       end

data/lib/jets/shim/config.rb

@@ -21,51 +21,46 @@ module Jets::Shim
       elsif @rack_app
         @rack_app
       else
-        boot_path = @boot_path || infer_boot_path
-        # Possible that boot_path is nil.
-        # Case: Jets events app only.
-        if boot_path
-          require_boot_path(boot_path) if boot_path # in case boot_path is not set
-          infer_rack_app(boot_path) # IE: Rails.application or App
-        end
+        framework_app
       end
     end
     alias_method :app, :rack_app
     alias_method :app=, :rack_app=
 
-    def infer_boot_path
-      if rails?
-        "config/environment"
-      elsif File.exist?("app.rb")
-        "app"
+    def framework_app
+      # Explicitly set boot_path takes precedence
+      # IE: my_app.rb => MyApp
+      if @boot_path && File.exist?(@boot_path)
+        app_class = @boot_path.sub(/\.rb$/, "").camelize.constantize
+        return app_class
       end
-    end
 
-    def require_boot_path(path)
-      path = path.starts_with?(".") ? path : "./#{path}"
-      path = path.ends_with?(".rb") ? path : "#{path}.rb"
-      require path # IE: config/environment.rb (Rails) or app.rb (generic rack app)
-    end
+      # Infer app.rb boot_path
+      # IE: app.rb => App
+      if File.exist?("app.rb")
+        require_boot_path("app")
+        return App
+      end
 
-    def infer_rack_app(boot_path)
-      if rails?
+      # Infer rack app from config.ru
+      case framework
+      when "rails"
+        require_boot_path "config/environment"
         Rails.application
-      else
-        boot_path.sub!(/\.rb$/, "") # remove .rb extension
-        boot_path.camelize.constantize
+      when "hanami"
+        require "hanami/boot"
+        Hanami.app
       end
     end
 
-    def rails?
-      framework?(:rails)
+    def require_boot_path(path)
+      path = path.starts_with?(".") ? path : "./#{path}"
+      path = path.ends_with?(".rb") ? path : "#{path}.rb"
+      require path # IE: config/environment.rb (Rails) or app.rb (generic rack app)
     end
 
-    def framework?(name)
-      if File.exist?("config.ru")
-        # IE: Jets.application or Rails.application
-        IO.readlines("config.ru").any? { |l| l.include?("#{name.to_s.camelize}.application") }
-      end
+    def framework
+      Jets::Framework.name
     end
-    memoize :framework?
   end
 end

data/lib/jets/util/format_time.rb

@@ -0,0 +1,52 @@
+module Jets::Util
+  module FormatTime
+    def pretty_time(time)
+      datetime = case time
+      when Time
+        time.to_datetime
+      when String
+        DateTime.parse(time)
+      else
+        time
+      end
+
+      if datetime > 1.day.ago.utc
+        time_ago_in_words(datetime) + " ago"
+      else
+        tz_override = ENV["JETS_TZ"] # IE: America/Los_Angeles
+        local = if tz_override
+          tz = TZInfo::Timezone.get(tz_override)
+          tz.time_to_local(datetime)
+        else
+          datetime.new_offset(DateTime.now.offset) # local time
+        end
+
+        if tz_override
+          local.strftime("%b %-d, %Y %-l:%M:%S%P")
+        else
+          local.strftime("%b %-d, %Y %H:%M:%S")
+        end
+      end
+    end
+
+    # Simple implementation of time_ago_in_words so we dont have to include ActionView::Helpers::DateHelper
+    def time_ago_in_words(from_time, to_time = Time.now)
+      distance_in_seconds = (to_time - from_time).to_i
+      case distance_in_seconds
+      when 0..59
+        "#{distance_in_seconds} #{"second".pluralize(distance_in_seconds)}"
+      when 60..3599
+        minutes = distance_in_seconds / 60
+        "#{minutes} #{"minute".pluralize(minutes)}"
+      when 3600..86_399
+        hours = distance_in_seconds / 3600
+        "#{hours} #{"hour".pluralize(hours)}"
+      when 86_400..604_799
+        days = distance_in_seconds / 86_400
+        "#{days} #{"day".pluralize(days)}"
+      else
+        from_time.strftime("%B %d, %Y")
+      end
+    end
+  end
+end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "6.0.0.beta1"
+  VERSION = "6.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta1
+  version: 6.0.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-20 00:00:00.000000000 Z
+date: 2024-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs
@@ -647,6 +647,7 @@ files:
 - lib/jets/cfn/iam/policy.rb
 - lib/jets/cfn/resource.rb
 - lib/jets/cfn/resource/associated.rb
+- lib/jets/cfn/resource/associated_outputs.rb
 - lib/jets/cfn/resource/codebuild/fleet.rb
 - lib/jets/cfn/resource/codebuild/iam_role.rb
 - lib/jets/cfn/resource/codebuild/project/base.rb
@@ -732,12 +733,15 @@ files:
 - lib/jets/cli/generate/templates/event_types/scheduled.rb.tt
 - lib/jets/cli/generate/templates/event_types/sns.rb.tt
 - lib/jets/cli/generate/templates/event_types/sqs.rb.tt
+- lib/jets/cli/git.rb
+- lib/jets/cli/git/push.rb
 - lib/jets/cli/group/actions.rb
 - lib/jets/cli/group/base.rb
 - lib/jets/cli/group/helpers.rb
 - lib/jets/cli/help.rb
 - lib/jets/cli/help/build.md
 - lib/jets/cli/help/call.md
+- lib/jets/cli/help/concurrency/info.md
 - lib/jets/cli/help/curl.md
 - lib/jets/cli/help/delete.md
 - lib/jets/cli/help/deploy.md
@@ -756,7 +760,6 @@ files:
 - lib/jets/cli/help/status.md
 - lib/jets/cli/help/url.md
 - lib/jets/cli/init.rb
-- lib/jets/cli/init/detect.rb
 - lib/jets/cli/init/templates/config/jets/bootstrap.rb.tt
 - lib/jets/cli/init/templates/config/jets/deploy.rb.tt
 - lib/jets/cli/init/templates/config/jets/project.rb.tt
@@ -850,6 +853,7 @@ files:
 - lib/jets/event/helpers/sqs_event.rb
 - lib/jets/event/s3.rb
 - lib/jets/exception_reporting.rb
+- lib/jets/framework.rb
 - lib/jets/git.rb
 - lib/jets/git/azure.rb
 - lib/jets/git/base.rb
@@ -918,6 +922,7 @@ files:
 - lib/jets/thor/version_check.rb
 - lib/jets/util/call_line.rb
 - lib/jets/util/camelize.rb
+- lib/jets/util/format_time.rb
 - lib/jets/util/git.rb
 - lib/jets/util/logging.rb
 - lib/jets/util/pretty.rb
@@ -981,11 +986,11 @@ 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.19
+rubygems_version: 3.5.10
 signing_key: 
 specification_version: 4
 summary: Serverless Deployment Service

data/lib/jets/cli/init/detect.rb

@@ -1,30 +0,0 @@
-class Jets::CLI::Init
-  class Detect
-    def framework
-      gems.each do |gem|
-        frameworks.each do |framework|
-          return framework if gem == framework
-        end
-      end
-      nil
-    end
-
-    def frameworks
-      %w[
-        rails
-        sinatra
-        hanami
-        grape
-      ]
-    end
-
-    def gems
-      return [] unless File.exist?("Gemfile")
-      Bundler.with_unbundled_env do
-        gemfile_content = File.read("Gemfile")
-        dsl = Bundler::Dsl.evaluate(Bundler.default_gemfile, gemfile_content, {})
-        dsl.dependencies.map(&:name)
-      end
-    end
-  end
-end