sensu 0.9.9.beta.2 → 0.9.9.beta.3

data/lib/sensu/settings.rb

@@ -1,18 +1,25 @@
 module Sensu
   class Settings
+    include Utilities
+
     attr_reader :indifferent_access, :loaded_env, :loaded_files
 
     def initialize
-      @logger = Sensu::Logger.get
+      @logger = Logger.get
       @settings = Hash.new
-      [:checks, :filters, :mutators, :handlers].each do |key|
-        @settings[key] = Hash.new
+      SETTINGS_CATEGORIES.each do |category|
+        @settings[category] = Hash.new
       end
       @indifferent_access = false
       @loaded_env = false
       @loaded_files = Array.new
     end
 
+    def indifferent_access!
+      @settings = with_indifferent_access(@settings)
+      @indifferent_access = true
+    end
+
     def [](key)
       unless @indifferent_access
         indifferent_access!
@@ -20,9 +27,16 @@ module Sensu
       @settings[key.to_sym]
     end
 
-    def indifferent_access!
-      @settings = indifferent_access(@settings)
-      @indifferent_access = true
+    SETTINGS_CATEGORIES.each do |category|
+      define_method(category) do
+        @settings[category].map do |name, details|
+          details.merge(:name => name.to_s)
+        end
+      end
+
+      define_method((category.to_s.chop + '_exists?').to_sym) do |name|
+        @settings[category].has_key?(name.to_sym)
+      end
     end
 
     def load_env
@@ -85,27 +99,21 @@ module Sensu
       end
     end
 
-    def set_env
-      ENV['SENSU_CONFIG_FILES'] = @loaded_files.join(':')
-    end
-
-    [:checks, :filters, :mutators, :handlers].each do |key|
-      define_method(key) do
-        @settings[key].map do |name, details|
-          details.merge(:name => name.to_s)
-        end
+    def load_directory(directory)
+      Dir.glob(File.join(directory, '**/*.json')).each do |file|
+        load_file(file)
       end
+    end
 
-      define_method((key.to_s.chop + '_exists?').to_sym) do |name|
-        @settings[key].has_key?(name.to_sym)
-      end
+    def set_env
+      ENV['SENSU_CONFIG_FILES'] = @loaded_files.join(':')
     end
 
     def validate
       @logger.debug('validating settings')
       validate_checks
       case File.basename($0)
-      when 'rake'
+      when 'rspec'
         validate_client
         validate_api
         validate_server
@@ -121,52 +129,6 @@ module Sensu
 
     private
 
-    def indifferent_access(hash)
-      hash = indifferent_hash.merge(hash)
-      hash.each do |key, value|
-        if value.is_a?(Hash)
-          hash[key] = indifferent_access(value)
-        end
-      end
-    end
-
-    def indifferent_hash
-      Hash.new do |hash, key|
-        if key.is_a?(String)
-          hash[key.to_sym]
-        end
-      end
-    end
-
-    def deep_merge(hash_one, hash_two)
-      merged = hash_one.dup
-      hash_two.each do |key, value|
-        merged[key] = case
-        when hash_one[key].is_a?(Hash) && value.is_a?(Hash)
-          deep_merge(hash_one[key], value)
-        when hash_one[key].is_a?(Array) && value.is_a?(Array)
-          hash_one[key].concat(value).uniq
-        else
-          value
-        end
-      end
-      merged
-    end
-
-    def deep_diff(hash_one, hash_two)
-      keys = hash_one.keys.concat(hash_two.keys).uniq
-      keys.inject(Hash.new) do |diff, key|
-        unless hash_one[key] == hash_two[key]
-          if hash_one[key].is_a?(Hash) && hash_two[key].is_a?(Hash)
-            diff[key] = deep_diff(hash_one[key], hash_two[key])
-          else
-            diff[key] = [hash_one[key], hash_two[key]]
-          end
-        end
-        diff
-      end
-    end
-
     def invalid(reason, details={})
       @logger.fatal('invalid settings', {
         :reason => reason
@@ -191,7 +153,7 @@ module Sensu
           })
         end
         unless check[:standalone]
-          unless check[:subscribers].is_a?(Array) && check[:subscribers].count > 0
+          unless check[:subscribers].is_a?(Array) && check[:subscribers].size > 0
             invalid('check is missing subscribers', {
               :check => check
             })
@@ -490,7 +452,7 @@ module Sensu
             })
           end
           handler[:severities].each do |severity|
-            unless Sensu::SEVERITIES.include?(severity)
+            unless SEVERITIES.include?(severity)
               invalid('handler severities are invalid', {
                 :handler => handler
               })

data/lib/sensu/utilities.rb

@@ -0,0 +1,75 @@
+module Sensu
+  module Utilities
+    def testing?
+      File.basename($0) == 'rspec'
+    end
+
+    def retry_until_true(wait=0.5, &block)
+      EM::Timer.new(wait) do
+        unless block.call
+          retry_until_true(wait, &block)
+        end
+      end
+    end
+
+    def indifferent_hash
+      Hash.new do |hash, key|
+        if key.is_a?(String)
+          hash[key.to_sym]
+        end
+      end
+    end
+
+    def with_indifferent_access(hash)
+      hash = indifferent_hash.merge(hash)
+      hash.each do |key, value|
+        if value.is_a?(Hash)
+          hash[key] = with_indifferent_access(value)
+        end
+      end
+    end
+
+    def deep_merge(hash_one, hash_two)
+      merged = hash_one.dup
+      hash_two.each do |key, value|
+        merged[key] = case
+        when hash_one[key].is_a?(Hash) && value.is_a?(Hash)
+          deep_merge(hash_one[key], value)
+        when hash_one[key].is_a?(Array) && value.is_a?(Array)
+          hash_one[key].concat(value).uniq
+        else
+          value
+        end
+      end
+      merged
+    end
+
+    def deep_diff(hash_one, hash_two)
+      keys = hash_one.keys.concat(hash_two.keys).uniq
+      keys.inject(Hash.new) do |diff, key|
+        unless hash_one[key] == hash_two[key]
+          if hash_one[key].is_a?(Hash) && hash_two[key].is_a?(Hash)
+            diff[key] = deep_diff(hash_one[key], hash_two[key])
+          else
+            diff[key] = [hash_one[key], hash_two[key]]
+          end
+        end
+        diff
+      end
+    end
+
+    def hash_values_equal?(hash_one, hash_two)
+      hash_one.keys.all? do |key|
+        if hash_one[key] == hash_two[key]
+          true
+        else
+          if hash_one[key].is_a?(Hash) && hash_two[key].is_a?(Hash)
+            hash_values_equal?(hash_one[key], hash_two[key])
+          else
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/sensu.gemspec

@@ -13,15 +13,15 @@ Gem::Specification.new do |s|
   s.has_rdoc    = false
 
   s.add_dependency('eventmachine', '1.0.0')
-  s.add_dependency('amqp', '0.9.7')
+  s.add_dependency('amqp', '0.9.8')
   s.add_dependency('json')
   s.add_dependency('cabin', '0.4.4')
-  s.add_dependency('ruby-redis', '0.0.2')
+  s.add_dependency('em-redis-unified', '0.4.1')
   s.add_dependency('thin', '1.5.0')
   s.add_dependency('async_sinatra', '1.0.0')
 
   s.add_development_dependency('rake')
-  s.add_development_dependency('em-spec')
+  s.add_development_dependency('rspec')
   s.add_development_dependency('em-http-request')
 
   s.files         = Dir.glob('{bin,lib}/**/*') + %w[sensu.gemspec README.md CHANGELOG.md MIT-LICENSE.txt]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: -1743839652
+  hash: 2679144457
   prerelease: true
   segments: 
   - 0
   - 9
   - 9
   - beta
-  - 2
-  version: 0.9.9.beta.2
+  - 3
+  version: 0.9.9.beta.3
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-02 00:00:00 -08:00
+date: 2013-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 43
         segments: 
         - 0
         - 9
-        - 7
-        version: 0.9.7
+        - 8
+        version: 0.9.8
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -84,19 +84,19 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: ruby-redis
+  name: em-redis-unified
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 13
         segments: 
         - 0
-        - 0
-        - 2
-        version: 0.0.2
+        - 4
+        - 1
+        version: 0.4.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -146,7 +146,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: em-spec
+  name: rspec
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -195,12 +195,17 @@ files:
 - lib/sensu/settings.rb
 - lib/sensu/redis.rb
 - lib/sensu/server.rb
+- lib/sensu/utilities.rb
 - lib/sensu/client.rb
+- lib/sensu/rabbitmq.rb
 - lib/sensu/process.rb
+- lib/sensu/extensions/handlers/debug.rb
+- lib/sensu/extensions/mutators/only_check_output.rb
 - lib/sensu/cli.rb
+- lib/sensu/logstream.rb
+- lib/sensu/extensions.rb
 - lib/sensu/io.rb
 - lib/sensu/base.rb
-- lib/sensu/logger.rb
 - lib/sensu.rb
 - sensu.gemspec
 - README.md