sensu-extensions 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32bbc269b7600b4c9cdbbafecf24fe71205afacb
-  data.tar.gz: a4222d5cc6773e0a91a971d497e2ba59b52aedea
+  metadata.gz: b32c7fca1bc576173c52ae95e807c0ac956b80e4
+  data.tar.gz: a48a681d4c47335c25ed8e1fc48e77fc89f05b2c
 SHA512:
-  metadata.gz: b6272b5636078f5bd5cbdef7dc94960e3f24e04248d9618aec29a3ea6fc599b8354bc6a2010c75fb29f50e8aae93ce9b32dcac3710d965740f24c64509570cfe
-  data.tar.gz: 9ea7f181065d86a9036721f351f2e92017244ff55a11346c3f83fbff5947d7888496d42019e91bc9cdfd4001ad61a61aad560cd05809b2423e2f2cf1e640997a
+  metadata.gz: 1df857fbe88e71076e8afe89a3cc82a863c44cc968352d55d0241435fc9bb231c1a293b51f611245ad541ce71d78cad81ee85e8927697dedf37ffe876396144d
+  data.tar.gz: b851603af885525417fb1dec2558aa9cf451fbd926a80f26d1e4d5e20b61e80cb181aa01b5fbb7f97a960a1da4b222e5e137d6af497d46d5db149dd2fd2ff94c

data/.travis.yml

@@ -6,10 +6,11 @@ rvm:
   - 2.2.0
   - 2.2.3
   - 2.3.0
-  - jruby-1.7.23
+  - jruby-9.0.5.0
+before_install:
+  - gem update --system
+  - gem --version
+  - gem install bundler --version 1.11.2
 notifications:
   irc:
     - "irc.freenode.net#sensu"
-addons:
-  code_climate:
-    repo_token: e2001d0db82d5835d76a70d025388fee457bd4243fda3e046097e9d6db28fe5d

data/lib/sensu/extensions.rb

@@ -9,6 +9,7 @@ module Sensu
       # @option options [String] :extension_file to load.
       # @option options [String] :extension_dir to load.
       # @option options [Array] :extension_dirs to load.
+      # @option options [Hash] :extensions to load (gems).
       # @return [Loader] a loaded instance of Loader.
       def load(options={})
         @loader = Loader.new
@@ -23,6 +24,12 @@ module Sensu
             @loader.load_directory(directory)
           end
         end
+        if options[:extensions]
+          options[:extensions].each do |name, details|
+            gem_name = details[:gem] || "#{GEM_PREFIX}#{name}"
+            @loader.load_gem(gem_name, details[:version])
+          end
+        end
         @loader.load_instances
         @loader
       end

data/lib/sensu/extensions/constants.rb

@@ -0,0 +1,8 @@
+module Sensu
+  module Extensions
+    unless defined?(Sensu::Extensions::GEM_PREFIX)
+      # Sensu Extension Rubygem prefix.
+      GEM_PREFIX = "sensu-extensions-".freeze
+    end
+  end
+end

data/lib/sensu/extensions/loader.rb

@@ -1,8 +1,16 @@
+gem "sensu-extensions-occurrences", "1.0.0"
+gem "sensu-extensions-json", "1.0.0"
+gem "sensu-extensions-ruby-hash", "1.0.0"
+gem "sensu-extensions-only-check-output", "1.0.0"
+gem "sensu-extensions-debug", "1.0.0"
+
 require "sensu/extension"
-require "sensu/extensions/mutators/json"
-require "sensu/extensions/mutators/ruby_hash"
-require "sensu/extensions/mutators/only_check_output"
-require "sensu/extensions/handlers/debug"
+require "sensu/extensions/constants"
+require "sensu/extensions/occurrences"
+require "sensu/extensions/json"
+require "sensu/extensions/ruby-hash"
+require "sensu/extensions/only-check-output"
+require "sensu/extensions/debug"
 
 module Sensu
   module Extensions
@@ -15,9 +23,14 @@ module Sensu
       #   @return [Array] loaded extension files.
       attr_reader :loaded_files
 
+      # @!attribute [r] loaded_gems
+      #   @return [Array] loaded extension gems.
+      attr_reader :loaded_gems
+
       def initialize
         @warnings = []
         @loaded_files = []
+        @loaded_gems = []
         @extensions = {}
         Extension::CATEGORIES.each do |category|
           @extensions[category] = {}
@@ -85,6 +98,32 @@ module Sensu
         end
       end
 
+      # Load an extension from a Rubygem.
+      #
+      # @param [String] gem name.
+      def load_gem(raw_gem, version=nil)
+        warning("loading extension gem", :gem => raw_gem, :version => version)
+        begin
+          gem(raw_gem, version) if version
+          if raw_gem.start_with?(GEM_PREFIX)
+            lib = raw_gem.sub(/^#{GEM_PREFIX}/, "")
+            require_path = "sensu/extensions/#{lib}"
+          else
+            require_path = raw_gem
+          end
+          warning("requiring extension gem", :require => require_path)
+          require require_path
+          @loaded_gems << raw_gem
+        rescue ScriptError, StandardError => error
+          warning("failed to require extension", {
+            :gem => raw_gem,
+            :version => version,
+            :error => error
+          })
+          warning("ignoring extension", :gem => raw_gem)
+        end
+      end
+
       # Load instances of the loaded extensions.
       #
       # @param [String] sensu service to load extensions for.

data/sensu-extensions.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-extensions"
-  spec.version       = "1.5.0"
+  spec.version       = "1.6.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu extension loader library"
@@ -19,10 +19,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sensu-logger"
   spec.add_dependency "sensu-settings"
   spec.add_dependency "sensu-extension"
+  spec.add_dependency "sensu-extensions-occurrences", "1.0.0"
+  spec.add_dependency "sensu-extensions-json", "1.0.0"
+  spec.add_dependency "sensu-extensions-ruby-hash", "1.0.0"
+  spec.add_dependency "sensu-extensions-only-check-output", "1.0.0"
+  spec.add_dependency "sensu-extensions-debug", "1.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "sensu-extensions-system-profile", "1.0.0"
   spec.add_development_dependency "bouncy-castle-java" if RUBY_PLATFORM =~ /java/
-  spec.add_development_dependency "codeclimate-test-reporter"
 end

data/spec/extensions_spec.rb

@@ -54,9 +54,22 @@ describe "Sensu::Extensions" do
 
   it "can load the built-in extensions" do
     extensions = Sensu::Extensions.load
+    expect(extensions.filter_exists?("occurrences")).to be(true)
     expect(extensions.mutator_exists?("json")).to be(true)
     expect(extensions.mutator_exists?("ruby_hash")).to be(true)
     expect(extensions.mutator_exists?("only_check_output")).to be(true)
     expect(extensions.handler_exists?("debug")).to be(true)
   end
+
+  it "can load extensions from gems" do
+    options = {
+      :extensions => {
+        "system-profile" => {
+          :version => "1.0.0"
+        }
+      }
+    }
+    extensions = Sensu::Extensions.load(options)
+    expect(extensions.check_exists?("system_profile")).to be(true)
+  end
 end

data/spec/helpers.rb

@@ -4,11 +4,6 @@ require "sensu/logger"
 require "sensu/settings"
 require "securerandom"
 
-unless RUBY_VERSION < "1.9" || RUBY_PLATFORM =~ /java/
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-end
-
 module Helpers
   def timer(delay, &callback)
     periodic_timer = EM::PeriodicTimer.new(delay) do

data/spec/loader_spec.rb

@@ -63,6 +63,7 @@ describe "Sensu::Extensions::Loader" do
     expect(extension).to respond_to(:name, :name_alias, :description, :definition, :safe_run, :stop, :has_key?, :[])
     expect(@loader.handlers).to include(extension.definition)
     expect(@loader.all).to include(extension)
+    expect(@loader.filter_exists?("occurrences")).to be(true)
     expect(@loader.mutator_exists?("json")).to be(true)
     expect(@loader.mutator_exists?("ruby_hash")).to be(true)
     expect(@loader.mutator_exists?("only_check_output")).to be(true)
@@ -99,4 +100,16 @@ describe "Sensu::Extensions::Loader" do
     expect(@loader.mutator_exists?("only_check_output")).to be(true)
     expect(@loader.check_exists?("mock_check")).to be(false)
   end
+
+  it "can load a specific extension from a gem" do
+    @loader.load_gem("sensu-extensions-system-profile", "1.0.0")
+    @loader.load_instances
+    expect(@loader.loaded_gems).to include("sensu-extensions-system-profile")
+    expect(@loader.check_exists?("system_profile")).to be(true)
+    extension = @loader[:checks]["system_profile"]
+    expect(extension).to be_instance_of(Sensu::Extension::SystemProfile)
+    expect(extension).to respond_to(:name, :name_alias, :description, :definition, :safe_run, :stop, :has_key?, :[])
+    expect(@loader.checks).to include(extension.definition)
+    expect(@loader.all).to include(extension)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-extensions
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json
@@ -66,6 +66,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sensu-extensions-occurrences
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sensu-extensions-json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sensu-extensions-ruby-hash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sensu-extensions-only-check-output
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sensu-extensions-debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +179,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: sensu-extensions-system-profile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 description: The Sensu extension loader library
 email:
 - portertech@gmail.com
@@ -136,11 +206,8 @@ files:
 - README.md
 - Rakefile
 - lib/sensu/extensions.rb
-- lib/sensu/extensions/handlers/debug.rb
+- lib/sensu/extensions/constants.rb
 - lib/sensu/extensions/loader.rb
-- lib/sensu/extensions/mutators/json.rb
-- lib/sensu/extensions/mutators/only_check_output.rb
-- lib/sensu/extensions/mutators/ruby_hash.rb
 - sensu-extensions.gemspec
 - spec/assets/config.json
 - spec/assets/extensions/error.rb
@@ -149,12 +216,8 @@ files:
 - spec/assets/extensions/test.rb
 - spec/assets/extensions_symlinked/symlinked_check.rb
 - spec/extensions_spec.rb
-- spec/handlers/debug_spec.rb
 - spec/helpers.rb
 - spec/loader_spec.rb
-- spec/mutators/json_spec.rb
-- spec/mutators/only_check_output_spec.rb
-- spec/mutators/ruby_hash_spec.rb
 homepage: https://github.com/sensu/sensu-extensions
 licenses:
 - MIT
@@ -175,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: The Sensu extension loader library
@@ -187,9 +250,5 @@ test_files:
 - spec/assets/extensions/test.rb
 - spec/assets/extensions_symlinked/symlinked_check.rb
 - spec/extensions_spec.rb
-- spec/handlers/debug_spec.rb
 - spec/helpers.rb
 - spec/loader_spec.rb
-- spec/mutators/json_spec.rb
-- spec/mutators/only_check_output_spec.rb
-- spec/mutators/ruby_hash_spec.rb

data/lib/sensu/extensions/handlers/debug.rb

@@ -1,19 +0,0 @@
-require "sensu/extension"
-
-module Sensu
-  module Extension
-    class Debug < Handler
-      def name
-        "debug"
-      end
-
-      def description
-        "returns raw event data"
-      end
-
-      def run(event)
-        yield event, 0
-      end
-    end
-  end
-end

data/lib/sensu/extensions/mutators/json.rb

@@ -1,20 +0,0 @@
-require "sensu/extension"
-require "sensu/json"
-
-module Sensu
-  module Extension
-    class Json < Mutator
-      def name
-        "json"
-      end
-
-      def description
-        "returns JSON formatted event data"
-      end
-
-      def run(event)
-        yield Sensu::JSON.dump(event), 0
-      end
-    end
-  end
-end

data/lib/sensu/extensions/mutators/only_check_output.rb

@@ -1,19 +0,0 @@
-require "sensu/extension"
-
-module Sensu
-  module Extension
-    class OnlyCheckOutput < Mutator
-      def name
-        "only_check_output"
-      end
-
-      def description
-        "returns check output"
-      end
-
-      def run(event)
-        yield event[:check][:output], 0
-      end
-    end
-  end
-end

data/lib/sensu/extensions/mutators/ruby_hash.rb

@@ -1,19 +0,0 @@
-require "sensu/extension"
-
-module Sensu
-  module Extension
-    class RubyHash < Mutator
-      def name
-        "ruby_hash"
-      end
-
-      def description
-        "returns ruby hash event data"
-      end
-
-      def run(event)
-        yield event, 0
-      end
-    end
-  end
-end

data/spec/handlers/debug_spec.rb

@@ -1,24 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers")
-require "sensu/extensions/handlers/debug"
-
-describe "Sensu::Extension::Debug" do
-  include Helpers
-
-  before do
-    @extension = Sensu::Extension::Debug.new
-  end
-
-  it "can run, returning raw event data" do
-    event = {
-      :client => {},
-      :check => {
-        :output => "foo",
-        :status => 0
-      }
-    }
-    @extension.safe_run(event) do |output, status|
-      expect(output).to eq(event)
-      expect(status).to eq(0)
-    end
-  end
-end

data/spec/mutators/json_spec.rb

@@ -1,24 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers")
-require "sensu/extensions/mutators/json"
-
-describe "Sensu::Extension::Json" do
-  include Helpers
-
-  before do
-    @extension = Sensu::Extension::Json.new
-  end
-
-  it "can run, returning JSON event data" do
-    event = {
-      :client => {},
-      :check => {
-        :output => "foo",
-        :status => 0
-      }
-    }
-    @extension.safe_run(event) do |output, status|
-      expect(output).to eq(Sensu::JSON.dump(event))
-      expect(status).to eq(0)
-    end
-  end
-end

data/spec/mutators/only_check_output_spec.rb

@@ -1,24 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers")
-require "sensu/extensions/mutators/only_check_output"
-
-describe "Sensu::Extension::OnlyCheckOutput" do
-  include Helpers
-
-  before do
-    @extension = Sensu::Extension::OnlyCheckOutput.new
-  end
-
-  it "can run, returning only check output" do
-    event = {
-      :client => {},
-      :check => {
-        :output => "foo",
-        :status => 0
-      }
-    }
-    @extension.safe_run(event) do |output, status|
-      expect(output).to eq("foo")
-      expect(status).to eq(0)
-    end
-  end
-end

data/spec/mutators/ruby_hash_spec.rb

@@ -1,24 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers")
-require "sensu/extensions/mutators/ruby_hash"
-
-describe "Sensu::Extension::RubyHash" do
-  include Helpers
-
-  before do
-    @extension = Sensu::Extension::RubyHash.new
-  end
-
-  it "can run, returning event data as a ruby hash" do
-    event = {
-      :client => {},
-      :check => {
-        :output => "foo",
-        :status => 0
-      }
-    }
-    @extension.safe_run(event) do |output, status|
-      expect(output).to eq(event)
-      expect(status).to eq(0)
-    end
-  end
-end