From 13b90ccf686c2eaf91acb788eb17f904bfcb5b58 Mon Sep 17 00:00:00 2001 From: Justin Lambert Date: Thu, 16 May 2013 11:30:46 -0600 Subject: [PATCH] test puppet version to remove deprication warning on puppet >= 3.0.1 --- lib/puppet/provider/sensu_api_config/json.rb | 2 +- lib/puppet/provider/sensu_check/json.rb | 2 +- lib/puppet/provider/sensu_check_config/json.rb | 2 +- lib/puppet/provider/sensu_client_config/json.rb | 2 +- lib/puppet/provider/sensu_client_subscription/json.rb | 2 +- lib/puppet/provider/sensu_dashboard_config/json.rb | 2 +- lib/puppet/provider/sensu_handler/json.rb | 2 +- lib/puppet/provider/sensu_rabbitmq_config/json.rb | 2 +- lib/puppet/provider/sensu_redis_config/json.rb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/puppet/provider/sensu_api_config/json.rb b/lib/puppet/provider/sensu_api_config/json.rb index 75b4a72ae9..741ce4816d 100644 --- a/lib/puppet/provider/sensu_api_config/json.rb +++ b/lib/puppet/provider/sensu_api_config/json.rb @@ -1,4 +1,4 @@ -require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems? +require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3' require 'json' if Puppet.features.json? Puppet::Type.type(:sensu_api_config).provide(:json) do diff --git a/lib/puppet/provider/sensu_check/json.rb b/lib/puppet/provider/sensu_check/json.rb index bb201ae792..840d5803df 100644 --- a/lib/puppet/provider/sensu_check/json.rb +++ b/lib/puppet/provider/sensu_check/json.rb @@ -1,4 +1,4 @@ -require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems? +require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3' require 'json' if Puppet.features.json? Puppet::Type.type(:sensu_check).provide(:json) do diff --git a/lib/puppet/provider/sensu_check_config/json.rb b/lib/puppet/provider/sensu_check_config/json.rb index bd44428cc2..04987eafab 100644 --- a/lib/puppet/provider/sensu_check_config/json.rb +++ b/lib/puppet/provider/sensu_check_config/json.rb @@ -1,4 +1,4 @@ -require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems? +require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3' require 'json' if Puppet.features.json? Puppet::Type.type(:sensu_check_config).provide(:json) do diff --git a/lib/puppet/provider/sensu_client_config/json.rb b/lib/puppet/provider/sensu_client_config/json.rb index f7ca47cb01..8a0dfb7082 100644 --- a/lib/puppet/provider/sensu_client_config/json.rb +++ b/lib/puppet/provider/sensu_client_config/json.rb @@ -1,4 +1,4 @@ -require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems? +require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3' require 'json' if Puppet.features.json? Puppet::Type.type(:sensu_client_config).provide(:json) do diff --git a/lib/puppet/provider/sensu_client_subscription/json.rb b/lib/puppet/provider/sensu_client_subscription/json.rb index a16fc5608c..280c4fe9b7 100644 --- a/lib/puppet/provider/sensu_client_subscription/json.rb +++ b/lib/puppet/provider/sensu_client_subscription/json.rb @@ -1,4 +1,4 @@ -require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems? +require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3' require 'json' if Puppet.features.json? Puppet::Type.type(:sensu_client_subscription).provide(:json) do diff --git a/lib/puppet/provider/sensu_dashboard_config/json.rb b/lib/puppet/provider/sensu_dashboard_config/json.rb index 1111729010..5da5ad1bcf 100644 --- a/lib/puppet/provider/sensu_dashboard_config/json.rb +++ b/lib/puppet/provider/sensu_dashboard_config/json.rb @@ -1,4 +1,4 @@ -require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems? +require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3' require 'json' if Puppet.features.json? Puppet::Type.type(:sensu_dashboard_config).provide(:json) do diff --git a/lib/puppet/provider/sensu_handler/json.rb b/lib/puppet/provider/sensu_handler/json.rb index 37ac2b4088..063122d2e2 100644 --- a/lib/puppet/provider/sensu_handler/json.rb +++ b/lib/puppet/provider/sensu_handler/json.rb @@ -1,4 +1,4 @@ -require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems? +require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3' require 'json' if Puppet.features.json? Puppet::Type.type(:sensu_handler).provide(:json) do diff --git a/lib/puppet/provider/sensu_rabbitmq_config/json.rb b/lib/puppet/provider/sensu_rabbitmq_config/json.rb index bd739def2b..a6d780f395 100644 --- a/lib/puppet/provider/sensu_rabbitmq_config/json.rb +++ b/lib/puppet/provider/sensu_rabbitmq_config/json.rb @@ -1,4 +1,4 @@ -require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems? +require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3' require 'json' if Puppet.features.json? Puppet::Type.type(:sensu_rabbitmq_config).provide(:json) do diff --git a/lib/puppet/provider/sensu_redis_config/json.rb b/lib/puppet/provider/sensu_redis_config/json.rb index 54742c07d3..d19d7693a5 100644 --- a/lib/puppet/provider/sensu_redis_config/json.rb +++ b/lib/puppet/provider/sensu_redis_config/json.rb @@ -1,4 +1,4 @@ -require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems? +require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.version < '3' require 'json' if Puppet.features.json? Puppet::Type.type(:sensu_redis_config).provide(:json) do