cfgstore 2.2.2 → 2.2.3

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of cfgstore might be problematic. Click here for more details.

Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/app-config.rb +7 -7
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 06f25d10d594c31dfea6cf201e022a36f447998812aa57643ec4b26fd7b70fbd
4
- data.tar.gz: 894794218e8e6c4317ef7681281240479d5a8a2311ed673035020b4b3a3e3784
3
+ metadata.gz: 694c3f8aefbf7e98f6c727d7629a292ef4b78999478cb7f3000e08e800580374
4
+ data.tar.gz: 3e347a9dc7620dffd9419eabd98f1de28eba29f8d11e9d7205282e044c18e401
5
5
  SHA512:
6
- metadata.gz: b10321ab9950640ec092fbb496b8c6f24bfd25f74659f4c4e9850754c94e8461c783d534a96cca87668df968144a49815f886b702074ecc742a2c89c41edb7af
7
- data.tar.gz: e91e710c2b1759dd1e70320ebac964d974dadf10dcd7695144c4070535fabd3ed6b17d8ea6558736edf98c321dfbb88273535bb854d1264fc2e1e70cae7bd9a1
6
+ metadata.gz: 54a4f23c7fc8f51e4e5c3eb6201c98d732b0ab4b963e23e5beeb5d56ae4104d60f517a311d39c0aee08aa8431a8e23789c77680f8f02f138757d22ecf04eb175
7
+ data.tar.gz: d4e5eb2fa0e05307aa22cf5b4fce526cacd2e92b77acabe97ab3a57a68cd2f97beb8252442e9949d26571dbf6dd4fde2695d3e9b0d0ea49c5612193ca22cad7f
@@ -21,12 +21,12 @@ module App
21
21
  def init( approot: nil, configdir: 'config', filename: 'cfg', env: ( ENV['APP_ENV'] || 'development' ) )
22
22
  raise NoMethodError.new('Config already defined.') if defined?( ::Cfg )
23
23
 
24
- root ||= Pathname( approot || Pathname( __FILE__ ).dirname ).expand_path.to_s
25
- env ||= env.to_sym.freeze
26
- loglevel ||= Kernel.const_get("Logger::#{ ENV['LOG_LEVEL'].upcase }") rescue ( env == :production ? Logger::WARN : Logger::DEBUG )
27
- config ||= SettingsHash.new
24
+ root = Pathname( approot || Pathname( __FILE__ ).dirname ).expand_path.to_s
25
+ env = env.to_sym.freeze
26
+ loglevel = Kernel.const_get("Logger::#{ ENV['LOG_LEVEL'].upcase }") rescue ( env == :production ? Logger::WARN : Logger::DEBUG )
27
+ config = SettingsHash.new
28
28
  # Все настройки приложения + роуты
29
- configfile = "#{ root }/#{ configdir }/#{ filename }.#{ env }.yml"
29
+ configfile = "#{ root }/#{ configdir }/#{ filename }.#{ env }.yml"
30
30
  amqp_routesfile = "#{ root }/#{ configdir }/amqp.#{ env }.yml"
31
31
  http_routesfile = "#{ root }/#{ configdir }/http.#{ env }.yml"
32
32
 
@@ -36,8 +36,8 @@ module App
36
36
  Kernel.const_set('Cfg', config)
37
37
  config.merge!( YAML.load_file( configfile ).symbolize_keys ) rescue nil
38
38
  $0 += "[ #{ config.app.id } ]" if config.app && config.app.id
39
- config.app.id ||= $0
40
- config.app.log ||= ENV['APP_LOG']
39
+ config[ :app ] ||= { id: $0 }
40
+ config.app[ :log ] ||= ENV['APP_LOG']
41
41
 
42
42
  config.merge!({
43
43
  root: root,
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cfgstore
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.2
4
+ version: 2.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - deemytch
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-25 00:00:00.000000000 Z
11
+ date: 2020-05-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: hashie