bbk-utils 1.0.1.72916 → 1.0.1.93642

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5957c10e7a4b4b4138cf0af29b2ed4ac640c922ca1408678fbecf2d4f49d999
-  data.tar.gz: dd4c42d1fede6d5a6e6f18d4d61179020c280a4ecaa70c609019440b593ca6a4
+  metadata.gz: b0cbd3ef94543f7d959795c36ac3da87c82ddb206b76caea9c9e346f6397eb47
+  data.tar.gz: d5e7333ad1c1d5cb3257ee72439dad699943def60f5ad6fcc293e705a32854d0
 SHA512:
-  metadata.gz: 143f480f6fbba94f66fa11d8a920a14fe6cafe6c056632cc770b6e5924b55c61bc3a31a4f706708147a971d79949a5a4804b5b1fed79aad23a31bc589c251ffe
-  data.tar.gz: 653f4dc3033c5aea12c7ecbb840b6f356b509983aafec50d6b79494698203654e4caca175a2b6a03e0b87ee54b740f7bb51d6a20523cb7b8ecb293c85c51c56e
+  metadata.gz: 59e943a64751d2128141a00ac0f9a7003ec7797dbdd8da0358f5bf6f19c20ee572a85c211d80633840cc23edef971cad0f6fbf471fdae5475b39d31b7f3fd9c9
+  data.tar.gz: 7f0c7a20f9308973b85ce992b1f4fd0f21f1bb66f0043a9eac0b2b84a125d49ca7d20b059c71e16889ca3426a249ab3c077e9eb98f424d6178a95edebae58d47

data/Gemfile.lock

@@ -1,19 +1,18 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.0.1.72916)
-      activesupport (~> 6.0)
+    bbk-utils (1.0.1.93642)
+      activesupport (>= 6.0)
       russian
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.4)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
@@ -49,7 +48,7 @@ GEM
     kwalify (0.7.2)
     launchy (2.5.0)
       addressable (~> 2.7)
-    minitest (5.15.0)
+    minitest (5.16.3)
     parallel (1.21.0)
     parser (3.0.3.1)
       ast (~> 2.4.1)
@@ -125,7 +124,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     thread_safe (0.3.6)
     tty-which (0.4.2)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     virtus (1.0.5)
@@ -133,7 +132,6 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby

data/lib/bbk/utils/env_helper.rb

@@ -17,6 +17,19 @@ module BBK
         env
       end
 
+      def self.prepare_jaeger_envs(env)
+        jaeger_uri = ::URI.parse(env['JAEGER_URL'] || '').tap do |uri|
+          uri.scheme = env.fetch('JAEGER_SENDER', uri.scheme) || 'udp'
+          uri.hostname = env.fetch('JAEGER_HOST', uri.host) || 'jaeger'
+          uri.port = env.fetch('JAEGER_PORT', uri.port) || 6831
+        end
+        env['JAEGER_URL'] = jaeger_uri.to_s
+        env['JAEGER_SENDER'] = jaeger_uri.scheme
+        env['JAEGER_HOST'] = jaeger_uri.host
+        env['JAEGER_PORT'] = jaeger_uri.port.to_s
+        env
+      end
+
       def self.build_uri_with_defaults(env)
         ::URI.parse(env['DATABASE_URL'] || '').tap do |uri|
           uri.scheme    = env.fetch('DATABASE_ADAPTER', uri.scheme) || 'postgresql'

data/lib/bbk/utils.rb

@@ -17,6 +17,24 @@ module BBK
 
       attr_accessor :logger
 
+      def gracefully_main
+        yield
+        0
+      rescue SignalException => e
+        if %w[INT TERM EXIT QUIT].include?(Signal.signame(e.signo))
+          0
+        else
+          logger.error "Signal: #{e.inspect}"
+          1
+        end
+      rescue StandardError => e
+        logger.error "Exception: #{e.inspect}. Backtrace: #{e.backtrace.inspect}"
+        1
+      rescue SystemExit => e
+        logger.error "System exit: #{e.inspect}. Backtrace: #{e.backtrace.inspect}"
+        e.status
+      end
+
     end
 
     self.logger = ::BBK::Utils::Logger.default

data/sig/bbk/env_helper.rbs

@@ -4,6 +4,7 @@ module BBK
 
       def self.prepare_database_envs: (Hash[String, untyped]|::_ENV env ) -> (Hash[String,untyped]|::_ENV)
       def self.prepare_mq_envs: (Hash[String, untyped]|::_ENV env) -> (Hash[String, untyped]|::_ENV)
+      def self.prepare_jaeger_envs: (Hash[String, untyped]|::_ENV env) -> (Hash[String, untyped]|::_ENV)
       def self.build_uri_with_defaults: (Hash[String, untyped]|::_ENV env) -> URI::Generic
       def self.apply_env_from_uri: (Hash[String, untyped]|::_ENV env, URI::Generic uri) -> void
       def self.build_mq_uri_with_defaults: (Hash[String, untyped]|::_ENV env) -> Array[URI::Generic]

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bbk-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.1.72916
+  version: 1.0.1.93642
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency