sensu-settings 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a1cb240875b92bbe08382f6b826cdd5842fbe8
-  data.tar.gz: a106106ad7f49e8431fef9ffcfa4ce0465b95a5a
+  metadata.gz: e8c362827e20c190a2ddd55390d79cdde36f6718
+  data.tar.gz: 2352416fa30ab53d50d7732b6d627705e2c693a9
 SHA512:
-  metadata.gz: b835741087e47bd2a3aad317dfd9d00f162182348c5e545bc249fdc0d1a91775a05e3510cc3e13abc81a76d73ef3bad98619da29421545652f3632469722b316
-  data.tar.gz: 5546f23571be9b5d6414b730fc14913272f3493ec7e0aaa2cb4caf44f633504f5475a111579c6fec99a2b0adb01e4da4e8e6f713614f76d8fdced1191cca0f35
+  metadata.gz: 244ed09a606bca423b6a34436e91ae46213bec523286e1ac64c6976f1f293417a9df433f0b35c14d3f7a9e1551154d5c39a4d51b5250852556efc583e6bf869d
+  data.tar.gz: 8f293750efc58b389685bd767e736bc472a258506a9a53bd9f1fdb1c22417ea5508e917ab7935dd00b52076561e3c9581b416cc32aeb6db2a383cb11220541eb

data/lib/sensu/settings/constants.rb

@@ -1,5 +1,5 @@
 module Sensu
   module Settings
-    CATEGORIES = [:checks, :filters, :mutators, :handlers]
+    CATEGORIES = [:checks, :filters, :mutators, :handlers, :extensions]
   end
 end

data/lib/sensu/settings/validators.rb

@@ -7,6 +7,7 @@ require "sensu/settings/validators/mutator"
 require "sensu/settings/validators/handler"
 require "sensu/settings/validators/client"
 require "sensu/settings/validators/api"
+require "sensu/settings/validators/extension"
 
 module Sensu
   module Settings
@@ -20,6 +21,7 @@ module Sensu
       include Handler
       include Client
       include API
+      include Extension
     end
   end
 end

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

@@ -0,0 +1,18 @@
+module Sensu
+  module Settings
+    module Validators
+      module Extension
+        # Validate a Sensu extension definition.
+        # Validates: gem, version
+        #
+        # @param filter [Hash] sensu extension definition.
+        def validate_extension(extension)
+          must_be_a_string_if_set(extension[:gem]) ||
+            invalid(extension, "extension gem must be a string")
+          must_be_a_string_if_set(extension[:version]) ||
+            invalid(extension, "extension version must be a string")
+        end
+      end
+    end
+  end
+end

data/sensu-settings.gemspec

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

data/spec/validator_spec.rb

@@ -21,7 +21,8 @@ describe "Sensu::Settings::Validator" do
     expect(reasons).to include("filters must be a hash")
     expect(reasons).to include("mutators must be a hash")
     expect(reasons).to include("handlers must be a hash")
-    expect(reasons.size).to eq(6)
+    expect(reasons).to include("extensions must be a hash")
+    expect(reasons.size).to eq(7)
   end
 
   it "can validate a sensu definition" do
@@ -57,10 +58,10 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.run(settings)
-    expect(@validator.reset).to eq(6)
+    expect(@validator.reset).to eq(7)
     settings[:sensu][:spawn][:limit] = 20
     @validator.run(settings)
-    expect(@validator.reset).to eq(5)
+    expect(@validator.reset).to eq(6)
   end
 
   it "can validate a transport definition" do
@@ -91,10 +92,10 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.run(settings)
-    expect(@validator.reset).to eq(6)
+    expect(@validator.reset).to eq(7)
     settings[:transport][:name] = "rabbitmq"
     @validator.run(settings)
-    expect(@validator.reset).to eq(5)
+    expect(@validator.reset).to eq(6)
   end
 
   it "can validate an empty check definition" do
@@ -333,10 +334,10 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.run(settings)
-    expect(@validator.reset).to eq(6)
+    expect(@validator.reset).to eq(7)
     settings[:checks][:foo][:interval] = 1
     @validator.run(settings)
-    expect(@validator.reset).to eq(5)
+    expect(@validator.reset).to eq(6)
   end
 
   it "can validate a filter definition" do
@@ -746,10 +747,10 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.run(settings, "client")
-    expect(@validator.reset).to eq(7)
+    expect(@validator.reset).to eq(8)
     settings[:client][:subscriptions] = ["bar"]
     @validator.run(settings, "client")
-    expect(@validator.reset).to eq(6)
+    expect(@validator.reset).to eq(7)
   end
 
   it "can validate an api definition" do
@@ -795,9 +796,49 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.run(settings, "api")
-    expect(@validator.reset).to eq(7)
+    expect(@validator.reset).to eq(8)
     settings[:api][:port] = 4567
     @validator.run(settings, "api")
+    expect(@validator.reset).to eq(7)
+  end
+
+  it "can validate a extension definition" do
+    extension = {}
+    @validator.validate_extension(extension)
+    expect(@validator.reset).to eq(0)
+    extension[:gem] = 1
+    @validator.validate_extension(extension)
+    expect(@validator.reset).to eq(1)
+    extension[:gem] = true
+    @validator.validate_extension(extension)
+    expect(@validator.reset).to eq(1)
+    extension[:gem] = "test"
+    @validator.validate_extension(extension)
+    expect(@validator.reset).to eq(0)
+    extension[:version] = 1
+    @validator.validate_extension(extension)
+    expect(@validator.reset).to eq(1)
+    extension[:version] = false
+    @validator.validate_extension(extension)
+    expect(@validator.reset).to eq(1)
+    extension[:version] = "1.0.0"
+    @validator.validate_extension(extension)
+    expect(@validator.reset).to eq(0)
+  end
+
+  it "can run, validating extensions" do
+    settings = {
+      :extensions => {
+        :foo => {
+          :gem => "sensu-extensions-test",
+          :version => 1
+        }
+      }
+    }
+    @validator.run(settings)
+    expect(@validator.reset).to eq(7)
+    settings[:extensions][:foo][:version] = "1.0.0"
+    @validator.run(settings)
     expect(@validator.reset).to eq(6)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json
@@ -102,6 +102,7 @@ files:
 - lib/sensu/settings/validators/api.rb
 - lib/sensu/settings/validators/check.rb
 - lib/sensu/settings/validators/client.rb
+- lib/sensu/settings/validators/extension.rb
 - lib/sensu/settings/validators/filter.rb
 - lib/sensu/settings/validators/handler.rb
 - lib/sensu/settings/validators/mutator.rb