@@ -1,3 +1,4 @@ +*.swp pkg/ tmp/ coverage/ .gitignore @@ -22,7 +22,6 @@ spec = Gem::Specification.new do |s| s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency "json" s.add_dependency "extlib" s.add_dependency "systemu" s.add_dependency "mixlib-cli" Rakefile @@ -22,7 +22,21 @@ require 'ohai/log' require 'ohai/mixin/from_file' require 'ohai/mixin/command' require 'ohai/mixin/string' -require 'json' + +begin + require 'yajl/json_gem' +rescue LoadError + begin + require 'json' + rescue LoadError + begin + require 'json/pure' + rescue LoadError + STDERR.puts "No valid JSON library detected, please install one of 'yajl-ruby', 'json' or 'json-pure'." + exit -2 + end + end +end module Ohai class System lib/ohai/system.rb 1795eb3815181079efa405698ac23c5d7bf7031a AJ Christensen aj@junglist.gen.nz http://github.com/opscode/ohai/commit/f89baccc3b9ab587d23e0b6257f6fedffe223c02 f89baccc3b9ab587d23e0b6257f6fedffe223c02 2009-10-06T04:57:41-07:00 2009-10-06T04:57:41-07:00 OHAI-95: support YAJL > JSON > JSON pure Removes the direct dependency on a JSON library, allowing for user choice. Recommended use of YAJL, it's far quicker. 23d887168e963c48e0afea0c8aab8f204581e465 AJ Christensen aj@junglist.gen.nz