sensu-settings 3.3.0 → 3.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +4 -4
- data/lib/sensu/settings/loader.rb +4 -4
- data/sensu-settings.gemspec +3 -3
- metadata +6 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8724bfa38843c122d4c3f0b0b711eb58c75dfe3b
|
|
4
|
+
data.tar.gz: 4513614a55e3e89a05b601ae812ad7a3c2b7d12e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5a9a06c82bdce804a8a49e1d424670c31e32c5516ba5a8ddeaa80aa08c96c566a03aab8bd2bbc7c1b7765dc34583cccf8585326c3c753d5ef76b17e6001aba41
|
|
7
|
+
data.tar.gz: 26207cb67afa386675b265b0035e08c2560594e023ce5037cf6c9ee475823291086de66da9e9a12e0e97624fec04ddc57a77c47777e1c985e3cf588c8c6c92ef
|
data/.travis.yml
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
require "sensu/settings/validator"
|
|
2
|
-
require "
|
|
2
|
+
require "sensu/json"
|
|
3
3
|
require "tmpdir"
|
|
4
4
|
require "socket"
|
|
5
5
|
|
|
@@ -92,7 +92,7 @@ module Sensu
|
|
|
92
92
|
begin
|
|
93
93
|
warning("loading config file", :file => file)
|
|
94
94
|
contents = read_config_file(file)
|
|
95
|
-
config =
|
|
95
|
+
config = Sensu::JSON.load(contents)
|
|
96
96
|
merged = deep_merge(@settings, config)
|
|
97
97
|
unless @loaded_files.empty?
|
|
98
98
|
changes = deep_diff(@settings, merged)
|
|
@@ -104,7 +104,7 @@ module Sensu
|
|
|
104
104
|
@settings = merged
|
|
105
105
|
@indifferent_access = false
|
|
106
106
|
@loaded_files << file
|
|
107
|
-
rescue
|
|
107
|
+
rescue Sensu::JSON::ParseError => error
|
|
108
108
|
warning("config file must be valid json", {
|
|
109
109
|
:file => file,
|
|
110
110
|
:error => error.to_s
|
|
@@ -265,7 +265,7 @@ module Sensu
|
|
|
265
265
|
# ASCII, ignoring invalid characters. If there is a UTF-8 BOM,
|
|
266
266
|
# it will be removed. Some JSON parsers force ASCII but do not
|
|
267
267
|
# remove the UTF-8 BOM if present, causing encoding conversion
|
|
268
|
-
# errors. This method is for consistency across
|
|
268
|
+
# errors. This method is for consistency across Sensu::JSON
|
|
269
269
|
# adapters and system platforms.
|
|
270
270
|
#
|
|
271
271
|
# @param [String] file path to read.
|
data/sensu-settings.gemspec
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
Gem::Specification.new do |spec|
|
|
4
4
|
spec.name = "sensu-settings"
|
|
5
|
-
spec.version = "3.
|
|
5
|
+
spec.version = "3.4.0"
|
|
6
6
|
spec.authors = ["Sean Porter"]
|
|
7
7
|
spec.email = ["portertech@gmail.com"]
|
|
8
8
|
spec.summary = "The Sensu settings library, loader and validator"
|
|
@@ -15,10 +15,10 @@ Gem::Specification.new do |spec|
|
|
|
15
15
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
|
16
16
|
spec.require_paths = ["lib"]
|
|
17
17
|
|
|
18
|
-
spec.add_dependency "
|
|
18
|
+
spec.add_dependency "sensu-json", ">= 1.1.0"
|
|
19
19
|
|
|
20
20
|
spec.add_development_dependency "bundler", "~> 1.6"
|
|
21
21
|
spec.add_development_dependency "rake"
|
|
22
22
|
spec.add_development_dependency "rspec"
|
|
23
|
-
spec.add_development_dependency "codeclimate-test-reporter"
|
|
23
|
+
spec.add_development_dependency "codeclimate-test-reporter"
|
|
24
24
|
end
|
metadata
CHANGED
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sensu-settings
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.
|
|
4
|
+
version: 3.4.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean Porter
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-03-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
|
-
name:
|
|
14
|
+
name: sensu-json
|
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
|
16
16
|
requirements:
|
|
17
17
|
- - ">="
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version:
|
|
19
|
+
version: 1.1.0
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - ">="
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version:
|
|
26
|
+
version: 1.1.0
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: bundler
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -157,3 +157,4 @@ test_files:
|
|
|
157
157
|
- spec/rules_spec.rb
|
|
158
158
|
- spec/settings_spec.rb
|
|
159
159
|
- spec/validator_spec.rb
|
|
160
|
+
has_rdoc:
|