Merge branch 'dependabot/bundler/serverspec-tw-2.41.5' of github.com:sensu-plugins/sensu-plugins-postgres into dependabot/bundler/serverspec-tw-2.41.5

Jef Spaleta · Jef Spaleta · commit c5d2f8ec10be · 2020-01-06T23:22:41.000-09:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,3 +1,5 @@
+AllCops:
+  TargetRubyVersion: 2.4
 
 MethodLength:
   Max: 200
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,12 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ## [Unreleased]
 ### Changes
 - Updated development dependency to bundler ~> 2.1
+- Updated development dependency to rake ~> 13.0 
 - Updated runtime dependency to 'pg' '1.2.1' from 1.1   
+- Updated runtime dependency 'dentaku' '3.3.4' from 2.04
 
+### Breaking Changes
+- Update `sensu-plugin` dependency from `~> 1.2` 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), [3.0](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#300---2018-12-04), and [2.0](https://github.com/sensu-plugins/sensu-plugin/blob/master/CHANGELOG.md#v200---2017-03-29)
 
 ## [3.0.0] - 2019-11-20
 ### Breaking Changes
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sensu-plugins-postgres.gemspec
diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'github/markup'
 require 'redcarpet'
@@ -29,7 +31,7 @@ desc 'Test for binstubs'
 task :check_binstubs do
   bin_list = Gem::Specification.load('sensu-plugins-postgres.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-postgres-alive.rb b/bin/check-postgres-alive.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-postgres-alive
 #
@@ -86,6 +88,6 @@ def run
   rescue PG::Error => e
     critical "Error message: #{e.error.split("\n").first}"
   ensure
-    con.close if con
+    con&.close
   end
 end
diff --git a/bin/check-postgres-connections.rb b/bin/check-postgres-connections.rb
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # check-postgres-connections
 #
@@ -114,7 +116,7 @@ def run
       unknown "Unable to query PostgreSQL: #{e.message}"
     end
 
-    percent = (current_conns.to_f / max_conns.to_f * 100).to_i
+    percent = (current_conns / max_conns.to_f * 100).to_i
 
     if config[:use_percentage]
       message = "PostgreSQL connections at #{percent}%, #{current_conns} out of #{available_conns} connections"
diff --git a/bin/check-postgres-query.rb b/bin/check-postgres-query.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # check-postgres-query
 #
diff --git a/bin/check-postgres-replication.rb b/bin/check-postgres-replication.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-postgres-replication
 #
diff --git a/bin/metric-postgres-connections.rb b/bin/metric-postgres-connections.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metric-postgres-connections
 #
@@ -81,12 +83,12 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     dbname: config[:database],
+                     user: config[:user],
+                     password: config[:password],
+                     port: config[:port],
+                     connect_timeout: config[:timeout])
     request = [
       "select case when count(*) = 1 then 'waiting' else",
       "'case when wait_event_type is null then false else true end' end as wait_col",
diff --git a/bin/metric-postgres-dbsize.rb b/bin/metric-postgres-dbsize.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metric-postgres-dbsize
 #
@@ -81,12 +83,12 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     dbname: config[:database],
+                     user: config[:user],
+                     password: config[:password],
+                     port: config[:port],
+                     connect_timeout: config[:timeout])
     request = [
       "select pg_database_size('#{config[:database]}')"
     ]
diff --git a/bin/metric-postgres-graphite.rb b/bin/metric-postgres-graphite.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metric-postgres-graphite
 #
diff --git a/bin/metric-postgres-locks.rb b/bin/metric-postgres-locks.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metric-postgres-locks
 #
@@ -83,12 +85,12 @@ def run
 
     locks_per_type = Hash.new(0)
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     dbname: config[:database],
+                     user: config[:user],
+                     password: config[:password],
+                     port: config[:port],
+                     connect_timeout: config[:timeout])
     request = [
       'SELECT mode, count(mode) AS count FROM pg_locks',
       "WHERE database = (SELECT oid FROM pg_database WHERE datname = '#{config[:database]}')",
diff --git a/bin/metric-postgres-statsbgwriter.rb b/bin/metric-postgres-statsbgwriter.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metric-postgres-statsbgwriter
 #
@@ -76,12 +78,12 @@ class PostgresStatsDBMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: 'postgres',
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     dbname: 'postgres',
+                     user: config[:user],
+                     password: config[:password],
+                     port: config[:port],
+                     connect_timeout: config[:timeout])
     request = [
       'select checkpoints_timed, checkpoints_req,',
       'checkpoint_write_time, checkpoint_sync_time,',
diff --git a/bin/metric-postgres-statsdb.rb b/bin/metric-postgres-statsdb.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metric-postgres-statsdb
 #
diff --git a/bin/metric-postgres-statsio.rb b/bin/metric-postgres-statsio.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metric-postgres-statsio
 #
@@ -88,12 +90,12 @@ class PostgresStatsIOMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     dbname: config[:database],
+                     user: config[:user],
+                     password: config[:password],
+                     port: config[:port],
+                     connect_timeout: config[:timeout])
     request = [
       'select sum(heap_blks_read) as heap_blks_read, sum(heap_blks_hit) as heap_blks_hit,',
       'sum(idx_blks_read) as idx_blks_read, sum(idx_blks_hit) as idx_blks_hit,',
diff --git a/bin/metric-postgres-statstable.rb b/bin/metric-postgres-statstable.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metric-postgres-statstable
 #
@@ -88,12 +90,12 @@ class PostgresStatsTableMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def run
     timestamp = Time.now.to_i
     pgpass
-    con     = PG.connect(host: config[:hostname],
-                         dbname: config[:database],
-                         user: config[:user],
-                         password: config[:password],
-                         port: config[:port],
-                         connect_timeout: config[:timeout])
+    con = PG.connect(host: config[:hostname],
+                     dbname: config[:database],
+                     user: config[:user],
+                     password: config[:password],
+                     port: config[:port],
+                     connect_timeout: config[:timeout])
     request = [
       'select sum(seq_scan) as seq_scan, sum(seq_tup_read) as seq_tup_read,',
       'sum(idx_scan) as idx_scan, sum(idx_tup_fetch) as idx_tup_fetch,',
diff --git a/bin/metrics-postgres-query.rb b/bin/metrics-postgres-query.rb
@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # metrics-postgres-query
 #
@@ -114,7 +116,7 @@ def run
     value = if config[:count_tuples]
               res.ntuples
             else
-              res.first.values.first unless res.first.nil?
+              res.first&.values&.first
             end
 
     if config[:multirow] && !config[:count_tuples]
diff --git a/lib/sensu-plugins-postgres.rb b/lib/sensu-plugins-postgres.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'sensu-plugins-postgres/version'
 require 'sensu-plugins-postgres/pgpass'
diff --git a/lib/sensu-plugins-postgres/pgpass.rb b/lib/sensu-plugins-postgres/pgpass.rb
@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Pgpass
   def read_pgpass(pg_pass_file)
     File.readlines(pg_pass_file).each do |line|
       return line.strip.split(':') unless line.start_with?('#')
+
       next
     end
   end
diff --git a/lib/sensu-plugins-postgres/pgutil.rb b/lib/sensu-plugins-postgres/pgutil.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PgUtil
   def check_vsn_newer_than_postgres9(conn)
     pg_vsn = conn.exec("SELECT current_setting('server_version')").getvalue(0, 0)
diff --git a/lib/sensu-plugins-postgres/version.rb b/lib/sensu-plugins-postgres/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SensuPluginsPostgres
   module Version
     MAJOR = 3
diff --git a/sensu-plugins-postgres.gemspec b/sensu-plugins-postgres.gemspec
@@ -1,10 +1,12 @@
-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-postgres'
 
-Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |s|
   s.authors                = ['Sensu-Plugins and contributors']
 
   s.date                   = Date.today.to_s
@@ -19,10 +21,10 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.files                  = Dir.glob('{bin,lib}/**/*') + %w[LICENSE README.md CHANGELOG.md]
   s.homepage               = 'https://github.com/sensu-plugins/sensu-plugins-postgres'
   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-postgres'
   s.platform               = Gem::Platform::RUBY
@@ -34,9 +36,9 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.test_files             = s.files.grep(%r{^(test|spec|features)/})
   s.version                = SensuPluginsPostgres::Version::VER_STRING
 
-  s.add_runtime_dependency 'sensu-plugin', '~> 1.2'
+  s.add_runtime_dependency 'sensu-plugin', '~> 4.0'
 
-  s.add_runtime_dependency 'dentaku',      '2.0.4'
+  s.add_runtime_dependency 'dentaku',      '3.3.4'
   s.add_runtime_dependency 'pg',           '1.2.1'
 
   s.add_development_dependency 'bundler',                   '~> 2.1'
@@ -46,10 +48,10 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.add_development_dependency 'kitchen-localhost',         '~> 0.3'
   s.add_development_dependency 'mixlib-shellout',           '~> 2.4'
   s.add_development_dependency 'pry',                       '~> 0.10'
-  s.add_development_dependency 'rake',                      '~> 12.3'
+  s.add_development_dependency 'rake',                      '~> 13.0'
   s.add_development_dependency 'redcarpet',                 '~> 3.2'
   s.add_development_dependency 'rspec',                     '~> 3.1'
-  s.add_development_dependency 'rubocop',                   '~> 0.49.0'
+  s.add_development_dependency 'rubocop',                   '~> 0.79.0'
   s.add_development_dependency 'serverspec',                '~> 2.41.5'
   s.add_development_dependency 'test-kitchen',              '~> 1.16.0'
   s.add_development_dependency 'yard',                      '~> 0.9.11'

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+AllCops:`
	`2`	`+ TargetRubyVersion: 2.4`
`1`	`3`
`2`	`4`	`MethodLength:`
`3`	`5`	`Max: 200`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`source 'https://rubygems.org'`
`2`	`4`
`3`	`5`	`# Specify your gem's dependencies in sensu-plugins-postgres.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: true`
	`3`	`+`
`2`	`4`	`#`
`3`	`5`	`# check-postgres-alive`
`4`	`6`	`#`
`@@ -86,6 +88,6 @@ def run`
`86`	`88`	`rescue PG::Error => e`
`87`	`89`	`critical "Error message: #{e.error.split("\n").first}"`
`88`	`90`	`ensure`
`89`		`- con.close if con`
	`91`	`+ con&.close`
`90`	`92`	`end`
`91`	`93`	`end`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`#!/usr/bin/env ruby`
	`2`	`+# frozen_string_literal: true`
	`3`	`+`
`2`	`4`	`#`
`3`	`5`	`# check-postgres-connections`
`4`	`6`	`#`
`@@ -114,7 +116,7 @@ def run`
`114`	`116`	`unknown "Unable to query PostgreSQL: #{e.message}"`
`115`	`117`	`end`
`116`	`118`
`117`		`- percent = (current_conns.to_f / max_conns.to_f * 100).to_i`
	`119`	`+ percent = (current_conns / max_conns.to_f * 100).to_i`
`118`	`120`
`119`	`121`	`if config[:use_percentage]`
`120`	`122`	`message = "PostgreSQL connections at #{percent}%, #{current_conns} out of #{available_conns} connections"`