sensu 0.13.0.beta → 0.13.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb0b42351e78060c0d98db18dab7eda10d3454bb
-  data.tar.gz: d0427f69c4aa2ff78df74388c8fe25db2d4bda37
+  metadata.gz: 06c4221b329539aeeca46fd4e8cd4defebc6ca41
+  data.tar.gz: 1d97b6669db13f4e5db48a72fb9628777ab4b05c
 SHA512:
-  metadata.gz: c018ea24b885b250bd4c34ccadc1b5a96e02c43eaf5ee9671042afb5c4f8d59312ba9ec90477eb69c2161cb20afebdc643fa1f846d78a66bcd5c33f50bfdc55a
-  data.tar.gz: 2556a259aff1f186d6dc1aa1c61d5799da2bfc88bda700f531b1c52656b67c45b082a777d92cee35971da2b767a5333eeee7238e5e44e57c6dad8053b204c0b5
+  metadata.gz: b84ad62f1f09def1515e543787bfbcd19ac1fd994344c7a9c3f9092d5de56041c76b10fc24692f53f2942e918255a3afcf28f03f2eacc74709280116dcc76841
+  data.tar.gz: 174bc2ea21a3711708d20ce0525978b3dce08d95566f585311c46b6d3694b804e6daafe41f616ae742cd146b3d364cf9279f2ba8030f6b77c7c9fa2f2567c01f

data/CHANGELOG.md

@@ -32,7 +32,8 @@ everything but check extensions.
 
 Fixed standalone check scheduling, no longer mutating definitions.
 
-Fixed command token substitution, allowing for the use of colons.
+Fixed command token substitution, allowing for the use of colons and
+working value defaults.
 
 Log events are flushed when the eventmachine reactor stops.
 

data/lib/sensu/client.rb

@@ -68,17 +68,20 @@ module Sensu
       end
     end
 
+    def find_client_attribute(tree, path, default)
+      attribute = tree[path.shift]
+      if attribute.is_a?(Hash)
+        find_client_attribute(attribute, path, default)
+      else
+        attribute.nil? ? default : attribute
+      end
+    end
+
     def substitute_command_tokens(check)
       unmatched_tokens = Array.new
-      substituted = check[:command].gsub(/:::([^:]*?):::/) do
+      substituted = check[:command].gsub(/:::([^:].*?):::/) do
         token, default = $1.to_s.split('|', -1)
-        matched = token.split('.').inject(@settings[:client]) do |client, attribute|
-          if client[attribute].nil?
-            default.nil? ? break : default
-          else
-            client[attribute]
-          end
-        end
+        matched = find_client_attribute(@settings[:client], token.split('.'), default)
         if matched.nil?
           unmatched_tokens << token
         end

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.13.0.beta'
+    VERSION = '0.13.0.beta.1'
 
     SEVERITIES = %w[ok warning critical unknown]
 

data/lib/sensu/daemon.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 
 gem 'multi_json', '1.10.1'
 
-gem 'sensu-em', '2.0.0'
+gem 'sensu-em', '2.1.0'
 gem 'sensu-logger', '0.0.1'
 gem 'sensu-settings', '0.0.7'
 gem 'sensu-extension', '0.0.3'

data/sensu.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency('json') if RUBY_VERSION < "1.9"
   s.add_dependency('multi_json', '1.10.1')
   s.add_dependency('uuidtools', '2.1.4')
-  s.add_dependency('sensu-em', '2.0.0')
+  s.add_dependency('sensu-em', '2.1.0')
   s.add_dependency('sensu-logger', '0.0.1')
   s.add_dependency('sensu-settings', '0.0.7')
   s.add_dependency('sensu-extension', '0.0.3')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta
+  version: 0.13.0.beta.1
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: sensu-logger
   requirement: !ruby/object:Gem::Requirement