sensu-plugin 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa20b06e805a4910513f35e0d49e04190c04618
-  data.tar.gz: 875707ed61b5a30a87aa13350f857d6836582fad
+  metadata.gz: 5779d44ecb71e0614dc179fb8ba0db3cd39a3111
+  data.tar.gz: 10795a0823625575f4b1638984a603a65e406eb6
 SHA512:
-  metadata.gz: d7d2b872c3322ccc4e43e56329a54b3e9fba0cdae70ed9fadcadc1276ff82e12108c6bc297e668c81ca97dfb8bcf212903b5cd4192399c2047829de316c93c04
-  data.tar.gz: bee33bfaee01fe9f133c2f92699e80e1bea059117952085afbe3ece721bb7d3072b85742e5204110c6e7966509de03561dc271dfafe094072cd3a6e1d23915a9
+  metadata.gz: b00f35a4eb526215f5c1f13f3732ebb35519491176be7a87495d30279389d4d72b843c1004312fface38633bb5a6d20c9dabb135f99c309a90d3e417ce68d7fc
+  data.tar.gz: 37d95a80143a85142c43b25d7b5651abc71a5fbc6832ee8e2c8350ef443ae8bec75dede44b76541c37082cd24e2b8a30074cfebd4c2dafa16f2387f3ebd5d759

data/lib/sensu-handler.rb

@@ -6,7 +6,6 @@ require 'sensu-plugin/utils'
 require 'mixlib/cli'
 
 module Sensu
-
   class Handler
     include Sensu::Plugin::Utils
     include Mixlib::CLI
@@ -24,22 +23,19 @@ module Sensu
       puts 'ignoring event -- no handler defined'
     end
 
-
     # Filters exit the proccess if the event should not be handled.
     #
     # Filtering events is deprecated and will be removed in a future release.
     #
     def filter
-      if deprecated_filtering_enabled?
-        puts 'warning: event filtering in sensu-plugin is deprecated, see http://bit.ly/sensu-plugin'
-        filter_disabled
-        filter_silenced
-        filter_dependencies
-        if deprecated_occurrence_filtering_enabled?
-          puts 'warning: occurrence filtering in sensu-plugin is deprecated, see http://bit.ly/sensu-plugin'
-          filter_repeated
-        end
-      end
+      return unless deprecated_filtering_enabled?
+      puts 'warning: event filtering in sensu-plugin is deprecated, see http://bit.ly/sensu-plugin'
+      filter_disabled
+      filter_silenced
+      filter_dependencies
+      return unless deprecated_occurrence_filtering_enabled?
+      puts 'warning: occurrence filtering in sensu-plugin is deprecated, see http://bit.ly/sensu-plugin'
+      filter_repeated
     end
 
     # Evaluates whether the event should be processed by any of the
@@ -48,7 +44,7 @@ module Sensu
     #
     # @return [TrueClass, FalseClass]
     def deprecated_filtering_enabled?
-      @event['check'].fetch('enable_deprecated_filtering', false).to_s == "true"
+      @event['check'].fetch('enable_deprecated_filtering', false).to_s == 'true'
     end
 
     # Evaluates whether the event should be processed by the
@@ -57,7 +53,7 @@ module Sensu
     #
     # @return [TrueClass, FalseClass]
     def deprecated_occurrence_filtering_enabled?
-      @event['check'].fetch('enable_deprecated_occurrence_filtering', false).to_s == "true"
+      @event['check'].fetch('enable_deprecated_occurrence_filtering', false).to_s == 'true'
     end
 
     # This works just like Plugin::CLI's autorun.
@@ -65,9 +61,7 @@ module Sensu
     @@autorun = self
     class << self
       def method_added(name)
-        if name == :handle
-          @@autorun = self
-        end
+        @@autorun = self if name == :handle
       end
     end
 
@@ -86,7 +80,7 @@ module Sensu
 
     # Helpers and filters.
 
-    def event_summary(trim_at=100)
+    def event_summary(trim_at = 100)
       summary = @event['check']['notification'] || @event['check']['description']
       if summary.nil?
         source = @event['check']['source'] || @event['client']['name']
@@ -112,8 +106,7 @@ module Sensu
     # @return [Hash]
     def api_settings
       return @api_settings if @api_settings
-      case
-      when ENV['SENSU_API_URL']
+      if ENV['SENSU_API_URL']
         uri = URI(ENV['SENSU_API_URL'])
         @api_settings = {
           'host' => uri.host,
@@ -129,9 +122,9 @@ module Sensu
       @api_settings
     end
 
-    def api_request(method, path, &blk)
+    def api_request(method, path, &_blk)
       if api_settings.nil?
-        raise "api.json settings not found."
+        raise 'api.json settings not found.'
       end
       domain = api_settings['host'].start_with?('http') ? api_settings['host'] : 'http://' + api_settings['host']
       uri = URI("#{domain}:#{api_settings['port']}#{path}")
@@ -140,16 +133,14 @@ module Sensu
         req.basic_auth(api_settings['user'], api_settings['password'])
       end
       yield(req) if block_given?
-      res = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+      res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
         http.request(req)
       end
       res
     end
 
     def filter_disabled
-      if @event['check']['alert'] == false
-        bail 'alert disabled'
-      end
+      bail 'alert disabled' if @event['check']['alert'] == false
     end
 
     def filter_repeated
@@ -169,12 +160,10 @@ module Sensu
       if @event['occurrences'] < occurrences
         bail 'not enough occurrences'
       end
-      if @event['occurrences'] > occurrences && @event['action'] == 'create'
-        number = refresh.fdiv(interval).to_i
-        unless number == 0 || (@event['occurrences'] - occurrences) % number == 0
-          bail 'only handling every ' + number.to_s + ' occurrences'
-        end
-      end
+      return unless @event['occurrences'] > occurrences && @event['action'] == 'create'
+      number = refresh.fdiv(interval).to_i
+      return if number.zero? || ((@event['occurrences'] - occurrences) % number).zero?
+      bail 'only handling every ' + number.to_s + ' occurrences'
     end
 
     def stash_exists?(path)
@@ -207,27 +196,23 @@ module Sensu
     end
 
     def filter_dependencies
-      if @event['check'].has_key?('dependencies')
-        if @event['check']['dependencies'].is_a?(Array)
-          @event['check']['dependencies'].each do |dependency|
-            begin
-              next if dependency.to_s.empty?
-              Timeout.timeout(2) do
-                check, client = dependency.split('/').reverse
-                if event_exists?(client || @event['client']['name'], check)
-                  bail 'check dependency event exists'
-                end
-              end
-            rescue Errno::ECONNREFUSED
-              puts 'connection refused attempting to query the sensu api for an event'
-            rescue Timeout::Error
-              puts 'timed out while attempting to query the sensu api for an event'
+      return unless @event['check'].key?('dependencies')
+      return unless @event['check']['dependencies'].is_a?(Array)
+      @event['check']['dependencies'].each do |dependency|
+        begin
+          next if dependency.to_s.empty?
+          Timeout.timeout(2) do
+            check, client = dependency.split('/').reverse
+            if event_exists?(client || @event['client']['name'], check)
+              bail 'check dependency event exists'
             end
           end
+        rescue Errno::ECONNREFUSED
+          puts 'connection refused attempting to query the sensu api for an event'
+        rescue Timeout::Error
+          puts 'timed out while attempting to query the sensu api for an event'
         end
       end
     end
-
   end
-
 end

data/lib/sensu-mutator.rb

@@ -6,12 +6,12 @@
 # DESCRIPTION:
 #   Base mutator class.  All you need to do is extend this class and implement a
 #   #mutate function.  Uses the autorun feature just like sensu-handler and sensu-plugin/cli
-# 
+#
 # Example Implementation: described https://sensuapp.org/docs/latest/mutators#example-mutator-plugin
 #
 # class Helper < Sensu::Mutator
 #   def mutate
-#     @event.merge!(:mutated => true)
+#     @event.merge!(mutated: true)
 #   end
 # end
 #
@@ -55,9 +55,7 @@ module Sensu
     @@autorun = self
     class << self
       def method_added(name)
-        if name == :mutate
-          @@autorun = self
-        end
+        @@autorun = self if name == :mutate
       end
     end
 
@@ -66,12 +64,11 @@ module Sensu
     end
 
     at_exit do
-      if @@autorun
-        mutator = @@autorun.new
-        mutator.read_event(STDIN)
-        mutator.mutate
-        mutator.dump
-      end
+      return unless @@autorun
+      mutator = @@autorun.new
+      mutator.read_event(STDIN)
+      mutator.mutate
+      mutator.dump
     end
   end
 end

data/lib/sensu-plugin.rb

@@ -1,11 +1,11 @@
 module Sensu
   module Plugin
-    VERSION = "2.1.0"
+    VERSION = '2.2.0'.freeze
     EXIT_CODES = {
       'OK'       => 0,
       'WARNING'  => 1,
       'CRITICAL' => 2,
       'UNKNOWN'  => 3
-    }
+    }.freeze
   end
 end

data/lib/sensu-plugin/check/cli.rb

@@ -4,13 +4,12 @@ module Sensu
   module Plugin
     class Check
       class CLI < Sensu::Plugin::CLI
-
         class << self
-          def check_name(name=nil)
+          def check_name(name = nil)
             if name
               @check_name = name
             else
-              @check_name || self.to_s
+              @check_name || to_s
             end
           end
         end
@@ -19,10 +18,9 @@ module Sensu
           @message = msg
         end
 
-        def output(msg=@message)
-          puts "#{self.class.check_name} #{@status}" + (msg ? ": #{msg}" : "")
+        def output(msg = @message)
+          puts "#{self.class.check_name} #{@status}" + (msg ? ": #{msg}" : '')
         end
-
       end
     end
   end

data/lib/sensu-plugin/cli.rb

@@ -1,5 +1,6 @@
 require 'sensu-plugin'
 require 'mixlib/cli'
+require 'English'
 
 module Sensu
   module Plugin
@@ -8,9 +9,9 @@ module Sensu
 
       attr_accessor :argv
 
-      def initialize(argv=ARGV)
+      def initialize(argv = ARGV)
         super()
-        self.argv = self.parse_options(argv)
+        self.argv = parse_options(argv)
       end
 
       # Implementing classes should override this to produce appropriate
@@ -34,7 +35,7 @@ module Sensu
       # Implementing classes must override this.
 
       def run
-        unknown "Not implemented! You should override Sensu::Plugin::CLI#run."
+        unknown 'Not implemented! You should override Sensu::Plugin::CLI#run.'
       end
 
       # Behind-the-scenes stuff below. If you do something crazy like
@@ -44,14 +45,12 @@ module Sensu
       @@autorun = self
       class << self
         def method_added(name)
-          if name == :run
-            @@autorun = self
-          end
+          @@autorun = self if name == :run
         end
       end
 
       at_exit do
-        exit 3 if $!
+        exit 3 if $ERROR_INFO
         if @@autorun
           begin
             check = @@autorun.new
@@ -61,15 +60,14 @@ module Sensu
           rescue OptionParser::InvalidOption => e
             puts "Invalid check argument(s): #{e.message}, #{e.backtrace}"
             exit 3
-          rescue Exception => e
+          rescue Exception => e # rubocop:disable Lint/RescueException
             # This can't call check.critical, as the check may have failed to construct
             puts "Check failed to run: #{e.message}, #{e.backtrace}"
             exit 3
           end
-          check.warning "Check did not exit! You should call an exit code method."
+          check.warning 'Check did not exit! You should call an exit code method.'
         end
       end
-
     end
   end
 end

data/lib/sensu-plugin/metric/cli.rb

@@ -5,9 +5,8 @@ module Sensu
   module Plugin
     class Metric
       class CLI
-
         class JSON < Sensu::Plugin::CLI
-          def output(obj=nil)
+          def output(obj = nil)
             if obj.is_a?(String) || obj.is_a?(Exception)
               puts obj.to_s
             elsif obj.is_a?(Hash)
@@ -19,13 +18,12 @@ module Sensu
 
         class Graphite < Sensu::Plugin::CLI
           def output(*args)
-            unless args.empty?
-              if args[0].is_a?(Exception) || args[1].nil?
-                puts args[0].to_s
-              else
-                args[2] ||= Time.now.to_i
-                puts args[0..2].join("\s")
-              end
+            return if args.empty?
+            if args[0].is_a?(Exception) || args[1].nil?
+              puts args[0].to_s
+            else
+              args[2] ||= Time.now.to_i
+              puts args[0..2].join("\s")
             end
           end
         end
@@ -40,7 +38,6 @@ module Sensu
             end
           end
         end
-
       end
     end
   end

data/lib/sensu-plugin/utils.rb

@@ -3,7 +3,6 @@ require 'json'
 module Sensu
   module Plugin
     module Utils
-
       def config_files
         if ENV['SENSU_LOADED_TEMPFILE'] && File.file?(ENV['SENSU_LOADED_TEMPFILE'])
           IO.read(ENV['SENSU_LOADED_TEMPFILE']).split(':')
@@ -15,23 +14,23 @@ module Sensu
       end
 
       def load_config(filename)
-        JSON.parse(File.open(filename, 'r').read) rescue Hash.new
+        JSON.parse(File.open(filename, 'r').read)
+      rescue
+        {}
       end
 
       def settings
-        @settings ||= config_files.map {|f| load_config(f) }.reduce {|a, b| deep_merge(a, b) }
+        @settings ||= config_files.map { |f| load_config(f) }.reduce { |a, b| deep_merge(a, b) }
       end
 
       def read_event(file)
-        begin
-          @event = ::JSON.parse(file.read)
-          @event['occurrences'] ||= 1
-          @event['check']       ||= Hash.new
-          @event['client']      ||= Hash.new
-        rescue => e
-          puts 'error reading event: ' + e.message
-          exit 0
-        end
+        @event = ::JSON.parse(file.read)
+        @event['occurrences'] ||= 1
+        @event['check']       ||= {}
+        @event['client']      ||= {}
+      rescue => e
+        puts 'error reading event: ' + e.message
+        exit 0
       end
 
       def net_http_req_class(method)
@@ -50,14 +49,13 @@ module Sensu
       def deep_merge(hash_one, hash_two)
         merged = hash_one.dup
         hash_two.each do |key, value|
-          merged[key] = case
-          when hash_one[key].is_a?(Hash) && value.is_a?(Hash)
-            deep_merge(hash_one[key], value)
-          when hash_one[key].is_a?(Array) && value.is_a?(Array)
-            hash_one[key].concat(value).uniq
-          else
-            value
-          end
+          merged[key] = if hash_one[key].is_a?(Hash) && value.is_a?(Hash)
+                          deep_merge(hash_one[key], value)
+                        elsif hash_one[key].is_a?(Array) && value.is_a?(Array)
+                          hash_one[key].concat(value).uniq
+                        else
+                          value
+                        end
         end
         merged
       end

data/test/cast_bool_value_test.rb

@@ -28,4 +28,4 @@ class TestCastBoolInt < MiniTest::Test
   def test_arbirtrary_string
     assert_equal 'foo', cast_bool_values_int('foo')
   end
-end
+end

data/test/deep_merge_test.rb

@@ -6,22 +6,22 @@ class TestDeepMerge < MiniTest::Test
   include Sensu::Plugin::Utils
 
   def test_hash
-    merged = deep_merge({:a => "a"}, {:b => "b"})
-    assert(merged == {:a => "a", :b => "b"})
+    merged = deep_merge({ a: 'a' }, b: 'b')
+    assert(merged == { a: 'a', b: 'b' })
   end
 
   def test_nested_hash
-    merged = deep_merge({:a => {:b => "c"}}, {:a => {:d => "e"}})
-    assert(merged == {:a => {:b => "c", :d => "e"}})
+    merged = deep_merge({ a: { b: 'c' } }, a: { d: 'e' })
+    assert(merged == { a: { b: 'c', d: 'e' } })
   end
 
   def test_nested_array
-    merged = deep_merge({:a => ["b"]}, {:a => ["c"]})
-    assert(merged, {:a => ["b", "c"]})
+    merged = deep_merge({ a: ['b'] }, a: ['c'])
+    assert(merged, a: %w[b c])
   end
 
   def test_conflicting_types
-    merged = deep_merge({:a => {:b => "c"}}, {:a => ["d"]})
-    assert(merged, {:a => {:b => "c"}})
+    merged = deep_merge({ a: { b: 'c' } }, a: ['d'])
+    assert(merged, a: { b: 'c' })
   end
 end

data/test/external_check_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'English'
 
 class TestCheckExternal < MiniTest::Test
   include SensuPluginTestHelper
@@ -9,53 +10,53 @@ class TestCheckExternal < MiniTest::Test
 
   def test_ok
     run_script '-o'
-    assert $?.exitstatus == 0
+    assert $CHILD_STATUS.success?
   end
 
   def test_warning
     run_script '-w'
-    assert $?.exitstatus == 1
+    assert $CHILD_STATUS.exitstatus == 1
   end
 
   def test_critical
     run_script '-c'
-    assert $?.exitstatus == 2
+    assert $CHILD_STATUS.exitstatus == 2
   end
 
   def test_unknown
     run_script '-u'
-    assert $?.exitstatus == 3
+    assert $CHILD_STATUS.exitstatus == 3
   end
 
   def test_override
     output = run_script '-O'
-    assert $?.exitstatus == 0 && !output.include?('argv =')
+    assert $CHILD_STATUS.success? && !output.include?('argv =')
   end
 
   def test_fallthrough
     run_script
-    assert $?.exitstatus == 1
+    assert $CHILD_STATUS.exitstatus == 1
   end
 
   def test_exception
     output = run_script '-f'
-    assert $?.exitstatus == 3 && output.include?('failed')
+    assert $CHILD_STATUS.exitstatus == 3 && output.include?('failed')
   end
 
   def test_argv
     output = run_script '-o', 'foo'
-    assert $?.exitstatus == 0 && output.include?('argv = foo')
+    assert $CHILD_STATUS.success? && output.include?('argv = foo')
   end
 
   def test_bad_commandline
     output = run_script '--doesnotexist'
-    assert $?.exitstatus == 3 && output.include?('doesnotexist') && output.include?('invalid option')
+    assert $CHILD_STATUS.exitstatus == 3 && output.include?('doesnotexist') && output.include?('invalid option')
   end
 
   def test_bad_require
-    set_script 'external/bad-require' # TODO better way to switch scripts?
+    set_script 'external/bad-require' # TODO: better way to switch scripts?
     output = run_script '2>&1'
-    assert_equal($?.exitstatus, 3)
+    assert_equal($CHILD_STATUS.exitstatus, 3)
     assert_match(/LoadError/, output)
   end
 end

data/test/external_handler_argument_test.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'English'
 require 'minitest/autorun'
 require 'json'
 
@@ -8,18 +9,18 @@ class TestHandlerArgumentExternal < MiniTest::Test
   def test_default
     set_script 'external/handle-argument'
     output = run_script_with_input(JSON.generate({}))
-    assert $?.exitstatus == 0 && output =~ /Value:\sfoo/
+    assert $CHILD_STATUS.success? && output =~ /Value:\sfoo/
   end
 
   def test_short
     set_script 'external/handle-argument -t bar'
     output = run_script_with_input(JSON.generate({}))
-    assert $?.exitstatus == 0 && output =~ /Value:\sbar/
+    assert $CHILD_STATUS.success? && output =~ /Value:\sbar/
   end
 
   def test_long
     set_script 'external/handle-argument --test bar'
     output = run_script_with_input(JSON.generate({}))
-    assert $?.exitstatus == 0 && output =~ /Value:\sbar/
+    assert $CHILD_STATUS.success? && output =~ /Value:\sbar/
   end
 end

data/test/external_handler_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'English'
 require 'json'
 
 class TestHandlerExternal < MiniTest::Test
@@ -12,16 +13,15 @@ class TestHandlerExternal < MiniTest::Test
     event = {
       'client' => { 'name' => 'test' },
       'check' => { 'name' => 'test' },
-      'occurrences' => 1,
+      'occurrences' => 1
     }
     output = run_script_with_input(JSON.generate(event))
-    assert $?.exitstatus == 0 && output =~ /Event:.*test/
+    assert $CHILD_STATUS.success? && output =~ /Event:.*test/
   end
 
   def test_missing_keys
     event = {}
     output = run_script_with_input(JSON.generate(event))
-    assert $?.exitstatus == 0 && output =~ /Event:/
+    assert $CHILD_STATUS.success? && output =~ /Event:/
   end
-
 end

data/test/external_metric_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'English'
 
 class TestMetricExternal < MiniTest::Test
   include SensuPluginTestHelper
@@ -9,9 +10,8 @@ class TestMetricExternal < MiniTest::Test
 
   def test_ok
     output = JSON.parse(run_script)
-    assert $?.exitstatus == 0 && output.key?('timestamp')
+    assert $CHILD_STATUS.success? && output.key?('timestamp')
   end
-
 end
 
 class TestGraphiteMetricExternal < MiniTest::Test
@@ -23,9 +23,8 @@ class TestGraphiteMetricExternal < MiniTest::Test
 
   def test_multi
     lines = run_script.split("\n")
-    assert lines.size == 2 && lines.all? {|line| line.split("\s").size == 3 }
+    assert lines.size == 2 && lines.all? { |line| line.split("\s").size == 3 }
   end
-
 end
 
 class TestStatsdMetricExternal < MiniTest::Test
@@ -43,6 +42,4 @@ class TestStatsdMetricExternal < MiniTest::Test
       assert line.split('|').first.split(':').size == 2
     end
   end
-
 end
-

data/test/handle_filter_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'English'
 require 'tempfile'
 
 class TestFilterExternal < MiniTest::Test
@@ -21,7 +22,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/^not enough occurrences/, output)
   end
 
@@ -38,7 +39,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/^Event:/, output)
   end
 
@@ -55,7 +56,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'resolve'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/^not enough occurrences/, output)
   end
 
@@ -71,7 +72,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'resolve'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/^Event:/, output)
   end
 
@@ -87,7 +88,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/^Event:/, output)
   end
 
@@ -103,7 +104,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/^only handling every/, output)
   end
 
@@ -115,7 +116,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/^Event:/, output)
   end
 
@@ -127,7 +128,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/^Event:/, output)
   end
 
@@ -142,7 +143,7 @@ class TestFilterExternal < MiniTest::Test
       'occurrences' => 1
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/dependency event exists/, output)
   end
 
@@ -158,7 +159,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     refute_match(/#{filter_deprecation_string}/, output)
   end
 
@@ -170,7 +171,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/#{filter_deprecation_string}/, output)
   end
 
@@ -183,10 +184,10 @@ class TestFilterExternal < MiniTest::Test
         'enable_deprecated_filtering' => false
       },
       'occurrences' => 60,
-      'action' => 'create',
+      'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     refute_match(/#{filter_deprecation_string}/, output)
   end
 
@@ -198,7 +199,7 @@ class TestFilterExternal < MiniTest::Test
         'refresh' => 30
       },
       'occurrences' => 60,
-      'action' => 'create',
+      'action' => 'create'
     }
 
     settings_file = Tempfile.new('global_filter_disable')
@@ -207,7 +208,7 @@ class TestFilterExternal < MiniTest::Test
     ENV['SENSU_CONFIG_FILES'] = settings_file.path
     output = run_script_in_env_with_input(JSON.generate(event), ENV)
     ENV['SENSU_CONFIG_FILES'] = nil
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     refute_match(/#{filter_deprecation_string}/, output)
   end
 
@@ -223,7 +224,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     refute_match(/#{occurrence_filter_deprecation_string}/, output)
   end
 
@@ -240,7 +241,7 @@ class TestFilterExternal < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match(/#{occurrence_filter_deprecation_string}/, output)
   end
 
@@ -254,10 +255,10 @@ class TestFilterExternal < MiniTest::Test
         'enable_deprecated_occurrence_filtering' => false
       },
       'occurrences' => 60,
-      'action' => 'create',
+      'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     refute_match(/#{occurrence_filter_deprecation_string}/, output)
   end
 end

data/test/handle_helper_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'English'
 
 class TestHandleHelpers < MiniTest::Test
   include SensuPluginTestHelper
@@ -21,19 +22,19 @@ class TestHandleHelpers < MiniTest::Test
       'action' => 'create'
     }
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match("test/test : test\n", output)
     event['check']['source'] = 'switch-x'
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match("switch-x/test : test\n", output)
     event['check']['description'] = 'y is broken'
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match("y is broken\n", output)
     event['check']['notification'] = 'z is broken'
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_match("z is broken\n", output)
   end
 end

data/test/mutator_test.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'English'
 
 require 'test_helper'
 
@@ -9,7 +10,7 @@ class TestMutatorHelpers < MiniTest::Test
     set_script 'external/mutator-trivial'
     event = JSON.parse(fixture('basic_event.json').read)
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_equal(event, JSON.parse(output))
   end
 
@@ -17,7 +18,7 @@ class TestMutatorHelpers < MiniTest::Test
     set_script 'external/mutator-helpers'
     event = JSON.parse(fixture('basic_event.json').read)
     output = run_script_with_input(JSON.generate(event))
-    assert_equal(0, $?.exitstatus)
+    assert_equal(0, $CHILD_STATUS.exitstatus)
     assert_equal(true, JSON.parse(output)['mutated'])
   end
 end

data/test/test_helper.rb

@@ -7,7 +7,7 @@ module SensuPluginTestHelper
   end
 
   def run_script(*args)
-    IO.popen(([@script] + args).join(' '), 'r+') do |child|
+    IO.popen(([@script] + args).join(' '), 'r+') do |child| # rubocop:disable Style/SymbolProc
       child.read
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugin
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Decklin Foster
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement