jets 5.0.11 → 5.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0f81036f4a6561d9a79f029ca1362a8f48ad234b5318d97126b4530aee2ea27
-  data.tar.gz: 1051b3344523c20ed370a2602b65de25c71d1bce50a5c7cb67ef9dcbcd97e190
+  metadata.gz: e7a09da0f4d38d90cbf007185c92a6ac45382d21caa6da587bf5e8109f353ea9
+  data.tar.gz: 37ee931ef499eb48cb2f0f69884c799294b82ef0e16ecbe4222f9f6d76966acd
 SHA512:
-  metadata.gz: f47b839cb9d3138c110d825a3936f0b823b7317e9f6559de1b199f64bad9820bd7716d04576f16ee27242a82e3090877967a6bc540dbe611afdd065e44deb8ff
-  data.tar.gz: a3bca9d28b17ce9a133b1a35bb01154e35601233ce9630172c5be15fe063e341df8af12d6a534628f8c022ac93093276bb879921e8b69d39b9dcc167cc34195b
+  metadata.gz: 81148dc32dd42d5a1b0bdcbe1fd32350dde3370b53a1f7035d77f5dc08b2c991fc4913009c6792165b6d39199a2474d872dd124cbc71c27be10cbb454587b4f3
+  data.tar.gz: '09f4fe05d4104875d76148f12c76b85ba02cc65b5fd25f1801c628b62dd55d072362e1636922a9545513fd7c86eebc4afc6a9629c7d72b3ca244ce4ca948907e'

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.12] - 2024-04-15
+- [#718](https://github.com/rubyonjets/jets/pull/718) fixes for dotenv 3.1
+
 ## [5.0.11] - 2024-03-20
 - [#711](https://github.com/rubyonjets/jets/pull/711) Fix controller testing in jets 5 - handling of params and query
 - [#715](https://github.com/rubyonjets/jets/pull/715) remove force_encoding that causes issues for international characters

data/jets.gemspec

@@ -1,30 +1,28 @@
-# coding: utf-8
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "jets/version"
 require "jets/rdoc"
 
 Gem::Specification.new do |spec|
-  spec.name          = "jets"
-  spec.version       = Jets::VERSION
-  spec.author        = "Tung Nguyen"
-  spec.email         = "tongueroo@gmail.com"
-  spec.summary       = "Ruby Serverless Framework"
-  spec.description   = "Jets is a framework that allows you to create serverless applications with a beautiful language: Ruby. It includes everything required to build and deploy an application.  Jets leverages the power of Ruby to make serverless joyful for everyone."
-  spec.homepage      = "https://rubyonjets.com"
-  spec.license       = "MIT"
+  spec.name = "jets"
+  spec.version = Jets::VERSION
+  spec.author = "Tung Nguyen"
+  spec.email = "tongueroo@gmail.com"
+  spec.summary = "Ruby Serverless Framework"
+  spec.description = "Jets is a framework that allows you to create serverless applications with a beautiful language: Ruby. It includes everything required to build and deploy an application.  Jets leverages the power of Ruby to make serverless joyful for everyone."
+  spec.homepage = "https://rubyonjets.com"
+  spec.license = "MIT"
 
-  spec.required_ruby_version = ['>= 2.7.0']
+  spec.required_ruby_version = [">= 2.7.0"]
   spec.rdoc_options += Jets::Rdoc.options
 
-  vendor_files       = Dir.glob("vendor/**/*")
-  gem_files          = `git -C "#{File.dirname(__FILE__)}" ls-files -z`.split("\x0").reject do |f|
+  vendor_files = Dir.glob("vendor/**/*")
+  gem_files = `git -C "#{File.dirname(__FILE__)}" ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features|docs)/})
   end
-  spec.files         = gem_files + vendor_files
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = gem_files + vendor_files
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "actionmailer", "~> 7.0.8"
@@ -50,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cfn_response"
   spec.add_dependency "cfn-status", ">= 0.5.0"
   spec.add_dependency "cli-format", ">= 0.4.0"
-  spec.add_dependency "dotenv"
+  spec.add_dependency "dotenv", ">= 3.1"
   spec.add_dependency "dsl_evaluator", ">= 0.3.0" # for DslEvaluator.print_code
   spec.add_dependency "gems"
   spec.add_dependency "hashie"

data/lib/jets/dotenv.rb

@@ -1,23 +1,29 @@
-require 'dotenv'
+require "dotenv"
 
 class Jets::Dotenv
-  def self.load!(remote=false)
+  def self.load!(remote = false)
     new(remote).load!
   end
 
-  def initialize(remote=false)
-    @remote = ENV['JETS_ENV_REMOTE'] || remote
+  def initialize(remote = false)
+    @remote = ENV["JETS_ENV_REMOTE"] || remote
   end
 
+  # @@vars cache to prevent multiple calls to Ssm
+  # Tricky note: The cache also prevents the second call to Dotenv.load from
+  # returning {} vars. Dotenv 3.0 will not return the vars if it has already been loaded
+  # in the ENV. We want this side-effect due to the new way Dotenv 3.0 works.
+  @@vars = nil
   def load!
+    return @@vars if @@vars
     return if on_aws? # this prevents ssm calls if used in dotenv files
     vars = ::Dotenv.load(*dotenv_files)
-    Ssm.new(vars).interpolate!
+    @@vars = Ssm.new(vars).interpolate!
   end
 
   def on_aws?
-    return true if ENV['ON_AWS']
-    !!ENV['_HANDLER'] # https://docs.aws.amazon.com/lambda/latest/dg/lambda-environment-variables.html
+    return true if ENV["ON_AWS"]
+    !!ENV["_HANDLER"] # https://docs.aws.amazon.com/lambda/latest/dg/lambda-environment-variables.html
   end
 
   # dotenv files with the following precedence:
@@ -30,17 +36,16 @@ class Jets::Dotenv
   # - .env - The original (lowest)
   #
   def dotenv_files
-    files = [
-      root.join(".env"),
-      (root.join(".env.local") unless (Jets.env.test? || @remote)),
-      root.join(".env.#{Jets.env}"),
-      (root.join(".env.#{Jets.env}.local") unless @remote),
-    ]
+    files = []
+
+    files << files << root.join(".env.#{Jets.env}.#{Jets.extra}") if Jets.extra
     files << root.join(".env.#{Jets.env}.remote") if @remote
-    if Jets.extra
-      files << root.join(".env.#{Jets.env}.#{Jets.extra}")
-    end
-    files.compact
+    files << root.join(".env.#{Jets.env}.local") unless @remote
+    files << root.join(".env.#{Jets.env}")
+    files << root.join(".env.local") unless Jets.env.test? || @remote
+    files << root.join(".env")
+
+    files.compact.map(&:to_s)
   end
 
   def root

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "5.0.11"
+  VERSION = "5.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 5.0.11
+  version: 5.0.12
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: dsl_evaluator
   requirement: !ruby/object:Gem::Requirement