sensu-extension 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 607074c1722556962c92e56472be0f7b4a6ef006
-  data.tar.gz: c6dc6d6d507a031b99dabeefa37466a463d35d7e
+  metadata.gz: 941ab203672e43dcfb491dfb58773b4a6736cd09
+  data.tar.gz: 9de1c6b6854722ce87a26834bf3e7ae09c81cc51
 SHA512:
-  metadata.gz: 67dbbff00a90185156d00284faeafffd7cfb5d11967a1aa15420cec05a0ed60dea5a74c989ef574afebcc9d4598f2e4e5c8d74d445100f95853b0907cad70594
-  data.tar.gz: 6713f063ce4923ff8c91640eaddccd8420b5bc1a14e6bd7c1b3fa6894f5678d6034a77cbde532f42b89e7f5709f4ae27c7b16432bdbc26f37f72a05662cee2eb
+  metadata.gz: 02c4d28bcbf8755a5eef699a27affa19299526cdb89a5942c0b08c7f0e46873175fe9a291f79abbd29fb24f8f981fa554966da20c8d5948dc1d6cb4819b92b7f
+  data.tar.gz: 2381e0dde4d250db42c83ff48e20470626346640250882d32a86b9539e2316a359a111ab9708dc4ba14c5a1e246fb6d5e8ffc95407744fbfd39d0309f84aea1d

data/lib/sensu/extension.rb

@@ -63,10 +63,13 @@ module Sensu
       # @param data [Object, nil] provided by Sensu.
       # @param options [Hash] provided by Sensu, may contain
       #   connection objects, eg. redis.
-      # @param callback [Proc] provided by Sensu, expecting to be
-      #   called with two parameters, an output string and exit code.
-      def run(data=nil, options={}, &callback)
-        callback.call("noop", 0)
+      # @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={})
+        yield("noop", 0)
       end
 
       # Override this method to do something when the eventmachine
@@ -102,18 +105,24 @@ module Sensu
       #   has an absolue arity of 1 or more.
       # @param options [Hash] to pass to run(), if run() has an
       #   absolute arity of 2.
-      # @param callback [Proc] to pass to run().
-      def safe_run(data=nil, options={}, &callback)
+      # @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={})
         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, &callback)
+          run(*arguments) do |output, status|
+            yield(output, status)
+          end
         rescue => error
           klass = error.class.name
           backtrace = error.backtrace.map { |line| "\s\s#{line}" }.join("\n")
-          callback.call("#{klass}: #{error}\n#{backtrace}", 2)
+          yield("#{klass}: #{error}\n#{backtrace}", 2)
         end
       end
 

data/sensu-extension.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-extension"
-  spec.version       = "1.3.0"
+  spec.version       = "1.4.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu extension library"

data/spec/base_spec.rb

@@ -38,6 +38,16 @@ describe "Sensu::Extension::Base" do
   end
 
   it "can run without data" do
+    async_wrapper do
+      @extension.run do |output, status|
+        expect(output).to eq("noop")
+        expect(status).to eq(0)
+        async_done
+      end
+    end
+  end
+
+  it "can run a proc without data" do
     async_wrapper do
       callback = Proc.new do |output, status|
         expect(output).to eq("noop")
@@ -50,26 +60,24 @@ describe "Sensu::Extension::Base" do
 
   it "can run with event data" do
     async_wrapper do
-      callback = Proc.new do |output, status|
+      event = {:foo => 1}
+      @extension.run(event) do |output, status|
         expect(output).to eq("noop")
         expect(status).to eq(0)
         async_done
       end
-      event = {:foo => 1}
-      @extension.run(event, &callback)
     end
   end
 
   it "can run with options" do
     async_wrapper do
-      callback = Proc.new do |output, status|
+      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
-      event = {:foo => 1}
-      options = {:test => 1}
-      @extension.run(event, options, &callback)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-extension
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The Sensu extension library
@@ -127,4 +127,3 @@ test_files:
 - spec/base_spec.rb
 - spec/categories_spec.rb
 - spec/helpers.rb
-has_rdoc: