diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ff8d2e9..e4c3c2b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -24,5 +24,5 @@ #### Purpose -#### Known Compatablity Issues +#### Known Compatibility Issues diff --git a/.travis.yml b/.travis.yml index 5ed7455..456ab3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ rvm: - 2.1 - 2.2 - 2.3.0 +- 2.4.1 notifications: email: recipients: @@ -30,4 +31,5 @@ deploy: rvm: 2.1 rvm: 2.2 rvm: 2.3.0 + rvm: 2.4.1 repo: sensu-plugins/sensu-plugins-lxc diff --git a/CHANGELOG.md b/CHANGELOG.md index 0903930..58d5c7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/) ## [Unreleased] +### Added +- Ruby 2.4.1 testing ## [1.0.1] - 2016-06-15 ### Fixed diff --git a/Rakefile b/Rakefile index b903e6f..382d0db 100644 --- a/Rakefile +++ b/Rakefile @@ -6,15 +6,6 @@ require 'rubocop/rake_task' require 'yard' require 'yard/rake/yardoc_task' -desc 'Don\'t run Rubocop for unsupported versions' -begin - args = if RUBY_VERSION >= '2.0.0' - [:spec, :make_bin_executable, :yard, :rubocop, :check_binstubs] - else - [:spec, :make_bin_executable, :yard] - end -end - YARD::Rake::YardocTask.new do |t| OTHER_PATHS = %w().freeze t.files = ['lib/**/*.rb', 'bin/**/*.rb', OTHER_PATHS] @@ -44,4 +35,4 @@ task :check_binstubs do end end -task default: args +task default: [:spec, :make_bin_executable, :yard, :rubocop, :check_binstubs] diff --git a/sensu-plugins-lxc.gemspec b/sensu-plugins-lxc.gemspec index 35195f2..79a4d45 100644 --- a/sensu-plugins-lxc.gemspec +++ b/sensu-plugins-lxc.gemspec @@ -3,11 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'date' -if RUBY_VERSION < '2.0.0' - require 'sensu-plugins-lxc' -else - require_relative 'lib/sensu-plugins-lxc' -end +require_relative 'lib/sensu-plugins-lxc' Gem::Specification.new do |s| s.authors = ['Sensu Plugins and contributors'] @@ -34,6 +30,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'sensu-plugin', '~> 1.2' s.add_runtime_dependency 'lxc', '0.6.0' + s.add_runtime_dependency 'activesupport', '~> 4.2' s.add_development_dependency 'bundler', '~> 1.7' s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'