Merge pull request #19 from sensu-plugins/bonsai

Todd Campbell · web-flow · commit 32c8ff88deda · 2020-08-05T12:54:50.000-04:00
Updates and Bonsai support
diff --git a/.bonsai.yml b/.bonsai.yml
@@ -0,0 +1,56 @@
+---
+description: "#{repo}"
+builds:
+- platform: "alpine"
+  arch: "amd64"
+  asset_filename: "#{repo}_#{version}_alpine_linux_amd64.tar.gz"
+  sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
+  filter:
+  -  "entity.system.os == 'linux'"
+  -  "entity.system.arch == 'amd64'"
+  -  "entity.system.platform == 'alpine'"
+  -  "entity.system.platform_version.split('.')[0] == '3'"
+- platform: "alpine3.8"
+  arch: "amd64"
+  asset_filename: "#{repo}_#{version}_alpine3.8_linux_amd64.tar.gz"
+  sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
+  filter:
+  -  "entity.system.os == 'linux'"
+  -  "entity.system.arch == 'amd64'"
+  -  "entity.system.platform == 'alpine'"
+- platform: "centos6"
+  arch: "amd64"
+  asset_filename: "#{repo}_#{version}_centos6_linux_amd64.tar.gz"
+  sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
+  filter:
+  -  "entity.system.os == 'linux'"
+  -  "entity.system.arch == 'amd64'"
+  -  "entity.system.platform_family == 'rhel'"
+  -  "entity.system.platform_version.split('.')[0] == '6'"
+- platform: "centos7"
+  arch: "amd64"
+  asset_filename: "#{repo}_#{version}_centos7_linux_amd64.tar.gz"
+  sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
+  filter:
+  -  "entity.system.os == 'linux'"
+  -  "entity.system.arch == 'amd64'"
+  -  "entity.system.platform_family == 'rhel'"
+  -  "entity.system.platform_version.split('.')[0] == '7'"
+- platform: "debian"
+  arch: "amd64"
+  asset_filename: "#{repo}_#{version}_debian_linux_amd64.tar.gz"
+  sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
+  filter:
+  -  "entity.system.os == 'linux'"
+  -  "entity.system.arch == 'amd64'"
+  -  "entity.system.platform_family == 'debian'"
+- platform: "debian9"
+  arch: "amd64"
+  asset_filename: "#{repo}_#{version}_debian9_linux_amd64.tar.gz"
+  sha_filename: "#{repo}_#{version}_sha512-checksums.txt"
+  filter:
+  -  "entity.system.os == 'linux'"
+  -  "entity.system.arch == 'amd64'"
+  -  "entity.system.platform_family == 'debian'"
+  -  "entity.system.platform_version.split('.')[0] == '9'"
+
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,30 +1,46 @@
 
-MethodLength:
+Metrics/MethodLength:
   Max: 200
 
-LineLength:
+Layout/LineLength:
   Max: 160
 
-AbcSize:
+Metrics/AbcSize:
   Max: 100
 
-FileName:
+Naming/FileName:
   Enabled: false
 
-PerceivedComplexity:
+Metrics/PerceivedComplexity:
   Enabled: false
 
-CyclomaticComplexity:
+Metrics/CyclomaticComplexity:
   Enabled: false
 
-ClassLength:
+Metrics/ClassLength:
   Enabled: false
 
-IfUnlessModifier:
+Style/IfUnlessModifier:
   Enabled: false
 
-RegexpLiteral:
+Style/RegexpLiteral:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,11 @@
 language: ruby
+services:
+- docker
 cache:
 - bundler
-before_install: gem install bundler -v 1.15
 install:
 - bundle install
 rvm:
-- 2.0
-- 2.1
-- 2.2
 - 2.3.0
 - 2.4.1
 notifications:
@@ -20,17 +18,23 @@ script:
 - gem build sensu-plugins-systemd.gemspec
 - gem install sensu-plugins-systemd-*.gem
 - bundle exec rake default
+before_deploy:
+- bash -c "[ ! -d bonsai/ ] && git clone https://github.com/sensu/sensu-go-bonsai-asset.git bonsai || echo 'bonsai/ exists, skipping git clone'"
 deploy:
-  provider: rubygems
+- provider: script
+  script: bonsai/ruby-runtime/travis-build-ruby-plugin-assets.sh sensu-plugins-hardware
+  skip_cleanup: true
+  on:
+    tags: true
+    all_branches: true
+    rvm: 2.4.1
+- provider: rubygems
   api_key:
     secure: Hf1ZRHiWtWvOlcoLmcFJSql688r7s8CkTRUO5FYvUBjJE/x/P2+UDFONcYzycEAkLXzv9MIMXHO8vZ2m5rVSqbiP055+MtzRnukO2OaF2Ke0vYCuArOxj/LvhKAuLJRVNYbD138MltCnqUMjU2Ks4b4Z/wtHqSkbOoBsyTwwpYq0HiCbQyGNkacGzMZ44vnPR3cS0TrljjwYhnn1gDKkEkQf1p3iNrmIIapspU64U36KsxaGccFiXo2YSI9vBY+kssfGIOB5YAXoFHQ3YqdTpGMy7Q587IttlIlPQwhvYvK9lCZMZSCxmaZMGq2zy+3ttKe9CEejPGAtaPkiYrmmuM1hZUgQDk94znsTitpZxX5vlFMv5BUnxiOHcL+aQKFG4DlTj7KD+7a0BPb3AbUeD2njql6elCXiGeqzKgjS5x9W7WDZdoMj8VdQWzs+hh98C9yY5DDipp13yGJ3gqzKmKRbaHXUA9wLY4ic0022+ZwxCKX5TKqjOAi8WmQSCG19r+/uIaFY5MeTE7wrsuA0oSWM5YA9UaJNf5WbpUpC9tLG2owvAOjtEwhBBS9EijhiME8ABKBqp/RWJYqrj8PDrucDYLm2pB2PzlLKqs/+UQ//Rh4U/TKRLdWBrCevVr5hw6TLRl5ThoEjL1heqHsoH3X51rhtt3MBleYkawn37jg=
   gem: sensu-plugins-systemd
   on:
     tags: true
     all_branches: true
-    rvm: 2.0
-    rvm: 2.1
-    rvm: 2.2
     rvm: 2.3.0
     rvm: 2.4.1
     repo: sensu-plugins/sensu-plugins-systemd
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,20 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+### Breaking Changes
+- Update minimum required ruby version to 2.3. Drop unsupported ruby versions.
+- Bump `sensu-plugin` dependency from `~> 1.2` to `~> 4.0`
+
+### Added
+- Bonsai asset support
+### Changed
+- Updated bundler dependancy to '~> 2.1'
+- Updated rubocop dependency to '~> 0.81.0'
+- Remediated rubocop issues
+- Updated codeclimate-test-reporter to '~> 1.0'
+- Updated rake dependency to '~> 13.0'
+- Updated github-markup to '~> 3.0'
+
 ## [0.1.0] - 2017-09-10
 ### Added
 - missing changelog entries (@majormoses)
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'github/markup'
 require 'redcarpet'
@@ -28,7 +30,7 @@ task :check_binstubs do
   unless Dir.glob('bin/**/*.rb').empty?
     bin_list = Gem::Specification.load('sensu-plugins-systemd.gemspec').executables
     bin_list.each do |b|
-      `which #{ b }`
+      `which #{b}`
       unless $CHILD_STATUS.success?
         puts "#{b} was not a binstub"
         exit
diff --git a/bin/check-systemd.rb b/bin/check-systemd.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   check-systemd.rb
 #
@@ -54,6 +56,7 @@ def unit_services
     systemd_output.split("\n").each do |line|
       line_array = line.split(' ')
       next unless @services.any? { |service| line_array[0].include?(service) }
+
       service_hash = {}
       service_hash['name'] = line_array[0]
       service_hash['load'] = line_array[1]
diff --git a/lib/sensu-plugins-systemd.rb b/lib/sensu-plugins-systemd.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 
 require 'sensu-plugins-systemd/version'
diff --git a/lib/sensu-plugins-systemd/version.rb b/lib/sensu-plugins-systemd/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SensuPluginsSystemd
   module Version
     MAJOR = 0
diff --git a/sensu-plugins-systemd.gemspec b/sensu-plugins-systemd.gemspec
@@ -1,46 +1,43 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'date'
+require_relative 'lib/sensu-plugins-systemd'
 
-if RUBY_VERSION < '2.0.0'
-  require 'sensu-plugins-systemd'
-else
-  require_relative 'lib/sensu-plugins-systemd'
-end
-
-Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
-  s.name          = 'sensu-plugins-systemd'
-  s.version       = SensuPluginsSystemd::Version::VER_STRING
-  s.platform      = Gem::Platform::RUBY
-  s.authors       = ['mickfeech and contributors']
-  s.date          = Date.today.to_s
-  s.email         = [
+Gem::Specification.new do |s|
+  s.name                  = 'sensu-plugins-systemd'
+  s.version               = SensuPluginsSystemd::Version::VER_STRING
+  s.platform              = Gem::Platform::RUBY
+  s.authors               = ['mickfeech and contributors']
+  s.email                 = [
     'cmcfee@kent.edu',
     '<sensu-users@googlegroups.com>'
   ]
-  s.executables   = Dir.glob('bin/**/*.rb').map { |file| File.basename(file) }
-  s.homepage      = 'https://github.com/mickfeech/sensu-plugins-systemd'
-  s.summary       = 'This provides functionality to check systemd services.'
-  s.description   = 'Plugins to provide functionality to check systemd services for Sensu, a monitoring framework'
-  s.license       = 'MIT'
-  s.has_rdoc      = false
-  s.require_paths = ['lib']
-  s.files         = Dir.glob('{bin,lib}/**/*') + %w[LICENSE README.md CHANGELOG.md]
+  s.executables           = Dir.glob('bin/**/*.rb').map { |file| File.basename(file) }
+  s.homepage              = 'https://github.com/mickfeech/sensu-plugins-systemd'
+  s.summary               = 'This provides functionality to check systemd services.'
+  s.description           = 'Plugins to provide functionality to check systemd services for Sensu, a monitoring framework'
+  s.license               = 'MIT'
+  s.has_rdoc              = false
+  s.require_paths         = ['lib']
+  s.required_ruby_version = '>= 2.3'
+  s.files                 = Dir.glob('{bin,lib}/**/*') + %w[LICENSE README.md CHANGELOG.md]
   # s.test_files    = Dir['test/*.rb']
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.test_files            = s.files.grep(%r{^(test|spec|features)/})
 
-  s.add_runtime_dependency 'sensu-plugin', '~> 1.2'
+  s.add_runtime_dependency 'sensu-plugin', '~> 4.0'
   # s.add_dependency('json')
   # s.add_dependency('mixlib-cli', '>= 1.5.0')
 
-  s.add_development_dependency 'bundler',                   '~> 1.7'
-  s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
-  s.add_development_dependency 'github-markup',             '~> 1.3'
+  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 'rubocop',                   '~> 0.37'
   s.add_development_dependency 'rspec',                     '~> 3.4'
+  s.add_development_dependency 'rubocop',                   '~> 0.81.0'
   s.add_development_dependency 'yard',                      '~> 0.8'
 end

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 +# frozen_string_literal: true
++
 source 'https://rubygems.org'
 gemspec
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`#! /usr/bin/env ruby`
	`2`	`+# frozen_string_literal: false`
	`3`	`+`
`2`	`4`	`#`
`3`	`5`	`# check-systemd.rb`
`4`	`6`	`#`
`@@ -54,6 +56,7 @@ def unit_services`
`54`	`56`	`systemd_output.split("\n").each do \|line\|`
`55`	`57`	`line_array = line.split(' ')`
`56`	`58`	`next unless @services.any? { \|service\| line_array[0].include?(service) }`
	`59`	`+`
`57`	`60`	`service_hash = {}`
`58`	`61`	`service_hash['name'] = line_array[0]`
`59`	`62`	`service_hash['load'] = line_array[1]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+# frozen_string_literal: true`
`1`	`2`
`2`	`3`	`require 'sensu-plugins-systemd/version'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`module SensuPluginsSystemd`
`2`	`4`	`module Version`
`3`	`5`	`MAJOR = 0`