Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for Ruby 1.9 #605

Merged
merged 1 commit into from
Feb 8, 2017
Merged

Drop support for Ruby 1.9 #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ script: "bundle install && bundle exec rake validate && bundle exec rake test"
cache: bundler
sudo: false
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
- 2.2.0
Expand All @@ -20,25 +19,11 @@ matrix:
exclude:
- rvm: 2.2.0
env: PUPPET_GEM_VERSION="~> 3.8"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 4.2"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 4.2"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 4.4"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 4.3"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 4.3"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 4.4"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 4.4"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 4.5"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 4.5"




10 changes: 0 additions & 10 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"

if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
gem 'rspec', '~> 2.0'
end

group :development, :unit_tests do
gem 'rake', '< 11.0.0'
gem 'rspec-puppet', :require => false
Expand All @@ -25,12 +21,6 @@ group :development, :unit_tests do
gem 'puppet-lint-undef_in_function-check', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
gem 'puppet-lint-version_comparison-check', :require => false
# metadata-json-lint depends on semantic_puppet, version 0.1.4 of which
# is broken on ruby 1.8 due to use of `File.absolute_path`
if RUBY_VERSION < "1.9"
gem 'semantic_puppet', "< 0.1.4", :require => false
gem 'rdoc', "< 4.3.0", :require => false
end
end

group :system_tests do
Expand Down
1 change: 0 additions & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0'
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
require 'puppet-syntax/tasks/puppet-syntax'
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_api_config/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_check/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_check_config/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_client_config/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_client_subscription/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_enterprise_dashboard_api_config/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_enterprise_dashboard_config/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_extension/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_filter/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
3 changes: 1 addition & 2 deletions lib/puppet/provider/sensu_handler/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down Expand Up @@ -136,4 +135,4 @@ def timeout=(value)
conf['handlers'][resource[:name]]['timeout'] = value
end

end
end
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_mutator/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_rabbitmq_config/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion lib/puppet/provider/sensu_redis_config/json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3'
require 'json' if Puppet.features.json?
require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..',
'puppet_x', 'sensu', 'provider_create.rb'))
Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'rubygems'
require 'puppetlabs_spec_helper/module_spec_helper'

case ENV['COVERAGE']
Expand Down