sensu 0.10.0 → 0.10.1

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.10.1 - 2013-07-17
+
+### Features
+
+You can specify multiple Sensu service configuration directories,
+using the -d (--config_dir) CLI argument, providing a comma delimited
+list.
+
+A post initialize hook ("post_init()") was added to the extension API,
+enabling setup (connections, etc.) within the event loop.
+
+### Other
+
+Catches nil exit statuses, returned from check execution.
+
+Empty command token substitution defaults now work. eg. "-f :::bar|:::"
+
+Specs updated to run on OS X, bash compatibility.
+
 ## 0.10.0 - 2013-06-27
 
 ### Non-backwards compatible changes
@@ -8,7 +27,7 @@ The valid characters are: a-z, A-Z, 0-9, "_", ".", and "-".
 "command_executed" was removed from check results, as it may contain
 sensitive information, such as credentials.
 
-### Feature
+### Features
 
 Passwords in client data (keepalives) and log events are replaced with
 "REDACTED", reducing the possibility of exposure. The following

data/lib/sensu/base.rb

@@ -43,8 +43,10 @@ module Sensu
       if @options[:config_file]
         settings.load_file(@options[:config_file])
       end
-      if @options[:config_dir]
-        settings.load_directory(@options[:config_dir])
+      if @options[:config_dirs]
+        @options[:config_dirs].each do |config_dir|
+          settings.load_directory(config_dir)
+        end
       end
       settings.validate
       settings.set_env

data/lib/sensu/cli.rb

@@ -16,8 +16,8 @@ module Sensu
         opts.on('-c', '--config FILE', 'Sensu JSON config FILE') do |file|
           options[:config_file] = file
         end
-        opts.on('-d', '--config_dir DIR', 'DIR for Sensu JSON config files') do |dir|
-          options[:config_dir] = dir
+        opts.on('-d', '--config_dir DIR[,DIR]', 'DIR or comma-delimited DIR list for Sensu JSON config files') do |dir|
+          options[:config_dirs] = dir.split(',')
         end
         opts.on('-e', '--extension_dir DIR', 'DIR for Sensu extensions') do |dir|
           options[:extension_dir] = dir

data/lib/sensu/client.rb

@@ -79,7 +79,7 @@ module Sensu
     def substitute_command_tokens(check)
       unmatched_tokens = Array.new
       substituted = check[:command].gsub(/:::(.*?):::/) do
-        token, default = $1.to_s.split('|')
+        token, default = $1.to_s.split('|', -1)
         matched = token.split('.').inject(@settings[:client]) do |client, attribute|
           if client[attribute].nil?
             default.nil? ? break : default

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
 
     LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
 

data/lib/sensu/extensions.rb

@@ -85,6 +85,12 @@ module Sensu
 
   module Extension
     class Base
+      def initialize
+        EM::next_tick do
+          post_init
+        end
+      end
+
       def name
         'base'
       end
@@ -108,6 +114,10 @@ module Sensu
         definition.has_key?(key.to_sym)
       end
 
+      def post_init
+        true
+      end
+
       def run(event=nil, settings={}, &block)
         block.call('noop', 0)
       end

data/lib/sensu/io.rb

@@ -68,7 +68,7 @@ module Sensu
         if wait_on_group
           wait_on_process_group(process.pid)
         end
-        [output, status.exited? ? status.exitstatus : 2]
+        [output, status.exitstatus || 2]
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-27 00:00:00 -07:00
+date: 2013-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency