sensu-settings 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fdb6232d33121ec1fedbb3f3c8426371a89111b
-  data.tar.gz: 9b9d6896325f9f58982b25995d781cdcf5200fc8
+  metadata.gz: 1a4f1a3ec54f01cdcbc1695ae3ea50bd3f729e45
+  data.tar.gz: 38ab52e28a371d5466c4275e24b9027dd9b35eb3
 SHA512:
-  metadata.gz: 772d0f3421965e774bd7f2c33e56e081de4e1ba2592bbb7e8b4aad45b3d0601378b38cb76ae09148b3e7c6599d78efa58025113a2c9e925493d16c7487a86031
-  data.tar.gz: 501534272b7fc5c0a0c70634e1f6fdac842931fb4198b35cee587b120c61bd1d45b76e1ec59692af215f6bca5efd35dc58fb084b74ebbc370e6efcb2300aa82d
+  metadata.gz: ccf5e6b166eb86f7e505c49838fd537468ead0a1573d0725490fa93e84aa265b4d124a167b057148dbed4e0ef027abe47f24e146b14b7c153d1d29b40e249d09
+  data.tar.gz: 9c8bcdbc0271df0ba12684bc7323c082030398eef0e6a2cb15297cb8b2f22dcda87b879edd29862575d29e6c9729bf7fe3c21d5d55955bd233ce9cb8e3e174ed

data/lib/sensu/settings/loader.rb

@@ -14,17 +14,28 @@ module Sensu
 
       def initialize
         @warnings = []
-        @settings = {
-          :transport => {}
-        }
-        CATEGORIES.each do |category|
-          @settings[category] = {}
-        end
+        @settings = default_settings
         @indifferent_access = false
         @loaded_files = []
         self.class.create_category_methods
       end
 
+      # Default settings.
+      #
+      # @return [Hash] settings.
+      def default_settings
+        default = {
+          :transport => {
+            :name => "rabbitmq",
+            :reconnect_on_error => true
+          }
+        }
+        CATEGORIES.each do |category|
+          default[category] = {}
+        end
+        default
+      end
+
       # Create setting category accessors and methods to test the
       # existence of definitions. Called in initialize().
       def self.create_category_methods

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

@@ -8,8 +8,10 @@ module Sensu
         # @param transport [Hash] sensu transport definition.
         def validate_transport(transport)
           if is_a_hash?(transport)
-            must_be_a_string_if_set(transport[:name]) ||
+            must_be_a_string(transport[:name]) ||
               invalid(transport, "transport name must be a string")
+            must_be_boolean_if_set(transport[:reconnect_on_error]) ||
+              invalid(transport, "transport reconnect_on_error must be boolean")
           else
             invalid(transport, "transport must be a hash")
           end

data/sensu-settings.gemspec

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

data/spec/validator_spec.rb

@@ -30,13 +30,19 @@ describe "Sensu::Settings::Validator" do
     expect(@validator.reset).to eq(1)
     transport = {}
     @validator.validate_transport(transport)
-    expect(@validator.reset).to eq(0)
+    expect(@validator.reset).to eq(1)
     transport[:name] = 1
     @validator.validate_transport(transport)
     expect(@validator.reset).to eq(1)
     transport[:name] = "rabbitmq"
     @validator.validate_transport(transport)
     expect(@validator.reset).to eq(0)
+    transport[:reconnect_on_error] = "invalid"
+    @validator.validate_transport(transport)
+    expect(@validator.reset).to eq(1)
+    transport[:reconnect_on_error] = false
+    @validator.validate_transport(transport)
+    expect(@validator.reset).to eq(0)
   end
 
   it "can run, validating transport" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json