sensu 0.22.2 → 0.23.0.beta

data/lib/sensu/server/sandbox.rb

@@ -2,16 +2,16 @@ module Sensu
   module Server
     module Sandbox
       # Evaluate a Ruby expression within the context of a simple
-      # "sandbox", a Proc in a module method. Use the Ruby `$SAFE`
-      # level of 4 when the version of Ruby is less than 2.1.0. A
-      # single value is provided to the "sandbox".
+      # "sandbox", a Proc in a module method. As of Ruby 2.3.0,
+      # `$SAFE` no longer supports levels > 1, so its use has been
+      # removed from this method. A single value is provided to the
+      # "sandbox".
       #
       # @param expression [String] to be evaluated.
       # @param value [Object] to provide the "sandbox" with.
       # @return [Object]
       def self.eval(expression, value=nil)
         result = Proc.new do
-          $SAFE = (RUBY_VERSION < "2.1.0" ? 4 : 3)
           Kernel.eval(expression)
         end
         result.call

data/lib/sensu/utilities.rb

@@ -1,6 +1,4 @@
-gem "uuidtools", "2.1.5"
-
-require "uuidtools"
+require "securerandom"
 
 module Sensu
   module Utilities
@@ -50,7 +48,7 @@ module Sensu
     #
     # @return [String] random UUID.
     def random_uuid
-      UUIDTools::UUID.random_create.to_s
+      ::SecureRandom.uuid
     end
 
     # Remove sensitive information from a hash (eg. passwords). By
@@ -82,5 +80,43 @@ module Sensu
       end
       hash
     end
+
+    # Traverse a hash for an attribute value, with a fallback default
+    # value if nil.
+    #
+    # @param tree [Hash] to traverse.
+    # @param path [Array] of attribute keys.
+    # @param default [Object] value if attribute value is nil.
+    # @return [Object] attribute or fallback default value.
+    def find_attribute_value(tree, path, default)
+      attribute = tree[path.shift]
+      if attribute.is_a?(Hash)
+        find_attribute_value(attribute, path, default)
+      else
+        attribute.nil? ? default : attribute
+      end
+    end
+
+    # Substitute dot notation tokens (eg. :::db.name|production:::)
+    # with the associated definition attribute value. Tokens can
+    # provide a fallback default value, following a pipe.
+    #
+    # @param tokens [String]
+    # @param attributes [Hash]
+    # @return [Array] containing the string with tokens substituted
+    #   and an array of unmatched tokens.
+    def substitute_tokens(tokens, attributes)
+      unmatched_tokens = []
+      substituted = tokens.gsub(/:::([^:].*?):::/) do
+        token, default = $1.to_s.split("|", -1)
+        path = token.split(".").map(&:to_sym)
+        matched = find_attribute_value(attributes, path, default)
+        if matched.nil?
+          unmatched_tokens << token
+        end
+        matched
+      end
+      [substituted, unmatched_tokens]
+    end
   end
 end

data/sensu.gemspec

@@ -13,17 +13,15 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.has_rdoc    = false
 
-  s.add_dependency "json" if RUBY_VERSION < "1.9"
-  s.add_dependency "multi_json", "1.11.2"
-  s.add_dependency "uuidtools", "2.1.5"
-  s.add_dependency "eventmachine", "1.0.9.1"
-  s.add_dependency "sensu-logger", "1.1.0"
-  s.add_dependency "sensu-settings", "3.3.0"
+  s.add_dependency "eventmachine", "1.2.0.1"
+  s.add_dependency "sensu-json", "1.1.0"
+  s.add_dependency "sensu-logger", "1.2.0"
+  s.add_dependency "sensu-settings", "3.4.0"
   s.add_dependency "sensu-extension", "1.5.0"
-  s.add_dependency "sensu-extensions", "1.4.0"
-  s.add_dependency "sensu-transport", "4.0.0"
+  s.add_dependency "sensu-extensions", "1.5.0"
+  s.add_dependency "sensu-transport", "5.0.0"
   s.add_dependency "sensu-spawn", "1.8.0"
-  s.add_dependency "em-redis-unified", "1.0.1"
+  s.add_dependency "sensu-redis", "1.2.0"
   s.add_dependency "sinatra", "1.4.6"
   s.add_dependency "async_sinatra", "1.2.0"
   s.add_dependency "thin", "1.6.3" unless RUBY_PLATFORM =~ /java/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.23.0.beta
 platform: ruby
 authors:
 - Sean Porter
@@ -9,78 +9,64 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.2
-- !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 1.2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 1.2.0.1
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: sensu-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.9.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.9.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sensu-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sensu-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement
@@ -101,28 +87,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: sensu-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: sensu-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -138,19 +124,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: em-redis-unified
+  name: sensu-redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +261,6 @@ files:
 - lib/sensu/client/socket.rb
 - lib/sensu/constants.rb
 - lib/sensu/daemon.rb
-- lib/sensu/redis.rb
 - lib/sensu/server/filter.rb
 - lib/sensu/server/handle.rb
 - lib/sensu/server/mutate.rb
@@ -299,9 +284,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1

data/lib/sensu/redis.rb

@@ -1,25 +0,0 @@
-gem "em-redis-unified", "1.0.1"
-
-require "em-redis-unified"
-
-module Sensu
-  class Redis
-    # Connect to Redis and ensure that the Redis version is at least
-    # 1.3.14, in order to support certain commands.
-    #
-    # @param options [Hash]
-    # @return [Object] Redis connection object.
-    def self.connect(options={})
-      options ||= {}
-      connection = EM::Protocols::Redis.connect(options)
-      connection.info do |info|
-        if info[:redis_version] < "1.3.14"
-          klass = EM::Protocols::Redis::RedisError
-          message = "redis version must be >= 2.0 RC 1"
-          connection.error(klass, message)
-        end
-      end
-      connection
-    end
-  end
-end