sensu-settings 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c86f090d9e6b164204356e7d7924f72163e6b6
-  data.tar.gz: d28b6cced806d5e0283697f5819dff25c227f85d
+  metadata.gz: 8724bfa38843c122d4c3f0b0b711eb58c75dfe3b
+  data.tar.gz: 4513614a55e3e89a05b601ae812ad7a3c2b7d12e
 SHA512:
-  metadata.gz: 0249f3b2e216d465ac811e883760ad3c055a6baeedf7c5ddd86632b2692b1550262e246d2d1ae06b976c375aaeb2379d898e7d37ce6b5100bf30708a552ce2da
-  data.tar.gz: b14a67f57e2184907f07e98f21081f66f3decbe90e3bbbf10a6c1e9f55cd4fff56871ced058409758733dbc23b5882a8deaeb82990ce0a2d52d2b310247c164e
+  metadata.gz: 5a9a06c82bdce804a8a49e1d424670c31e32c5516ba5a8ddeaa80aa08c96c566a03aab8bd2bbc7c1b7765dc34583cccf8585326c3c753d5ef76b17e6001aba41
+  data.tar.gz: 26207cb67afa386675b265b0035e08c2560594e023ce5037cf6c9ee475823291086de66da9e9a12e0e97624fec04ddc57a77c47777e1c985e3cf588c8c6c92ef

data/.travis.yml

@@ -1,12 +1,12 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby
+  - 2.2.0
+  - 2.2.3
+  - 2.3.0
+  - jruby-1.7.23
 notifications:
   irc:
     - "irc.freenode.net#sensu"

data/lib/sensu/settings/loader.rb

@@ -1,5 +1,5 @@
 require "sensu/settings/validator"
-require "multi_json"
+require "sensu/json"
 require "tmpdir"
 require "socket"
 
@@ -92,7 +92,7 @@ module Sensu
           begin
             warning("loading config file", :file => file)
             contents = read_config_file(file)
-            config = MultiJson.load(contents, :symbolize_keys => true)
+            config = Sensu::JSON.load(contents)
             merged = deep_merge(@settings, config)
             unless @loaded_files.empty?
               changes = deep_diff(@settings, merged)
@@ -104,7 +104,7 @@ module Sensu
             @settings = merged
             @indifferent_access = false
             @loaded_files << file
-          rescue MultiJson::ParseError => error
+          rescue Sensu::JSON::ParseError => error
             warning("config file must be valid json", {
               :file => file,
               :error => error.to_s
@@ -265,7 +265,7 @@ module Sensu
       # ASCII, ignoring invalid characters. If there is a UTF-8 BOM,
       # it will be removed. Some JSON parsers force ASCII but do not
       # remove the UTF-8 BOM if present, causing encoding conversion
-      # errors. This method is for consistency across MultiJson
+      # errors. This method is for consistency across Sensu::JSON
       # adapters and system platforms.
       #
       # @param [String] file path to read.

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "3.3.0"
+  spec.version       = "3.4.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"
@@ -15,10 +15,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "multi_json"
+  spec.add_dependency "sensu-json", ">= 1.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "codeclimate-test-reporter" unless RUBY_VERSION < "1.9"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: sensu-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -157,3 +157,4 @@ test_files:
 - spec/rules_spec.rb
 - spec/settings_spec.rb
 - spec/validator_spec.rb
+has_rdoc: