Merge pull request #43 from sensu-plugins/pre-release/3.0.0

Pre release/3.0.0

Author: Jef Spaleta

.travis.yml

@@ -4,8 +4,6 @@ cache:
 install:
 - bundle install
 rvm:
-- 2.1
-- 2.2
 - 2.3.0
 - 2.4.1
 notifications:
@@ -26,8 +24,5 @@ deploy:
   on:
     tags: true
     all_branches: true
-    rvm: 2.1
-    rvm: 2.2
-    rvm: 2.3.0
     rvm: 2.4.1
     repo: sensu-plugins/sensu-plugins-java

CHANGELOG.md

@@ -5,6 +5,16 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [3.0.0] - 2020-04-14
+### Breaking Changes
+- `english` 0.6.3 has been yanked - https://rubygems.org/gems/english/versions/0.6.3.
+- Bump minimum required ruby to 2.3
+- Update bundler development dep to `2.1` to match travis environment
+- Update sensu-plugin dep to `~> 4.0`. you can read the changelog entries for [4.0](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#400---2018-02-17)
+- Update rake dep
+- Update robocup dep
+- Update yard dep
+
 ## [2.0.0] - 2018-03-31
 ### Breaking Changes
 - dropped ruby 2.1 support (@yuri-zubov sponsored by Actility, https://www.actility.com)
@@ -88,7 +98,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-java/compare/2.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-java/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/sensu-plugins/sensu-plugins-java/compare/2.0.0...3.0.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-java/compare/1.3.0...2.0.0
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-java/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-java/compare/1.1.0...1.2.0

Rakefile

@@ -27,7 +27,7 @@ desc 'Test for binstubs'
 task :check_binstubs do
   bin_list = Gem::Specification.load('sensu-plugins-java.gemspec').executables
   bin_list.each do |b|
-    `which #{ b }`
+    `which #{b}`
     unless $CHILD_STATUS.success?
       puts "#{b} was not a binstub"
       exit

bin/check-java-permgen.rb

@@ -64,7 +64,7 @@ def run
       exit_code = $CHILD_STATUS.exitstatus
       next if exit_code != 0
 
-      proc_permgen = (pu.to_f / pgcmx.to_f) * 100
+      proc_permgen = (pu / pgcmx.to_f) * 100
       warn_procs << java_proc if proc_permgen > config[:warn].to_f
       crit_procs << java_proc if proc_permgen > config[:crit].to_f
     end

bin/metrics-vertx.rb

@@ -46,7 +46,7 @@ class MetricsVertX < Sensu::Plugin::Metric::CLI::Graphite
 
   def metrics
     response = request
-    JSON.parse(response)
+    ::JSON.parse(response)
   end
 
   def run

lib/sensu-plugins-java/version.rb

@@ -1,6 +1,6 @@
 module SensuPluginsJava
   module Version
-    MAJOR = 2
+    MAJOR = 3
     MINOR = 0
     PATCH = 0
 

sensu-plugins-java.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'date'
@@ -13,32 +13,32 @@ Gem::Specification.new do |s|
   s.files                  = Dir.glob('{bin,lib}/**/*') + %w[LICENSE README.md CHANGELOG.md]
   s.homepage               = 'https://github.com/sensu-plugins/sensu-plugins-java'
   s.license                = 'MIT'
-  s.metadata               = { 'maintainer'         => 'sensu-plugin',
+  s.metadata               = { 'maintainer' => 'sensu-plugin',
                                'development_status' => 'active',
-                               'production_status'  => 'unstable - testing recommended',
-                               'release_draft'      => 'false',
+                               'production_status' => 'unstable - testing recommended',
+                               'release_draft' => 'false',
                                'release_prerelease' => 'false' }
   s.name                   = 'sensu-plugins-java'
   s.platform               = Gem::Platform::RUBY
   s.post_install_message   = 'You can use the embedded Ruby by setting EMBEDDED_RUBY=true in /etc/default/sensu'
   s.require_paths          = ['lib']
-  s.required_ruby_version  = '>= 2.1.0'
+  s.required_ruby_version  = '>= 2.3.0'
   s.summary                = 'Sensu plugins for Java'
   s.test_files             = s.files.grep(%r{^(test|spec|features)/})
   s.version                = SensuPluginsJava::Version::VER_STRING
 
-  s.add_runtime_dependency 'english', '0.6.3'
-  s.add_runtime_dependency 'rest-client', '~> 2.0'
-  s.add_runtime_dependency 'sensu-plugin', '~> 1.2'
+  s.add_runtime_dependency 'english',      '0.7.0'
+  s.add_runtime_dependency 'rest-client',  '~> 2.0'
+  s.add_runtime_dependency 'sensu-plugin', '~> 4.0'
 
-  s.add_development_dependency 'bundler', '~> 1.7'
-  s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
+  s.add_development_dependency 'bundler',                   '~> 2.1'
+  s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
   s.add_development_dependency 'github-markup',             '~> 3.0'
   s.add_development_dependency 'pry',                       '~> 0.10'
-  s.add_development_dependency 'rake',                      '~> 10.5'
+  s.add_development_dependency 'rake',                      '~> 13.0'
   s.add_development_dependency 'redcarpet',                 '~> 3.2'
   s.add_development_dependency 'rspec',                     '~> 3.7'
   s.add_development_dependency 'rspec-mocks',               '~> 3.7'
-  s.add_development_dependency 'rubocop',                   '~> 0.51.0'
-  s.add_development_dependency 'yard',                      '~> 0.9.11'
+  s.add_development_dependency 'rubocop',                   '~> 0.80.1'
+  s.add_development_dependency 'yard',                      '~> 0.9.20'
 end

test/metrics-vertx_spec.rb

@@ -1,6 +1,7 @@
 require_relative './spec_helper.rb'
 require_relative '../bin/metrics-vertx'
 require_relative './fixtures.rb'
+require 'json'
 
 describe 'MetricsVertX' do
   before do

test/spec_helper.rb

@@ -1,2 +1,2 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+# require 'codeclimate-test-reporter'
+# CodeClimate::TestReporter.start