cfgstore 2.2.2 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f25d10d594c31dfea6cf201e022a36f447998812aa57643ec4b26fd7b70fbd
-  data.tar.gz: 894794218e8e6c4317ef7681281240479d5a8a2311ed673035020b4b3a3e3784
+  metadata.gz: c797f16240a8dc25a6ea0aea48c7c4a40125f1de221d121ef9cb00b4a485ed9c
+  data.tar.gz: fe0b79cc30fd18cb8db96eb7386e303362b47806e84f295bc9923205f4f5206b
 SHA512:
-  metadata.gz: b10321ab9950640ec092fbb496b8c6f24bfd25f74659f4c4e9850754c94e8461c783d534a96cca87668df968144a49815f886b702074ecc742a2c89c41edb7af
-  data.tar.gz: e91e710c2b1759dd1e70320ebac964d974dadf10dcd7695144c4070535fabd3ed6b17d8ea6558736edf98c321dfbb88273535bb854d1264fc2e1e70cae7bd9a1
+  metadata.gz: 6099f710167e47a398786bd343b3279a046e3b686a224c182735179844b815ac319a8d6434da6094cb5b6e93b5d3c45f5bc777b79cd96aa286a716c2fd5002da
+  data.tar.gz: fe98b93f2379c5f180455358bff9f00a0e095379335cb9e208379c9c9b8019c11264f21c611a0fbb09aaa3a6edb17d7e41d1617474b49656a4b1a9e2a8fcc35c

data/lib/app-config.rb

@@ -2,12 +2,10 @@ require 'yaml'
 require 'singleton'
 require 'pathname'
 require 'monkey-hash'
-require_relative 'settings-hash'
 
 module App
 
   ##
-  # Удобный прокси к SettingsHash
   # СДЕЛАТЬ: автоперезагрузку при изменении файла.
 
   module Config
@@ -20,34 +18,45 @@ module App
     module_function
     def init( approot: nil, configdir: 'config', filename: 'cfg', env: ( ENV['APP_ENV'] || 'development' ) )
       raise NoMethodError.new('Config already defined.') if defined?( ::Cfg )
-
-      root     ||= Pathname( approot || Pathname( __FILE__ ).dirname ).expand_path.to_s
-      env      ||= env.to_sym.freeze
-      loglevel ||= Kernel.const_get("Logger::#{ ENV['LOG_LEVEL'].upcase }") rescue ( env == :production ? Logger::WARN : Logger::DEBUG )
-      config   ||= SettingsHash.new
+      root            = Pathname( approot || Pathname( __FILE__ ).dirname ).expand_path.to_s
+      env             = env.to_sym.freeze
+      config          = {}
       # Все настройки приложения + роуты
-      configfile = "#{ root }/#{ configdir }/#{ filename }.#{ env }.yml"
+      configfile      = "#{ root }/#{ configdir }/#{ filename }.#{ env }.yml"
       amqp_routesfile = "#{ root }/#{ configdir }/amqp.#{ env }.yml"
       http_routesfile = "#{ root }/#{ configdir }/http.#{ env }.yml"
 
       # raise ArgumentError.new("Не найден #{ configfile }!") unless File.exist?( configfile )
       # raise ArgumentError.new("Не найден #{ amqp_routesfile }!") unless File.exist?( amqp_routesfile )
-      # Кто первый встал, того и тапки.      
+      # Кто первый встал, того и тапки.
       Kernel.const_set('Cfg', config)
-      config.merge!( YAML.load_file( configfile ).symbolize_keys ) rescue nil
-      $0 += "[ #{ config.app.id } ]" if config.app && config.app.id
-      config.app.id  ||= $0
-      config.app.log ||= ENV['APP_LOG']
+      config.merge!( YAML.load_file( configfile ).keys_to_symbols ) rescue nil
+      $0 += "[ #{ config.app.id } ]" if config.app? && config.app.id?
+      config[ :app ]     ||= { id: $0 }
+      config.app[ :log ] ||= ENV['APP_LOG']
 
       config.merge!({
         root: root,
         env:  env,
-        loglevel: loglevel,
-        amqproutes: File.exist?( amqp_routesfile ) ? YAML.load_file( amqp_routesfile ).symbolize_keys : {},
-        httproutes: File.exist?( http_routesfile ) ? YAML.load_file( http_routesfile ).symbolize_keys : {}
+        configdir: "#{ root }/#{ configdir }",
+        amqproutes: File.exist?( amqp_routesfile ) ? YAML.load_file( amqp_routesfile ).keys_to_symbols : {},
+        httproutes: File.exist?( http_routesfile ) ? YAML.load_file( http_routesfile ).keys_to_symbols : {}
       })
+
+      config[:loglevel] =
+        begin
+          Kernel.const_get("Logger::#{
+              ( ENV['LOG_LEVEL'] || config.app.loglevel || ( env == :production ? :WARN : :DEBUG ) ).to_s.upcase
+          }")
+        rescue
+          Logger::DEBUG
+        end
       config
     end
 
+    def remove
+      Kernel.send( :remove_const, 'Cfg' ) if defined?( Cfg )
+    end
+
   end
 end

data/lib/app-logger.rb

@@ -65,6 +65,12 @@ module App
       Log.info{"#{ Cfg.env } started. thread #{ Thread.current.object_id }."}
       self
     end
+
+    def remove
+      Kernel.send( :remove_const, 'Log' ) if defined?( Log )
+      Kernel.send( :remove_const, 'Log' ) if defined?( MQLog )
+    end
+    
   end
 
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cfgstore
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.8
 platform: ruby
 authors:
 - deemytch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: monkey-hash
   requirement: !ruby/object:Gem::Requirement
@@ -47,12 +33,11 @@ extra_rdoc_files: []
 files:
 - lib/app-config.rb
 - lib/app-logger.rb
-- lib/settings-hash.rb
-homepage: 
+homepage:
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,8 +52,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Loads and serves configs.
 test_files: []

data/lib/settings-hash.rb

@@ -1,4 +0,0 @@
-require 'hashie'
-
-class SettingsHash < ::Hashie::Mash
-end