From 80248b075207c159b4426e192fa939ed8ae798fb Mon Sep 17 00:00:00 2001 From: Nicole Landskroener Date: Sun, 21 Jan 2018 17:27:22 -0800 Subject: [PATCH 1/4] Update Rubocop to v0.52.1 for cve --- sensu-plugins-zendesk.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensu-plugins-zendesk.gemspec b/sensu-plugins-zendesk.gemspec index 8d3d639..6e1dc09 100644 --- a/sensu-plugins-zendesk.gemspec +++ b/sensu-plugins-zendesk.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'pry', '~> 0.10' s.add_development_dependency 'rake', '~> 10.5' s.add_development_dependency 'redcarpet', '~> 3.2' - s.add_development_dependency 'rubocop', '~> 0.40.0' + s.add_development_dependency 'rubocop', '~> 0.52.1' s.add_development_dependency 'rspec', '~> 3.4' s.add_development_dependency 'yard', '~> 0.8' end From 7f1d275dd10b740959b9eb2e34d98d841dd3cbca Mon Sep 17 00:00:00 2001 From: Nicole Landskroener Date: Sun, 21 Jan 2018 17:57:53 -0800 Subject: [PATCH 2/4] Update Rubopcop to v0.52.1 for cve Fix Rubocop errors in Rakefile --- CHANGELOG.md | 5 +++++ Rakefile | 6 +++--- bin/handler-zendesk.rb | 2 +- sensu-plugins-zendesk.gemspec | 10 +++++----- 4 files changed, 14 insertions(+), 9 deletions(-) mode change 100644 => 100755 bin/handler-zendesk.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index e04285f..3f6c0fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/). This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/) ## [Unreleased] + +## [1.1.0] - 2018-01-21 +### Changed +Bumped Rubocop to v0.52.1 for CVE 2017-8418 (@nicoleheejin) + ### Added - Ruby 2.4.1 testing diff --git a/Rakefile b/Rakefile index b2727db..a5fd291 100644 --- a/Rakefile +++ b/Rakefile @@ -7,9 +7,9 @@ require 'yard' require 'yard/rake/yardoc_task' YARD::Rake::YardocTask.new do |t| - OTHER_PATHS = %w().freeze + OTHER_PATHS = %w[].freeze t.files = ['lib/**/*.rb', 'bin/**/*.rb', OTHER_PATHS] - t.options = %w(--markup-provider=redcarpet --markup=markdown --main=README.md --files CHANGELOG.md) + t.options = %w[--markup-provider=redcarpet --markup=markdown --main=README.md --files CHANGELOG.md] end RuboCop::RakeTask.new @@ -35,4 +35,4 @@ task :check_binstubs do end end -task default: [:spec, :make_bin_executable, :yard, :rubocop, :check_binstubs] +task default: %i[spec make_bin_executable yard rubocop check_binstubs] diff --git a/bin/handler-zendesk.rb b/bin/handler-zendesk.rb old mode 100644 new mode 100755 index 51fb06b..15dd375 --- a/bin/handler-zendesk.rb +++ b/bin/handler-zendesk.rb @@ -82,7 +82,7 @@ def handle end end rescue Timeout::Error - puts 'zendesk -- timed out while attempting to create a ticket for #{ticket_subject} --' + puts "zendesk -- timed out while attempting to create a ticket for #{ticket_subject} -" end end end diff --git a/sensu-plugins-zendesk.gemspec b/sensu-plugins-zendesk.gemspec index 6e1dc09..103a1a7 100644 --- a/sensu-plugins-zendesk.gemspec +++ b/sensu-plugins-zendesk.gemspec @@ -4,14 +4,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'date' require_relative 'lib/sensu-plugins-zendesk' -Gem::Specification.new do |s| +Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength s.authors = ['Sensu Plugins and contributors'] s.date = Date.today.to_s s.description = 'Sensu plugins for zendesk' s.email = '' s.executables = Dir.glob('bin/**/*.rb').map { |file| File.basename(file) } - s.files = Dir.glob('{bin,lib}/**/*') + %w(LICENSE README.md CHANGELOG.md) + s.files = Dir.glob('{bin,lib}/**/*') + %w[LICENSE README.md CHANGELOG.md] s.homepage = 'https://github.com/sensu-plugins/sensu-plugins-zendesk' s.license = 'MIT' s.metadata = { 'maintainer' => '', @@ -21,15 +21,15 @@ Gem::Specification.new do |s| 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.0.0' + s.required_ruby_version = '>= 2.1.0' s.summary = 'Sensu plugins for zendesk' s.test_files = s.files.grep(%r{^(test|spec|features)/}) s.version = SensuPluginsZendesk::Version::VER_STRING + s.add_runtime_dependency 'activesupport', '< 5.0.0' s.add_runtime_dependency 'sensu-plugin', '~> 1.2' s.add_runtime_dependency 'zendesk-api', '0.3.4' - s.add_runtime_dependency 'activesupport', '< 5.0.0' s.add_development_dependency 'bundler', '~> 1.7' s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4' @@ -37,7 +37,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'pry', '~> 0.10' s.add_development_dependency 'rake', '~> 10.5' s.add_development_dependency 'redcarpet', '~> 3.2' - s.add_development_dependency 'rubocop', '~> 0.52.1' s.add_development_dependency 'rspec', '~> 3.4' + s.add_development_dependency 'rubocop', '~> 0.52.1' s.add_development_dependency 'yard', '~> 0.8' end From f386f8afd36135f6a7cbe4a6effd915d4380e788 Mon Sep 17 00:00:00 2001 From: Nicole Landskroener Date: Sun, 21 Jan 2018 17:57:53 -0800 Subject: [PATCH 3/4] Fix Rubocop errors in Rakefile --- CHANGELOG.md | 5 +++++ Rakefile | 6 +++--- bin/handler-zendesk.rb | 2 +- sensu-plugins-zendesk.gemspec | 10 +++++----- 4 files changed, 14 insertions(+), 9 deletions(-) mode change 100644 => 100755 bin/handler-zendesk.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index e04285f..3f6c0fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/). This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/) ## [Unreleased] + +## [1.1.0] - 2018-01-21 +### Changed +Bumped Rubocop to v0.52.1 for CVE 2017-8418 (@nicoleheejin) + ### Added - Ruby 2.4.1 testing diff --git a/Rakefile b/Rakefile index b2727db..a5fd291 100644 --- a/Rakefile +++ b/Rakefile @@ -7,9 +7,9 @@ require 'yard' require 'yard/rake/yardoc_task' YARD::Rake::YardocTask.new do |t| - OTHER_PATHS = %w().freeze + OTHER_PATHS = %w[].freeze t.files = ['lib/**/*.rb', 'bin/**/*.rb', OTHER_PATHS] - t.options = %w(--markup-provider=redcarpet --markup=markdown --main=README.md --files CHANGELOG.md) + t.options = %w[--markup-provider=redcarpet --markup=markdown --main=README.md --files CHANGELOG.md] end RuboCop::RakeTask.new @@ -35,4 +35,4 @@ task :check_binstubs do end end -task default: [:spec, :make_bin_executable, :yard, :rubocop, :check_binstubs] +task default: %i[spec make_bin_executable yard rubocop check_binstubs] diff --git a/bin/handler-zendesk.rb b/bin/handler-zendesk.rb old mode 100644 new mode 100755 index 51fb06b..15dd375 --- a/bin/handler-zendesk.rb +++ b/bin/handler-zendesk.rb @@ -82,7 +82,7 @@ def handle end end rescue Timeout::Error - puts 'zendesk -- timed out while attempting to create a ticket for #{ticket_subject} --' + puts "zendesk -- timed out while attempting to create a ticket for #{ticket_subject} -" end end end diff --git a/sensu-plugins-zendesk.gemspec b/sensu-plugins-zendesk.gemspec index 6e1dc09..103a1a7 100644 --- a/sensu-plugins-zendesk.gemspec +++ b/sensu-plugins-zendesk.gemspec @@ -4,14 +4,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'date' require_relative 'lib/sensu-plugins-zendesk' -Gem::Specification.new do |s| +Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength s.authors = ['Sensu Plugins and contributors'] s.date = Date.today.to_s s.description = 'Sensu plugins for zendesk' s.email = '' s.executables = Dir.glob('bin/**/*.rb').map { |file| File.basename(file) } - s.files = Dir.glob('{bin,lib}/**/*') + %w(LICENSE README.md CHANGELOG.md) + s.files = Dir.glob('{bin,lib}/**/*') + %w[LICENSE README.md CHANGELOG.md] s.homepage = 'https://github.com/sensu-plugins/sensu-plugins-zendesk' s.license = 'MIT' s.metadata = { 'maintainer' => '', @@ -21,15 +21,15 @@ Gem::Specification.new do |s| 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.0.0' + s.required_ruby_version = '>= 2.1.0' s.summary = 'Sensu plugins for zendesk' s.test_files = s.files.grep(%r{^(test|spec|features)/}) s.version = SensuPluginsZendesk::Version::VER_STRING + s.add_runtime_dependency 'activesupport', '< 5.0.0' s.add_runtime_dependency 'sensu-plugin', '~> 1.2' s.add_runtime_dependency 'zendesk-api', '0.3.4' - s.add_runtime_dependency 'activesupport', '< 5.0.0' s.add_development_dependency 'bundler', '~> 1.7' s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4' @@ -37,7 +37,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'pry', '~> 0.10' s.add_development_dependency 'rake', '~> 10.5' s.add_development_dependency 'redcarpet', '~> 3.2' - s.add_development_dependency 'rubocop', '~> 0.52.1' s.add_development_dependency 'rspec', '~> 3.4' + s.add_development_dependency 'rubocop', '~> 0.52.1' s.add_development_dependency 'yard', '~> 0.8' end From b592cec135602f9b08823d05d522feffca2d66a0 Mon Sep 17 00:00:00 2001 From: Nicole Landskroener Date: Sun, 21 Jan 2018 18:04:50 -0800 Subject: [PATCH 4/4] Remove Ruby 2.0 from .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a264152..961043c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ cache: install: - bundle install rvm: -- 2.0 - 2.1 - 2.2 - 2.3.0 @@ -27,7 +26,6 @@ deploy: on: tags: true all_branches: true - rvm: 2.0 rvm: 2.1 rvm: 2.2 rvm: 2.3.0