sensu-settings 3.4.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8724bfa38843c122d4c3f0b0b711eb58c75dfe3b
-  data.tar.gz: 4513614a55e3e89a05b601ae812ad7a3c2b7d12e
+  metadata.gz: 25d64e131590e9ad8c0422ffac256c7d58b96534
+  data.tar.gz: f8e4095b4f3697d0684387bc8d5d25d2f92451cf
 SHA512:
-  metadata.gz: 5a9a06c82bdce804a8a49e1d424670c31e32c5516ba5a8ddeaa80aa08c96c566a03aab8bd2bbc7c1b7765dc34583cccf8585326c3c753d5ef76b17e6001aba41
-  data.tar.gz: 26207cb67afa386675b265b0035e08c2560594e023ce5037cf6c9ee475823291086de66da9e9a12e0e97624fec04ddc57a77c47777e1c985e3cf588c8c6c92ef
+  metadata.gz: b0c560de6157c8454bc3b640460fe8edf408c1b188f416d99784e1f0b013713bb6527b76cc17edd4448c9e05d311a928b7ac21e9e51c572a5b834b3d9b0e3c81
+  data.tar.gz: 180058d0339579b553fd5ae8aa9d4ff82cfc49106afaf7ebd01c571fc69ff6a321ab206adc38ad07f2231ecd5785c919ccad6f0becab9d99c4c5d976c3156fc0

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - 2.2.0
   - 2.2.3
   - 2.3.0
-  - jruby-1.7.23
+  - jruby-9.0.5.0
 notifications:
   irc:
     - "irc.freenode.net#sensu"

data/README.md

@@ -2,9 +2,6 @@
 
 [![Build Status](https://travis-ci.org/sensu/sensu-settings.svg?branch=master)](https://travis-ci.org/sensu/sensu-settings)
 
-[![Code Climate](https://codeclimate.com/github/sensu/sensu-settings.png)](https://codeclimate.com/github/sensu/sensu-settings)
-[![Code Climate Coverage](https://codeclimate.com/github/sensu/sensu-settings/coverage.png)](https://codeclimate.com/github/sensu/sensu-settings)
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/sensu/settings.rb

@@ -24,7 +24,11 @@ module Sensu
             @loader.load_directory(directory)
           end
         end
-        @loader.set_env!
+        if @loader.validate.empty?
+          @loader.set_env!
+        end
+        @loader
+      rescue Loader::Error
         @loader
       end
 

data/lib/sensu/settings/loader.rb

@@ -6,16 +6,23 @@ require "socket"
 module Sensu
   module Settings
     class Loader
+      class Error < RuntimeError; end
+
       # @!attribute [r] warnings
       #   @return [Array] loader warnings.
       attr_reader :warnings
 
+      # @!attribute [r] errors
+      #   @return [Array] loader errors.
+      attr_reader :errors
+
       # @!attribute [r] loaded_files
       #   @return [Array] loaded config files.
       attr_reader :loaded_files
 
       def initialize
         @warnings = []
+        @errors = []
         @settings = default_settings
         @indifferent_access = false
         @loaded_files = []
@@ -105,15 +112,13 @@ module Sensu
             @indifferent_access = false
             @loaded_files << file
           rescue Sensu::JSON::ParseError => error
-            warning("config file must be valid json", {
+            load_error("config file must be valid json", {
               :file => file,
               :error => error.to_s
             })
-            warning("ignoring config file", :file => file)
           end
         else
-          warning("config file does not exist or is not readable", :file => file)
-          warning("ignoring config file", :file => file)
+          load_error("config file does not exist or is not readable", :file => file)
         end
       end
 
@@ -145,7 +150,7 @@ module Sensu
       # @return [Array] validation failures.
       def validate
         validator = Validator.new
-        validator.run(@settings, sensu_service_name)
+        @errors += validator.run(@settings, sensu_service_name)
       end
 
       private
@@ -367,6 +372,17 @@ module Sensu
           :message => message
         }.merge(data)
       end
+
+      # Record a load error and raise a load error exception.
+      #
+      # @param message [String] load error message.
+      # @param data [Hash] load error context.
+      def load_error(message, data={})
+        @errors << {
+          :message => message
+        }.merge(data)
+        raise(Error, message)
+      end
     end
   end
 end

data/sensu-settings.gemspec

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

data/spec/assets/alternative/conf.d/loop

@@ -0,0 +1 @@
+../conf.d

data/spec/assets/conf.d/alternative

@@ -0,0 +1 @@
+../alternative/conf.d/

data/spec/loader_spec.rb

@@ -106,26 +106,21 @@ describe "Sensu::Settings::Loader" do
   end
 
   it "can attempt to load settings from a nonexistent file" do
-    @loader.load_file("/tmp/bananaphone")
-    warnings = @loader.warnings
-    expect(warnings.size).to eq(2)
-    messages = warnings.map do |warning|
-      warning[:message]
-    end
-    expect(messages).to include("config file does not exist or is not readable")
-    expect(messages).to include("ignoring config file")
+    expect {
+      @loader.load_file("/tmp/bananaphone")
+    }.to raise_error(Sensu::Settings::Loader::Error)
+    expect(@loader.errors.length).to eq(1)
+    error = @loader.errors.first
+    expect(error[:message]).to include("config file does not exist or is not readable")
   end
 
   it "can attempt to load settings from a file with invalid JSON" do
-    @loader.load_file(File.join(@assets_dir, "invalid.json"))
-    warnings = @loader.warnings
-    expect(warnings.size).to eq(3)
-    messages = warnings.map do |warning|
-      warning[:message]
-    end
-    expect(messages).to include("loading config file")
-    expect(messages).to include("config file must be valid json")
-    expect(messages).to include("ignoring config file")
+    expect {
+      @loader.load_file(File.join(@assets_dir, "invalid.json"))
+    }.to raise_error(Sensu::Settings::Loader::Error)
+    expect(@loader.errors.length).to eq(1)
+    error = @loader.errors.first
+    expect(error[:message]).to include("config file must be valid json")
   end
 
   it "can load settings from a utf-8 encoded file with a bom" do

data/spec/settings_spec.rb

@@ -49,4 +49,11 @@ describe "Sensu::Settings" do
     expect(settings[:checks][:merger][:command]).to eq("echo -n merger")
     expect(settings[:checks][:app_http_endpoint][:command]).to eq("check-http.rb -u https://localhost/ping -q pong")
   end
+
+  it "can catch load errors" do
+    settings = Sensu::Settings.load(:config_file => "/tmp/bananaphone")
+    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")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json
@@ -108,9 +108,11 @@ files:
 - lib/sensu/settings/validators/subdue.rb
 - lib/sensu/settings/validators/transport.rb
 - sensu-settings.gemspec
+- spec/assets/alternative/conf.d/loop
 - spec/assets/alternative/conf.d/symlinked.json
 - spec/assets/app/config/sensu/app_http_endpoint.json
 - spec/assets/bom.json
+- spec/assets/conf.d/alternative
 - spec/assets/conf.d/merger.json
 - spec/assets/conf.d/nested/file.json
 - spec/assets/config.json
@@ -140,14 +142,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: The Sensu settings library, loader and validator
 test_files:
+- spec/assets/alternative/conf.d/loop
 - spec/assets/alternative/conf.d/symlinked.json
 - spec/assets/app/config/sensu/app_http_endpoint.json
 - spec/assets/bom.json
+- spec/assets/conf.d/alternative
 - spec/assets/conf.d/merger.json
 - spec/assets/conf.d/nested/file.json
 - spec/assets/config.json
@@ -157,4 +161,3 @@ test_files:
 - spec/rules_spec.rb
 - spec/settings_spec.rb
 - spec/validator_spec.rb
-has_rdoc: