sensu 0.12.6 → 0.13.0.alpha

data/lib/sensu/socket.rb

@@ -1,6 +1,6 @@
 module Sensu
   class Socket < EM::Connection
-    attr_accessor :logger, :settings, :amq, :reply
+    attr_accessor :logger, :settings, :transport, :reply
 
     def respond(data)
       unless @reply == false
@@ -20,7 +20,7 @@ module Sensu
           :data => data
         })
         begin
-          check = Oj.load(data)
+          check = MultiJson.load(data)
           check[:issued] = Time.now.to_i
           check[:status] ||= 0
           validates = [
@@ -36,7 +36,7 @@ module Sensu
             @logger.info('publishing check result', {
               :payload => payload
             })
-            @amq.direct('results').publish(Oj.dump(payload))
+            @transport.publish(:direct, 'results', MultiJson.dump(payload))
             respond('ok')
           else
             @logger.warn('invalid check result', {
@@ -44,7 +44,7 @@ module Sensu
             })
             respond('invalid')
           end
-        rescue Oj::ParseError => error
+        rescue MultiJson::ParseError => error
           @logger.warn('check result must be valid json', {
             :data => data,
             :error => error.to_s

data/lib/sensu/utilities.rb

@@ -1,3 +1,7 @@
+gem 'uuidtools', '2.1.4'
+
+require 'uuidtools'
+
 module Sensu
   module Utilities
     def testing?
@@ -12,23 +16,6 @@ module Sensu
       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|
@@ -44,18 +31,8 @@ module Sensu
       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
+    def random_uuid
+      UUIDTools::UUID.random_create.to_s
     end
 
     def redact_sensitive(hash, keys=nil)

data/sensu.gemspec

@@ -13,16 +13,20 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.has_rdoc    = false
 
-  s.add_dependency('oj', '2.0.9')
-  s.add_dependency('eventmachine', '1.0.3')
-  s.add_dependency('amq-protocol', '1.2.0')
-  s.add_dependency('amq-client', '1.0.2')
-  s.add_dependency('amqp', '1.0.0')
+  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-logger', '0.0.1')
+  s.add_dependency('sensu-settings', '0.0.4')
+  s.add_dependency('sensu-extension', '0.0.3')
+  s.add_dependency('sensu-extensions', '0.0.4')
+  s.add_dependency('sensu-transport', '0.0.2')
+  s.add_dependency('sensu-spawn', '0.0.3')
   s.add_dependency('em-redis-unified', '0.4.2')
   s.add_dependency('thin', '1.5.0')
   s.add_dependency('sinatra', '1.3.5')
   s.add_dependency('async_sinatra', '1.0.0')
-  s.add_dependency('em-worker', '0.0.2')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')

metadata

@@ -1,298 +1,293 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sensu
-version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: false
-  segments: 
-  - 0
-  - 12
-  - 6
-  version: 0.12.6
+version: !ruby/object:Gem::Version
+  version: 0.13.0.alpha
 platform: ruby
-authors: 
+authors:
 - Sean Porter
 - Justin Kolberg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-02-19 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: oj
+date: 2014-05-26 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.10.1
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 0
-        - 9
-        version: 2.0.9
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
-        version: 1.0.3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+- !ruby/object:Gem::Dependency
+  name: sensu-em
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: amq-protocol
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: sensu-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: amq-client
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: sensu-settings
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: amqp
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: sensu-extension
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: sensu-extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: sensu-transport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: sensu-spawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: em-redis-unified
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: em-redis-unified
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 3
-        - 5
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.5
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: async_sinatra
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: async_sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: em-worker
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
-        version: 0.0.2
-  type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A monitoring framework that aims to be simple, malleable, and scalable.
+  Uses the publish/subscribe model.
+email:
 - portertech@gmail.com
 - justin.kolberg@sonian.net
-executables: 
+executables:
 - sensu-api
 - sensu-client
 - sensu-server
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- CHANGELOG.md
+- MIT-LICENSE.txt
+- README.md
 - bin/sensu-api
 - bin/sensu-client
 - bin/sensu-server
+- lib/sensu.rb
 - lib/sensu/api.rb
-- lib/sensu/base.rb
 - lib/sensu/cli.rb
 - lib/sensu/client.rb
 - lib/sensu/constants.rb
-- lib/sensu/extensions/handlers/debug.rb
-- lib/sensu/extensions/mutators/only_check_output.rb
-- lib/sensu/extensions.rb
-- lib/sensu/io.rb
-- lib/sensu/logstream.rb
-- lib/sensu/process.rb
-- lib/sensu/rabbitmq.rb
+- lib/sensu/daemon.rb
 - lib/sensu/redis.rb
 - lib/sensu/sandbox.rb
 - lib/sensu/server.rb
-- lib/sensu/settings.rb
 - lib/sensu/socket.rb
 - lib/sensu/utilities.rb
-- lib/sensu.rb
 - sensu.gemspec
-- README.md
-- CHANGELOG.md
-- MIT-LICENSE.txt
-has_rdoc: true
 homepage: https://github.com/sensu/sensu
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">"
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A monitoring framework
 test_files: []
-
+has_rdoc: false