ohai 0.3.4 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/Rakefile +1 -1
  2. data/lib/ohai.rb +1 -1
  3. data/lib/ohai/system.rb +4 -8
  4. metadata +2 -2
data/Rakefile CHANGED
@@ -5,7 +5,7 @@ require 'date'
5
5
  require 'spec/rake/spectask'
6
6
 
7
7
  GEM = "ohai"
8
- GEM_VERSION = "0.3.4"
8
+ GEM_VERSION = "0.3.6"
9
9
  AUTHOR = "Adam Jacob"
10
10
  EMAIL = "adam@opscode.com"
11
11
  HOMEPAGE = "http://wiki.opscode.com/display/ohai"
@@ -23,5 +23,5 @@ require 'ohai/config'
23
23
  require 'ohai/system'
24
24
 
25
25
  module Ohai
26
- VERSION = '0.3.3'
26
+ VERSION = '0.3.6'
27
27
  end
@@ -24,17 +24,13 @@ require 'ohai/mixin/command'
24
24
  require 'ohai/mixin/string'
25
25
 
26
26
  begin
27
- require 'yajl/json_gem'
27
+ require 'json'
28
28
  rescue LoadError
29
29
  begin
30
- require 'json'
30
+ require 'json/pure'
31
31
  rescue LoadError
32
- begin
33
- require 'json/pure'
34
- rescue LoadError
35
- STDERR.puts "No valid JSON library detected, please install one of 'yajl-ruby', 'json' or 'json_pure'."
36
- exit -2
37
- end
32
+ STDERR.puts "No valid JSON library detected, please install one of 'json' or 'json_pure'."
33
+ exit -2
38
34
  end
39
35
  end
40
36
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ohai
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.4
4
+ version: 0.3.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adam Jacob
@@ -9,7 +9,7 @@ autorequire: ohai
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-10-07 00:00:00 +13:00
12
+ date: 2009-10-27 00:00:00 +13:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency