sensu-settings 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 574e3cda48e7886857ddee4f8dd6b299304726cb
-  data.tar.gz: 6cb9b7a031ae185dda7ffc341d80ef6e5497ebd9
+  metadata.gz: 48ba35c4667643728d564b4a6f1b896c7309cca4
+  data.tar.gz: b3df632e4ebfde1123b2b9c606304cabff06ea8f
 SHA512:
-  metadata.gz: 7e5136184244c730101a4bb0dd859f4471c3cbe36761e17b0d0b5abba694b0a4c8dde879dd5ca15cea2d262d74eee0544c23bb595da3cf304a1b9456ce2cd263
-  data.tar.gz: ab0ee858e81fa3f116b3693a2dc2d616f1463df69a0633ce3c6317fad969584a39e3704a3ac49b32607d5435b398f804f77907c22e8ac38657014c9d1b01dbd6
+  metadata.gz: 5089acb63a77f61dede53af687a9ae5f9c2d01def001617c0dc360626192183a102c5d3881e28681d21022ae0c7879d41815233c3a1edf9bb18f0a75cbd99579
+  data.tar.gz: 3ef86a3100eddda1ff08aa3dd1e8a8103501ba93677a7bc162f7a1f70db2912867d2d01ff5edda9b59f99a76092ee7ccddcc35ecdab47ad0bfc10a6a75ebd4a6

data/lib/sensu/settings/loader.rb

@@ -1,5 +1,3 @@
-gem "multi_json", "1.10.0"
-
 require "sensu/settings/validator"
 require "multi_json"
 
@@ -16,7 +14,10 @@ module Sensu
 
       def initialize
         @warnings = []
-        @settings = Hash[CATEGORIES.map {|category| [category, {}]}]
+        @settings = {}
+        CATEGORIES.each do |category|
+          @settings[category] = {}
+        end
         @indifferent_access = false
         @loaded_files = []
         self.class.create_category_methods
@@ -46,8 +47,8 @@ module Sensu
         @settings
       end
 
-      # Retrieve the value object corresponding to a key, acting like
-      # a Hash object.
+      # Retrieve the setting object corresponding to a key, acting
+      # like a Hash object.
       #
       # @param key [String, Symbol]
       # @return [Object] value for key.
@@ -60,18 +61,18 @@ module Sensu
       def load_env
         if ENV["RABBITMQ_URL"]
           @settings[:rabbitmq] = ENV["RABBITMQ_URL"]
-          warning(@settings[:rabbitmq], "using rabbitmq url environment variable")
+          warning("using rabbitmq url environment variable", :rabbitmq => @settings[:rabbitmq])
         end
         ENV["REDIS_URL"] ||= ENV["REDISTOGO_URL"]
         if ENV["REDIS_URL"]
           @settings[:redis] = ENV["REDIS_URL"]
-          warning(@settings[:redis], "using redis url environment variable")
+          warning("using redis url environment variable", :redis => @settings[:redis])
         end
         ENV["API_PORT"] ||= ENV["PORT"]
         if ENV["API_PORT"]
           @settings[:api] ||= {}
           @settings[:api][:port] = ENV["API_PORT"].to_i
-          warning(@settings[:api], "using api port environment variable")
+          warning("using api port environment variable", :api => @settings[:api])
         end
         @indifferent_access = false
       end
@@ -82,24 +83,30 @@ module Sensu
       def load_file(file)
         if File.file?(file) && File.readable?(file)
           begin
-            warning(file, "loading config file")
+            warning("loading config file", :file => file)
             contents = IO.read(file)
             config = MultiJson.load(contents, :symbolize_keys => true)
             merged = deep_merge(@settings, config)
             unless @loaded_files.empty?
               changes = deep_diff(@settings, merged)
-              warning(changes, "config file applied changes")
+              warning("config file applied changes", {
+                :file => file,
+                :changes => changes
+              })
             end
             @settings = merged
             @indifferent_access = false
             @loaded_files << file
           rescue MultiJson::ParseError => error
-            warning(file, "config file must be valid json")
-            warning(file, "ignoring config file")
+            warning("config file must be valid json", {
+              :file => file,
+              :error => error.to_s
+            })
+            warning("ignoring config file", :file => file)
           end
         else
-          warning(file, "config file does not exist or is not readable")
-          warning(file, "ignoring config file")
+          warning("config file does not exist or is not readable", :file => file)
+          warning("ignoring config file", :file => file)
         end
       end
 
@@ -108,7 +115,7 @@ module Sensu
       #
       # @param [String] directory path.
       def load_directory(directory)
-        warning(directory, "loading config files from directory")
+        warning("loading config files from directory", :directory => directory)
         path = directory.gsub(/\\(?=\S)/, "/")
         Dir.glob(File.join(path, "**/*.json")).each do |file|
           load_file(file)
@@ -125,7 +132,7 @@ module Sensu
       # Validate the loaded settings.
       #
       # @return [Array] validation failures.
-      def validate!
+      def validate
         service = ::File.basename($0).split("-").last
         validator = Validator.new
         validator.run(@settings, service)
@@ -220,16 +227,15 @@ module Sensu
         end
       end
 
-      # Record a warning for an object.
+      # Record a warning.
       #
-      # @param object [Object] under suspicion.
       # @param message [String] warning message.
+      # @param data [Hash] warning context.
       # @return [Array] current warnings.
-      def warning(object, message)
+      def warning(message, data={})
         @warnings << {
-          :object => object,
           :message => message
-        }
+        }.merge(data)
       end
     end
   end

data/lib/sensu/settings/validators/client.rb

@@ -15,6 +15,15 @@ module Sensu
           end
         end
 
+        # Validate client safe mode.
+        # Validates: safe_mode
+        #
+        # @param client [Hash] sensu client definition.
+        def validate_client_safe_mode(client)
+          must_be_boolean_if_set(client[:safe_mode]) ||
+            invalid(client, "client safe_mode must be boolean")
+        end
+
         # Validate client socket.
         # Validates: socket (bind, port)
         #
@@ -88,7 +97,7 @@ module Sensu
         end
 
         # Validate a Sensu client definition.
-        # Validates: name, address
+        # Validates: name, address, safe_mode
         #
         # @param client [Hash] sensu client definition.
         def validate_client(client)
@@ -101,6 +110,7 @@ module Sensu
               invalid(client, "client name cannot contain spaces or special characters")
             must_be_a_string(client[:address]) ||
               invalid(client, "client address must be a string")
+            validate_client_safe_mode(client)
             validate_client_subscriptions(client)
             validate_client_socket(client)
             validate_client_keepalive(client)

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "multi_json", "1.10.0"
+  spec.add_dependency "multi_json"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/spec/loader_spec.rb

@@ -12,7 +12,7 @@ describe "Sensu::Settings::Loader" do
   end
 
   it "can provide a loader API" do
-    @loader.should respond_to(:load_env, :load_file, :load_directory, :set_env!, :validate!)
+    @loader.should respond_to(:load_env, :load_file, :load_directory, :set_env!, :validate)
   end
 
   it "can provide indifferent access to settings" do
@@ -21,7 +21,7 @@ describe "Sensu::Settings::Loader" do
   end
 
   it "can validate loaded settings" do
-    failures = @loader.validate!
+    failures = @loader.validate
     failures.size.should eq(0)
   end
 
@@ -59,7 +59,7 @@ describe "Sensu::Settings::Loader" do
     @loader.load_file(@config_file)
     @loader.warnings.size.should eq(1)
     warning = @loader.warnings.first
-    warning[:object].should eq(File.expand_path(@config_file))
+    warning[:file].should eq(File.expand_path(@config_file))
     warning[:message].should eq("loading config file")
     @loader[:api][:port].should eq(4567)
     @loader["api"]["port"].should eq(4567)
@@ -67,7 +67,7 @@ describe "Sensu::Settings::Loader" do
 
   it "can load settings from a file and validate them" do
     @loader.load_file(@config_file)
-    failures = @loader.validate!
+    failures = @loader.validate
     reasons = failures.map do |failure|
       failure[:message]
     end

data/spec/settings_spec.rb

@@ -15,7 +15,7 @@ describe "Sensu::Settings" do
     Sensu::Settings.should respond_to(:load)
     Sensu::Settings.load.should be_an_instance_of(Sensu::Settings::Loader)
     settings = Sensu::Settings.load
-    settings.should respond_to(:validate!)
+    settings.should respond_to(:validate)
   end
 
   it "can load settings from the environment, a file, and a directory" do

data/spec/validator_spec.rb

@@ -478,6 +478,12 @@ describe "Sensu::Settings::Validator" do
     client[:redact] = ["secret"]
     @validator.validate_client(client)
     @validator.reset.should eq(0)
+    client[:safe_mode] = 1
+    @validator.validate_client(client)
+    @validator.reset.should eq(1)
+    client[:safe_mode] = false
+    @validator.validate_client(client)
+    @validator.reset.should eq(0)
   end
 
   it "can validate client socket" do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement