sensu 0.16.0-java → 0.17.0.beta.1-java

data/lib/sensu/server/sandbox.rb

@@ -0,0 +1,21 @@
+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".
+      #
+      # @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
+      end
+    end
+  end
+end

data/lib/sensu/server/socket.rb

@@ -0,0 +1,42 @@
+module Sensu
+  module Server
+    class Socket < EM::Connection
+      # @!attribute [rw] on_success
+      # @return [Proc] callback to be called after the data has been
+      #   transmitted successfully.
+      attr_accessor :on_success
+
+      # @!attribute [rw] on_error
+      # @return [Proc] callback to be called when there is an error.
+      attr_accessor :on_error
+
+      # Record the current time and the inactivity timeout value, when
+      # the socket connection is successful. These values are used to
+      # determine if the a connection was closed due to the timeout.
+      def connection_completed
+        @connected_at = Time.now.to_f
+        @inactivity_timeout = comm_inactivity_timeout
+      end
+
+      # Determine if the connection and data transmission was
+      # successful and call the appropriate callback, `@on_success`
+      # or `@on_error`, providing it with a message. The
+      # `@connected_at` timestamp indicates that the connection was
+      # successful. If the elapsed time is greater than the inactivity
+      # timeout value, the connection was closed abruptly by the
+      # timeout timer, and the data was not transmitted.
+      def unbind
+        if @connected_at
+          elapsed_time = Time.now.to_f - @connected_at
+          if elapsed_time >= @inactivity_timeout
+            @on_error.call("socket inactivity timeout")
+          else
+            @on_success.call("wrote to socket")
+          end
+        else
+          @on_error.call("failed to connect to socket")
+        end
+      end
+    end
+  end
+end

data/lib/sensu/utilities.rb

@@ -1,13 +1,22 @@
-gem 'uuidtools', '2.1.4'
+gem "uuidtools", "2.1.4"
 
-require 'uuidtools'
+require "uuidtools"
 
 module Sensu
   module Utilities
+    # Determine if Sensu is being tested, using the process name.
+    # Sensu is being test if the process name is "rspec",
+    #
+    # @return [TrueClass, FalseClass]
     def testing?
-      File.basename($0) == 'rspec'
+      File.basename($0) == "rspec"
     end
 
+    # Retry a code block until it retures true. The first attempt and
+    # following retries are delayed.
+    #
+    # @param wait [Numeric] time to delay block calls.
+    # @param block [Proc] to call that needs to return true.
     def retry_until_true(wait=0.5, &block)
       EM::Timer.new(wait) do
         unless block.call
@@ -16,6 +25,12 @@ module Sensu
       end
     end
 
+    # Deep merge two hashes. Nested hashes are deep merged, arrays are
+    # concatenated and duplicate array items are removed.
+    #
+    # @param hash_one [Hash]
+    # @param hash_two [Hash]
+    # @return [Hash] deep merged hash.
     def deep_merge(hash_one, hash_two)
       merged = hash_one.dup
       hash_two.each do |key, value|
@@ -31,10 +46,21 @@ module Sensu
       merged
     end
 
+    # Generate a random universally unique identifier.
+    #
+    # @return [String] random UUID.
     def random_uuid
       UUIDTools::UUID.random_create.to_s
     end
 
+    # Remove sensitive information from a hash (eg. passwords). By
+    # default, hash values will be redacted for the following keys:
+    # password, passwd, pass, api_key, api_token, access_key,
+    # secret_key, private_key, secret
+    #
+    # @param hash [Hash] to redact sensitive value from.
+    # @param keys [Array] that indicate sensitive values.
+    # @return [Hash] hash with redacted sensitive values.
     def redact_sensitive(hash, keys=nil)
       keys ||= %w[
         password passwd pass

data/sensu.gemspec

@@ -1,38 +1,39 @@
 # -*- encoding: utf-8 -*-
-require File.join(File.dirname(__FILE__), 'lib', 'sensu', 'constants')
+require File.join(File.dirname(__FILE__), "lib", "sensu", "constants")
 
 Gem::Specification.new do |s|
-  s.name        = 'sensu'
+  s.name        = "sensu"
   s.version     = Sensu::VERSION
   s.platform    = RUBY_PLATFORM =~ /java/ ? Gem::Platform::JAVA : Gem::Platform::RUBY
-  s.authors     = ['Sean Porter', 'Justin Kolberg']
-  s.email       = ['portertech@gmail.com', 'justin.kolberg@sonian.net']
-  s.homepage    = 'https://github.com/sensu/sensu'
-  s.summary     = 'A monitoring framework'
-  s.description = 'A monitoring framework that aims to be simple, malleable, and scalable.'
-  s.license     = 'MIT'
+  s.authors     = ["Sean Porter", "Justin Kolberg"]
+  s.email       = ["portertech@gmail.com", "amdprophet@gmail.com"]
+  s.homepage    = "https://github.com/sensu/sensu"
+  s.summary     = "A monitoring framework"
+  s.description = "A monitoring framework that aims to be simple, malleable, and scalable."
+  s.license     = "MIT"
   s.has_rdoc    = false
 
-  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.4.0')
-  s.add_dependency('sensu-logger', '1.0.0')
-  s.add_dependency('sensu-settings', '1.2.0')
-  s.add_dependency('sensu-extension', '1.0.0')
-  s.add_dependency('sensu-extensions', '1.0.0')
-  s.add_dependency('sensu-transport', '2.4.0')
-  s.add_dependency('sensu-spawn', '1.1.0')
-  s.add_dependency('em-redis-unified', '0.5.0')
-  s.add_dependency('sinatra', '1.3.5')
-  s.add_dependency('async_sinatra', '1.0.0')
-  s.add_dependency('thin', '1.5.0') unless RUBY_PLATFORM =~ /java/
+  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 "eventmachine", "1.0.3"
+  s.add_dependency "sensu-em", "2.4.1"
+  s.add_dependency "sensu-logger", "1.0.0"
+  s.add_dependency "sensu-settings", "1.2.0"
+  s.add_dependency "sensu-extension", "1.1.2"
+  s.add_dependency "sensu-extensions", "1.1.0"
+  s.add_dependency "sensu-transport", "2.4.0"
+  s.add_dependency "sensu-spawn", "1.1.0"
+  s.add_dependency "em-redis-unified", "0.5.0"
+  s.add_dependency "sinatra", "1.3.5"
+  s.add_dependency "async_sinatra", "1.0.0"
+  s.add_dependency "thin", "1.5.0" unless RUBY_PLATFORM =~ /java/
 
-  s.add_development_dependency('rake', '~> 10.3')
-  s.add_development_dependency('rspec', '~> 3.0.0')
-  s.add_development_dependency('em-http-request', '~> 1.1')
+  s.add_development_dependency "rake", "~> 10.3"
+  s.add_development_dependency "rspec", "~> 3.0.0"
+  s.add_development_dependency "em-http-request", "~> 1.1"
 
-  s.files         = Dir.glob('{bin,lib}/**/*') + %w[sensu.gemspec README.md CHANGELOG.md MIT-LICENSE.txt]
-  s.executables   = Dir.glob('bin/**/*').map { |file| File.basename(file) }
-  s.require_paths = ['lib']
+  s.files         = Dir.glob("{bin,lib}/**/*") + %w[sensu.gemspec README.md CHANGELOG.md MIT-LICENSE.txt]
+  s.executables   = Dir.glob("bin/**/*").map { |file| File.basename(file) }
+  s.require_paths = ["lib"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0.beta.1
 platform: java
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -39,18 +39,32 @@ dependencies:
         version: 2.1.4
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: sensu-em
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -87,12 +101,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -101,12 +115,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -224,7 +238,7 @@ dependencies:
 description: A monitoring framework that aims to be simple, malleable, and scalable.
 email:
 - portertech@gmail.com
-- justin.kolberg@sonian.net
+- amdprophet@gmail.com
 executables:
 - sensu-server
 - sensu-client
@@ -236,16 +250,20 @@ files:
 - bin/sensu-client
 - bin/sensu-api
 - lib/sensu.rb
-- lib/sensu/socket.rb
-- lib/sensu/server.rb
 - lib/sensu/constants.rb
-- lib/sensu/client.rb
-- lib/sensu/sandbox.rb
 - lib/sensu/daemon.rb
 - lib/sensu/cli.rb
 - lib/sensu/redis.rb
 - lib/sensu/utilities.rb
-- lib/sensu/api.rb
+- lib/sensu/client/socket.rb
+- lib/sensu/client/process.rb
+- lib/sensu/server/handle.rb
+- lib/sensu/server/socket.rb
+- lib/sensu/server/sandbox.rb
+- lib/sensu/server/process.rb
+- lib/sensu/server/mutate.rb
+- lib/sensu/server/filter.rb
+- lib/sensu/api/process.rb
 - sensu.gemspec
 - README.md
 - CHANGELOG.md
@@ -265,9 +283,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.1.9