sensu-extension 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 941ab203672e43dcfb491dfb58773b4a6736cd09
-  data.tar.gz: 9de1c6b6854722ce87a26834bf3e7ae09c81cc51
+  metadata.gz: 66d4b42c107bd8c3222c6bf9bde3d51416d2994e
+  data.tar.gz: de237f24063a3e5090c5014a0d25b43c85f50010
 SHA512:
-  metadata.gz: 02c4d28bcbf8755a5eef699a27affa19299526cdb89a5942c0b08c7f0e46873175fe9a291f79abbd29fb24f8f981fa554966da20c8d5948dc1d6cb4819b92b7f
-  data.tar.gz: 2381e0dde4d250db42c83ff48e20470626346640250882d32a86b9539e2316a359a111ab9708dc4ba14c5a1e246fb6d5e8ffc95407744fbfd39d0309f84aea1d
+  metadata.gz: da4a0a2de45cb011e69f4a59c4280e62d969d021deeac6ec86f685cea3abecd084c2c266c5e38996b3cba817647b9ec62ce0bda686f40362473ba2e57c564ddf
+  data.tar.gz: 2c997462ea1119b396d7ed561a140c6f7ddd09dd739b808594a9d1bc9fafcacc1ce9253b7d2e173c599c3c2f02f2eb83e8197945cf810b963fb8d99e082c4218

data/lib/sensu/extension.rb

@@ -61,14 +61,12 @@ module Sensu
       # an output string and exit code.
       #
       # @param data [Object, nil] provided by Sensu.
-      # @param options [Hash] provided by Sensu, may contain
-      #   connection objects, eg. redis.
       # @yield [output, status] callback/block provided by Sensu,
       #   expecting to be called with two parameters, an output string
       #   and exit status code.
       # @yieldparam output [String]
       # @yieldparam status [Integer]
-      def run(data=nil, options={})
+      def run(data=nil)
         yield("noop", 0)
       end
 
@@ -97,27 +95,28 @@ module Sensu
       end
 
       # Run the extension with a few safeties. This method wraps
-      # run() with a begin;rescue, and duplicates data before passing
-      # it to ensure the extension doesn't mutate the original. Do
-      # not override this method!
+      # run() with a begin;rescue and determines if the extension
+      # utilizes the provided data (i.e. event data). Do not override
+      # this method!
       #
-      # @param data [Object, nil) to dup() and pass to run(), if run()
-      #   has an absolue arity of 1 or more.
-      # @param options [Hash] to pass to run(), if run() has an
-      #   absolute arity of 2.
+      # @param data [Object, nil) to pass to run(), if run() has an
+      #   absolue arity of 1 or more.
       # @yield [output, status] callback/block provided by Sensu,
       #   expecting to be called with two parameters, an output string
       #   and exit status code.
       # @yieldparam output [String]
       # @yieldparam status [Integer]
-      def safe_run(data=nil, options={})
+      def safe_run(data=nil)
         begin
           @run_arity ||= method(:run).arity.abs
-          arguments = []
-          arguments << (data ? data.dup : data) if @run_arity >= 1
-          arguments << options if @run_arity == 2
-          run(*arguments) do |output, status|
-            yield(output, status)
+          if @run_arity >= 1
+            run(data) do |output, status|
+              yield(output, status)
+            end
+          else
+            run do |output, status|
+              yield(output, status)
+            end
           end
         rescue => error
           klass = error.class.name

data/sensu-extension.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-extension"
-  spec.version       = "1.4.0"
+  spec.version       = "1.5.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu extension library"
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "eventmachine"
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "10.5.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "codeclimate-test-reporter" unless RUBY_VERSION < "1.9"
 end

data/spec/base_spec.rb

@@ -69,19 +69,7 @@ describe "Sensu::Extension::Base" do
     end
   end
 
-  it "can run with options" do
-    async_wrapper do
-      event = {:foo => 1}
-      options = {:test => 1}
-      @extension.run(event, options) do |output, status|
-        expect(output).to eq("noop")
-        expect(status).to eq(0)
-        async_done
-      end
-    end
-  end
-
-  it "can pass duplicated event data to run" do
+  it "can pass event data to run" do
     async_wrapper do
       event = {:foo => 1}
       @extension.safe_run(event) do |output, status|
@@ -92,18 +80,6 @@ describe "Sensu::Extension::Base" do
     end
   end
 
-  it "can pass options to run" do
-    async_wrapper do
-      event = {:foo => 1}
-      options = {:test => 1}
-      @extension.safe_run(event, options) do |output, status|
-        expect(output).to eq("noop")
-        expect(status).to eq(0)
-        async_done
-      end
-    end
-  end
-
   it "can catch some run errors" do
     async_wrapper do
       @extension.safe_run do |output, status|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-extension
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement