appydays 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664f5e1c23eb4359cdbc71c7f9e9b62648764ef727b35110fb450e2418cc181f
-  data.tar.gz: 6f74c5970b4f8932e879ff342d63c19f92bbe606c51af846fab1497b8acf936e
+  metadata.gz: 191701f151a4b25333ee5f6cc1262e70c4d62dc063350bbebd4d00798cb2128e
+  data.tar.gz: 05d188d89e2db3047837f59784773284aa194f9435c2d6f83a8d8bc84b7c06d3
 SHA512:
-  metadata.gz: abc2c53d7ec2b119cbc80f71b253968cb3767197019fef2d0f71e3377d917efd24685d4f06a66df22ec6c444c03b7db46cf1196d1c4fa6b4ae12598530772ecf
-  data.tar.gz: af84d1800825fe54cd8d9182c2d15139a86da3e14040db1ac71b79de386df3f60e662aa04a93c36f5aa6e46124a44b372af1871a50e4668e19d699015e45c23f
+  metadata.gz: dd5f3a2c5ebfc6d172992e98ed34d6eb33a581b5ef3c55cb0744491cdb22274c9e519af561aba1014dedd68606be9b714e8c7bf5aa9d6deb4b849cbd7115ec1c
+  data.tar.gz: fd5c9afa41fa2d9ededce48760d147339029c29c21e9679e3d58cbf43f544419a95201634c8626413718da52eac91262fead6515361e2fd7017901e355ed5171

data/lib/appydays/dotenviable.rb

@@ -24,6 +24,13 @@ require "appydays/version"
 # it won't get used, because .env files don't stomp what is already in the environment
 # (we don't want to use `overload`).
 # So we have some trickery to overwrite only PORT.
+#
+# @param rack_env [nil,String] Value like 'development' or 'production' to use to load .env files.
+#   If not given, use +env['RACK_ENV']+ or +default_rack_env+.
+# @param default_rack_env [String] If +env['RACK_ENV']+ is not set, use this value.
+# @param env [Hash] Hash to read and mutate.
+#   Pass in a different hash to load environment variables into it instead of ENV.
+#   Useful for testing, or to get the config for another environment.
 module Appydays::Dotenviable
   def self.load(rack_env: nil, default_rack_env: "development", env: ENV)
     original_port = env.delete("PORT")
@@ -33,7 +40,17 @@ module Appydays::Dotenviable
       ".env.#{rack_env}",
       ".env",
     ]
+    orig_env = nil
+    if env.object_id != ENV.object_id
+      orig_env = ENV.to_h
+      ENV.replace(env)
+    end
     Dotenv.load(*paths)
+    if orig_env
+      env.merge!(ENV)
+      ENV.replace(orig_env)
+    end
+
     env["PORT"] ||= original_port
     env["RACK_ENV"] ||= rack_env
   end

data/lib/appydays/loggable.rb

@@ -72,8 +72,17 @@ module Appydays::Loggable
     SemanticLogger.add_appender(io: $stdout, formatter: format.to_sym)
   end
 
-  def self.with_log_tags(tags, &block)
-    return SemanticLogger.named_tagged(tags, &block)
+  def self.with_log_tags(tags)
+    if defined?(Sentry)
+      Sentry.configure_scope do |scope|
+        scope.set_extras(tags)
+      end
+    end
+    blockresult = nil
+    SemanticLogger.named_tagged(tags) do
+      blockresult = yield
+    end
+    return blockresult
   end
 
   @stderr_appended = false

data/lib/appydays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appydays
-  VERSION = "0.7.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appydays
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Lithic Tech
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -237,8 +237,8 @@ dependencies:
 description: 'appydays provides support for env-based configuration, and common structured
   logging capabilities
 
-'
-email: 
+  '
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -259,7 +259,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,8 +274,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Provides support for env-based configuration, and common structured logging
   capabilities