sensu-settings 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b105b89c40f34934a546ccf394ae680e3c576ecb
-  data.tar.gz: 7761ac36a88894957b99509e3db28285dbe70d27
+  metadata.gz: d8924c88d3f2c09c838a8d63483dc5c5b43e4dfb
+  data.tar.gz: 6602361eb730baa005e103d0f916dc73c387febc
 SHA512:
-  metadata.gz: 11439eb54a3e92cc7cbc6c38afad9daec1027c6df2738e0709e3ef4ad0da9097bfc55bfc47927eebe9d399569f26e2b14231209900c167083aca1abe1333a189
-  data.tar.gz: 6c2b3dd3773e45e87ad0669cf216a0cd5e5953dd339a71abe11d815e5f770860908ddb09b04f771ac3239db3b9e7f291f1bb0f89cee91848fdf36c3234bb4022
+  metadata.gz: 51c1f51bd223da49a9cf4221ae0504758841572628359d491dba61e5a091a77fbe51957f2aca71a4deb4a00c612982c485075a110239e6ecf5d8ebcd41166bc7
+  data.tar.gz: 343e7d524dc24d974007ee1bf190048084ab0005ed23ec1574bf801d31dc29f50083b62490f49991c80a0820c1ac54d2d68707278bbebd2ffefc17364032195e

data/lib/sensu/settings.rb

@@ -14,7 +14,7 @@ module Sensu
         @loader = Loader.new
         @loader.load_env
         if options[:config_file]
-          @loader.load_file(options[:config_file])
+          @loader.load_file(options[:config_file], false)
         end
         if options[:config_dir]
           @loader.load_directory(options[:config_dir])

data/lib/sensu/settings/loader.rb

@@ -99,7 +99,9 @@ module Sensu
       # Load settings from a JSON file.
       #
       # @param [String] file path.
-      def load_file(file)
+      # @param must_exist [TrueClass, FalseClass] if the file must
+      #   exist and is readable.
+      def load_file(file, must_exist=true)
         if File.file?(file) && File.readable?(file)
           begin
             warning("loading config file", :file => file)
@@ -122,8 +124,11 @@ module Sensu
               :error => error.to_s
             })
           end
-        else
+        elsif must_exist
           load_error("config file does not exist or is not readable", :file => file)
+        else
+          warning("config file does not exist or is not readable", :file => file)
+          warning("ignoring config file", :file => file)
         end
       end
 

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "5.1.0"
+  spec.version       = "5.2.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"

data/spec/loader_spec.rb

@@ -114,6 +114,14 @@ describe "Sensu::Settings::Loader" do
     expect(error[:message]).to include("config file does not exist or is not readable")
   end
 
+  it "can attempt to load settings from a nonexistent file and ignore it" do
+    @loader.load_file("/tmp/bananaphone", false)
+    expect(@loader.errors.length).to eq(0)
+    expect(@loader.warnings.length).to eq(2)
+    warning = @loader.warnings.last
+    expect(warning[:message]).to include("ignoring config file")
+  end
+
   it "can attempt to load settings from a file with invalid JSON" do
     expect {
       @loader.load_file(File.join(@assets_dir, "invalid.json"))

data/spec/settings_spec.rb

@@ -51,9 +51,17 @@ describe "Sensu::Settings" do
   end
 
   it "can catch load errors" do
-    settings = Sensu::Settings.load(:config_file => "/tmp/bananaphone")
+    settings = Sensu::Settings.load(:config_file => File.join(@assets_dir, "invalid.json"))
     expect(settings.errors.length).to eq(1)
     error = settings.errors.first
-    expect(error[:message]).to include("config file does not exist or is not readable")
+    expect(error[:message]).to include("config file must be valid json")
+  end
+
+  it "can handle a nonexistent config.json" do
+    settings = Sensu::Settings.load(:config_file => "/tmp/bananaphone")
+    expect(settings.errors.length).to eq(0)
+    expect(settings.warnings.length).to eq(2)
+    warning = settings.warnings.last
+    expect(warning[:message]).to include("ignoring config file")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json