fix according to https://projects.puppetlabs.com/issues/17747

sensu · Feb 12, 2013 · 3018ce1 · 3018ce1
1 parent 60af17a
commit 3018ce1
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 16 deletions.
diff --git a/lib/puppet/feature/json.rb b/lib/puppet/feature/json.rb
@@ -0,0 +1 @@
+Puppet.features.add(:json, :libs => ["json"])
diff --git a/lib/puppet/provider/sensu_api_config/json.rb b/lib/puppet/provider/sensu_api_config/json.rb
@@ -1,7 +1,9 @@
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-require 'json'
+require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems?
+require 'json' if Puppet.features.json?
 
 Puppet::Type.type(:sensu_api_config).provide(:json) do
+  confine :feature => :json
+
   # Internal: Retrieve the current contents of /etc/sensu/config.json.
   #
   # Returns a Hash representation of the JSON structure in

diff --git a/lib/puppet/provider/sensu_check_config/json.rb b/lib/puppet/provider/sensu_check_config/json.rb
@@ -1,7 +1,9 @@
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-require 'json'
+require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems?
+require 'json' if Puppet.features.json?
 
 Puppet::Type.type(:sensu_check_config).provide(:json) do
+  confine :feature => :json
+
   def initialize(*args)
     super
 

diff --git a/lib/puppet/provider/sensu_clean_config/json.rb b/lib/puppet/provider/sensu_clean_config/json.rb
@@ -1,7 +1,9 @@
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-require 'json'
+require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems?
+require 'json' if Puppet.features.json?
 
 Puppet::Type.type(:sensu_clean_config).provide(:json) do
+  confine :feature => :json
+
   def conf
     begin
       @conf ||= JSON.parse(File.read('/etc/sensu/config.json'))

diff --git a/lib/puppet/provider/sensu_client_config/json.rb b/lib/puppet/provider/sensu_client_config/json.rb
@@ -1,7 +1,9 @@
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-require 'json'
+require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems?
+require 'json' if Puppet.features.json?
 
 Puppet::Type.type(:sensu_client_config).provide(:json) do
+  confine :feature => :json
+
   def initialize(*args)
     super
 

diff --git a/lib/puppet/provider/sensu_dashboard_config/json.rb b/lib/puppet/provider/sensu_dashboard_config/json.rb
@@ -1,7 +1,9 @@
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-require 'json'
+require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems?
+require 'json' if Puppet.features.json?
 
 Puppet::Type.type(:sensu_dashboard_config).provide(:json) do
+  confine :feature => :json
+
   def conf
     begin
       @conf ||= JSON.parse(File.read('/etc/sensu/config.json'))

diff --git a/lib/puppet/provider/sensu_handler_config/json.rb b/lib/puppet/provider/sensu_handler_config/json.rb
@@ -1,7 +1,9 @@
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-require 'json'
+require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems?
+require 'json' if Puppet.features.json?
 
 Puppet::Type.type(:sensu_handler_config).provide(:json) do
+  confine :feature => :json
+
   def initialize(*args)
     super
 

diff --git a/lib/puppet/provider/sensu_rabbitmq_config/json.rb b/lib/puppet/provider/sensu_rabbitmq_config/json.rb
@@ -1,7 +1,9 @@
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-require 'json'
+require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems?
+require 'json' if Puppet.features.json?
 
 Puppet::Type.type(:sensu_rabbitmq_config).provide(:json) do
+  confine :feature => :json
+
   def conf
     begin
       @conf ||= JSON.parse(File.read('/etc/sensu/config.json'))

diff --git a/lib/puppet/provider/sensu_redis_config/json.rb b/lib/puppet/provider/sensu_redis_config/json.rb
@@ -1,7 +1,9 @@
-require 'rubygems' if RUBY_VERSION < '1.9.0'
-require 'json'
+require 'rubygems' if RUBY_VERSION < '1.9.0' && Puppet.features.rubygems?
+require 'json' if Puppet.features.json?
 
 Puppet::Type.type(:sensu_redis_config).provide(:json) do
+  confine :feature => :json
+
   def conf
     begin
       @conf ||= JSON.parse(File.read('/etc/sensu/config.json'))