takelage 0.16.0 → 0.17.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c9896e54bf6d9a27b749947fae7a56376e4059008c2f1dfd0629e1deff0e62e5
4
- data.tar.gz: ab905f968d34dd7828840534c9234428dcafed5a6a950697108d60c15009de33
3
+ metadata.gz: d7143b5ce147127b3a0cf4ebf69dcb673e0e031fd163c3992fa602a5d03293b3
4
+ data.tar.gz: 545368ec9301049e782727636a3fd281c332d190990337b989ea652a1b8e58ec
5
5
  SHA512:
6
- metadata.gz: 9ed5d9ea6a7ed25a6e81ae0a12d83899921878481df76bb0a4773c5eee71bc065a560e84e512fb1eaf55d8c2442901e899d93aa6d998e605ec4d5cd40c0d1c53
7
- data.tar.gz: 64fbfa02f1e430c621b877c9e66ab4bdf43f12b41a7003895c58d881bd0d6f38e06312eaf9ea6f723552abd1a98a29525d77d67c83a5b4526723687767aa3c75
6
+ metadata.gz: eaad0481173e35a0146e02c69929938331d23527e1c1fb809d8df214b51f8d319e272d7ae2efda2017bd113e4bc6b15ea73b89aac48523b04fc8456e2ef25634
7
+ data.tar.gz: d35e4e3fa76dd58740f719e5ac7aad48ae27d1094becfbffefffdc6188fa1ab141c0d5a0392e3a58dcafa190d5e65063e1d160756a9f696e2cd8b70bb2065bd8
@@ -38,16 +38,33 @@ module ConfigModule
38
38
  def configured?(config_keys)
39
39
  @configured = true
40
40
  config_keys.each do |config_key|
41
- unless TakelageConfig.instance.active.key? config_key
42
- log.error "Please configure \"#{config_key}\""
43
- @configured = false
44
- end
41
+ next unless _check_key_defined? config_key
42
+ next unless _check_key_set? config_key
45
43
  end
46
44
  @configured
47
45
  end
48
46
 
49
47
  private
50
48
 
49
+ # Check if config key is defined.
50
+ def _check_key_defined?(config_key)
51
+ return true if TakelageConfig.instance.active.key? config_key
52
+
53
+ log.error "Undefined config key. Please configure \"#{config_key}\""
54
+ @configured = false
55
+ false
56
+ end
57
+
58
+ # Check if config key is nil or empty
59
+ def _check_key_set?(config_key)
60
+ takel_config_key = TakelageConfig.instance.active[config_key]
61
+ return true unless takel_config_key.nil? || takel_config_key.empty?
62
+
63
+ log.error "Unset config key. Please configure \"#{config_key}\""
64
+ @configured = false
65
+ false
66
+ end
67
+
51
68
  # Read default config file in lib.
52
69
  def _config_read_default
53
70
  default_file = File.expand_path("#{File.dirname(__FILE__)}/../default.yml")
@@ -1 +1 @@
1
- 0.16.0
1
+ 0.17.0
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: takelage
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.0
4
+ version: 0.17.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Geospin