sensu-settings 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5afc7c7ef4a3cfc41e5a052c2133371dade84f1
-  data.tar.gz: 2345400d3a76e5b7b275866baf577f52875bc4e8
+  metadata.gz: b52b0d7d44f148e43deac0e2450f8e023bc5a6f3
+  data.tar.gz: f9b954ae820cc6256c3ea5981ec2b4fd8b8e9655
 SHA512:
-  metadata.gz: daa43044a9e2ac530ea62f613ebe86aefaf2b734a499f4c8b098c8b5e0480041e099c2d31cd8489791894d94745941a7c950bf627544363cf4dc9f2e3c7487fe
-  data.tar.gz: a95609dba6b6631c75be0d20d0c1d454386d0bc8969912cef9005abd7c91bfc412efd507c0510a75cbfeb03ca5f52c6e539b8f3ac224959dde1e2555587751fd
+  metadata.gz: 08b52a7c91d24a07b79e116d628bbfe591f5396c43abe6632f4bce65f7c3793eeae5f447b226690076122caf72587e25cb56d9c1b645a7d84d4745dbeda374da
+  data.tar.gz: c5f8afca71385402593b9615b976086218f439504c95fa0b9b2debf64e22e58f54c4cb384d470d7de9cdaa5ed03b3bbc2292b59d803b1992c7d177858037fec6

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 rvm:
   - 1.8.7

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

@@ -61,8 +61,12 @@ module Sensu
             invalid(check, "check name must be a string")
           must_match_regex(/^[\w\.-]+$/, check[:name]) ||
             invalid(check, "check name cannot contain spaces or special characters")
-          must_be_a_string(check[:command]) ||
+          must_be_a_string_if_set(check[:command]) ||
             invalid(check, "check command must be a string")
+          must_be_a_string_if_set(check[:extension]) ||
+            invalid(check, "check extension must be a string")
+          (!check[:command].nil? ^ !check[:extension].nil?) ||
+            invalid(check, "either check command or extension must be set")
           must_be_a_numeric_if_set(check[:timeout]) ||
             invalid(check, "check timeout must be numeric")
           must_be_a_string_if_set(check[:source]) ||

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "1.2.0"
+  spec.version       = "1.3.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"
@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "codeclimate-test-reporter" unless RUBY_VERSION < "1.9"
 end

data/spec/validator_spec.rb

@@ -57,9 +57,8 @@ describe "Sensu::Settings::Validator" do
     reasons = @validator.failures.map do |failure|
       failure[:message]
     end
-    expect(reasons).to include("check name must be a string")
     expect(reasons).to include("check name cannot contain spaces or special characters")
-    expect(reasons).to include("check command must be a string")
+    expect(reasons).to include("either check command or extension must be set")
     expect(reasons).to include("check interval must be an integer")
     expect(reasons).to include("check subscribers must be an array")
     expect(reasons.size).to eq(5)
@@ -147,6 +146,15 @@ describe "Sensu::Settings::Validator" do
     check[:source] = "switch-%42%"
     @validator.validate_check(check)
     expect(@validator.reset).to eq(0)
+    check[:extension] = 'foo'
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(1)
+    check.delete(:command)
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(0)
+    check[:extension] = true
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(1)
   end
 
   it "can validate check subdue" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -153,4 +153,3 @@ test_files:
 - spec/rules_spec.rb
 - spec/settings_spec.rb
 - spec/validator_spec.rb
-has_rdoc: