ohai 0.5.8 → 0.6.0.beta.0

data/spec/spec_helper.rb

@@ -1,12 +1,4 @@
-begin
-  require 'spec' 
-  require 'mixlib/config'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-  require 'mixlib/config'
-end
+require 'mixlib/config'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'ohai'
@@ -24,7 +16,7 @@ def it_should_check_from_mash(plugin, attribute, from, value)
     @ohai.should_receive(:from).with(from).and_return(value)
     @ohai._require_plugin(plugin)
   end
-  
+
   it "should set the #{plugin}[:#{attribute}] to the value from '#{from}'" do
     @ohai._require_plugin(plugin)
     @ohai[plugin][attribute].should == value
@@ -37,13 +29,13 @@ def it_should_check_from_deep_mash(plugin, mash, attribute, from, value)
     @ohai.should_receive(:from).with(from).and_return(value)
     @ohai._require_plugin(plugin)
   end
- 
+
   it "should set the #{mash.inspect}[:#{attribute}] to the value from '#{from}'" do
     @ohai._require_plugin(plugin)
-    if mash.is_a?(String) 
+    if mash.is_a?(String)
       @ohai[mash][attribute].should == value
     elsif mash.is_a?(Array)
-      if mash.length == 2 
+      if mash.length == 2
         @ohai[mash[0]][mash[1]][attribute].should == value
       elsif mash.length == 3
         @ohai[mash[0]][mash[1]][mash[2]][attribute].should == value

metadata

@@ -1,109 +1,97 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 62196419
+  prerelease: true
   segments: 
   - 0
-  - 5
-  - 8
-  version: 0.5.8
+  - 6
+  - 0
+  - beta
+  - 0
+  version: 0.6.0.beta.0
 platform: ruby
 authors: 
 - Adam Jacob
-autorequire: ohai
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -07:00
+date: 2011-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: yajl-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 4
-        version: 1.4.4
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
+        - 0
+        - 7
+        - 8
+        version: 0.7.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: extlib
+  name: systemu
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: systemu
+  name: mixlib-cli
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mixlib-cli
+  name: mixlib-config
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mixlib-config
+  name: mixlib-log
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mixlib-log
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
 description: Ohai profiles your system and emits JSON
 email: adam@opscode.com
 executables: 
@@ -117,188 +105,199 @@ files:
 - README.rdoc
 - Rakefile
 - docs/man/man1/ohai.1
-- lib/ohai/application.rb
-- lib/ohai/config.rb
-- lib/ohai/exception.rb
-- lib/ohai/log.rb
-- lib/ohai/mixin/command.rb
-- lib/ohai/mixin/from_file.rb
-- lib/ohai/mixin/string.rb
-- lib/ohai/plugins/aix/cpu.rb
-- lib/ohai/plugins/aix/filesystem.rb
-- lib/ohai/plugins/aix/hostname.rb
-- lib/ohai/plugins/aix/memory.rb
-- lib/ohai/plugins/aix/network.rb
-- lib/ohai/plugins/aix/platform.rb
-- lib/ohai/plugins/aix/ps.rb
-- lib/ohai/plugins/aix/ssh_host_key.rb
-- lib/ohai/plugins/aix/uptime.rb
-- lib/ohai/plugins/c.rb
-- lib/ohai/plugins/chef.rb
-- lib/ohai/plugins/cloud.rb
-- lib/ohai/plugins/command.rb
-- lib/ohai/plugins/darwin/filesystem.rb
-- lib/ohai/plugins/darwin/hostname.rb
-- lib/ohai/plugins/darwin/kernel.rb
-- lib/ohai/plugins/darwin/network.rb
-- lib/ohai/plugins/darwin/platform.rb
-- lib/ohai/plugins/darwin/ps.rb
-- lib/ohai/plugins/darwin/ssh_host_key.rb
-- lib/ohai/plugins/darwin/system_profiler.rb
-- lib/ohai/plugins/darwin/uptime.rb
+- lib/ohai.rb
+- lib/ohai/plugins/languages.rb
+- lib/ohai/plugins/virtualization.rb
 - lib/ohai/plugins/dmi.rb
-- lib/ohai/plugins/ec2.rb
+- lib/ohai/plugins/passwd.rb
+- lib/ohai/plugins/ohai.rb
+- lib/ohai/plugins/php.rb
+- lib/ohai/plugins/keys.rb
+- lib/ohai/plugins/dmi_common.rb
+- lib/ohai/plugins/rackspace.rb
 - lib/ohai/plugins/erlang.rb
-- lib/ohai/plugins/freebsd/cpu.rb
-- lib/ohai/plugins/freebsd/filesystem.rb
-- lib/ohai/plugins/freebsd/hostname.rb
-- lib/ohai/plugins/freebsd/kernel.rb
+- lib/ohai/plugins/freebsd/virtualization.rb
 - lib/ohai/plugins/freebsd/memory.rb
+- lib/ohai/plugins/freebsd/hostname.rb
+- lib/ohai/plugins/freebsd/uptime.rb
+- lib/ohai/plugins/freebsd/ssh_host_key.rb
 - lib/ohai/plugins/freebsd/network.rb
+- lib/ohai/plugins/freebsd/kernel.rb
 - lib/ohai/plugins/freebsd/platform.rb
 - lib/ohai/plugins/freebsd/ps.rb
-- lib/ohai/plugins/freebsd/ssh_host_key.rb
-- lib/ohai/plugins/freebsd/uptime.rb
-- lib/ohai/plugins/freebsd/virtualization.rb
+- lib/ohai/plugins/freebsd/cpu.rb
+- lib/ohai/plugins/freebsd/filesystem.rb
+- lib/ohai/plugins/linux/virtualization.rb
+- lib/ohai/plugins/linux/lsb.rb
+- lib/ohai/plugins/linux/memory.rb
+- lib/ohai/plugins/linux/hostname.rb
+- lib/ohai/plugins/linux/uptime.rb
+- lib/ohai/plugins/linux/ssh_host_key.rb
+- lib/ohai/plugins/linux/block_device.rb
+- lib/ohai/plugins/linux/network.rb
+- lib/ohai/plugins/linux/kernel.rb
+- lib/ohai/plugins/linux/platform.rb
+- lib/ohai/plugins/linux/ps.rb
+- lib/ohai/plugins/linux/cpu.rb
+- lib/ohai/plugins/linux/filesystem.rb
 - lib/ohai/plugins/groovy.rb
+- lib/ohai/plugins/darwin/hostname.rb
+- lib/ohai/plugins/darwin/uptime.rb
+- lib/ohai/plugins/darwin/ssh_host_key.rb
+- lib/ohai/plugins/darwin/network.rb
+- lib/ohai/plugins/darwin/system_profiler.rb
+- lib/ohai/plugins/darwin/kernel.rb
+- lib/ohai/plugins/darwin/platform.rb
+- lib/ohai/plugins/darwin/ps.rb
+- lib/ohai/plugins/darwin/filesystem.rb
+- lib/ohai/plugins/chef.rb
 - lib/ohai/plugins/hostname.rb
-- lib/ohai/plugins/hpux/cpu.rb
-- lib/ohai/plugins/hpux/filesystem.rb
-- lib/ohai/plugins/hpux/hostname.rb
+- lib/ohai/plugins/perl.rb
+- lib/ohai/plugins/uptime.rb
+- lib/ohai/plugins/ec2.rb
+- lib/ohai/plugins/network_listeners.rb
 - lib/ohai/plugins/hpux/memory.rb
+- lib/ohai/plugins/hpux/hostname.rb
+- lib/ohai/plugins/hpux/uptime.rb
+- lib/ohai/plugins/hpux/ssh_host_key.rb
 - lib/ohai/plugins/hpux/network.rb
 - lib/ohai/plugins/hpux/platform.rb
 - lib/ohai/plugins/hpux/ps.rb
-- lib/ohai/plugins/hpux/ssh_host_key.rb
-- lib/ohai/plugins/hpux/uptime.rb
-- lib/ohai/plugins/java.rb
-- lib/ohai/plugins/kernel.rb
-- lib/ohai/plugins/keys.rb
-- lib/ohai/plugins/languages.rb
-- lib/ohai/plugins/linux/block_device.rb
-- lib/ohai/plugins/linux/cpu.rb
-- lib/ohai/plugins/linux/filesystem.rb
-- lib/ohai/plugins/linux/hostname.rb
-- lib/ohai/plugins/linux/kernel.rb
-- lib/ohai/plugins/linux/lsb.rb
-- lib/ohai/plugins/linux/memory.rb
-- lib/ohai/plugins/linux/network.rb
-- lib/ohai/plugins/linux/platform.rb
-- lib/ohai/plugins/linux/ps.rb
-- lib/ohai/plugins/linux/ssh_host_key.rb
-- lib/ohai/plugins/linux/uptime.rb
-- lib/ohai/plugins/linux/virtualization.rb
-- lib/ohai/plugins/lua.rb
+- lib/ohai/plugins/hpux/cpu.rb
+- lib/ohai/plugins/hpux/filesystem.rb
 - lib/ohai/plugins/mono.rb
-- lib/ohai/plugins/netbsd/cpu.rb
-- lib/ohai/plugins/netbsd/filesystem.rb
-- lib/ohai/plugins/netbsd/hostname.rb
-- lib/ohai/plugins/netbsd/kernel.rb
-- lib/ohai/plugins/netbsd/memory.rb
-- lib/ohai/plugins/netbsd/network.rb
-- lib/ohai/plugins/netbsd/platform.rb
-- lib/ohai/plugins/netbsd/ps.rb
-- lib/ohai/plugins/netbsd/ssh_host_key.rb
-- lib/ohai/plugins/netbsd/uptime.rb
-- lib/ohai/plugins/netbsd/virtualization.rb
-- lib/ohai/plugins/network.rb
-- lib/ohai/plugins/network_listeners.rb
-- lib/ohai/plugins/ohai.rb
+- lib/ohai/plugins/solaris2/virtualization.rb
+- lib/ohai/plugins/solaris2/dmi.rb
+- lib/ohai/plugins/solaris2/hostname.rb
+- lib/ohai/plugins/solaris2/uptime.rb
+- lib/ohai/plugins/solaris2/ssh_host_key.rb
+- lib/ohai/plugins/solaris2/network.rb
+- lib/ohai/plugins/solaris2/kernel.rb
+- lib/ohai/plugins/solaris2/platform.rb
+- lib/ohai/plugins/solaris2/ps.rb
+- lib/ohai/plugins/solaris2/cpu.rb
+- lib/ohai/plugins/solaris2/filesystem.rb
 - lib/ohai/plugins/ohai_time.rb
-- lib/ohai/plugins/openbsd/cpu.rb
-- lib/ohai/plugins/openbsd/filesystem.rb
-- lib/ohai/plugins/openbsd/hostname.rb
-- lib/ohai/plugins/openbsd/kernel.rb
+- lib/ohai/plugins/c.rb
+- lib/ohai/plugins/lua.rb
+- lib/ohai/plugins/openbsd/virtualization.rb
 - lib/ohai/plugins/openbsd/memory.rb
+- lib/ohai/plugins/openbsd/hostname.rb
+- lib/ohai/plugins/openbsd/uptime.rb
+- lib/ohai/plugins/openbsd/ssh_host_key.rb
 - lib/ohai/plugins/openbsd/network.rb
+- lib/ohai/plugins/openbsd/kernel.rb
 - lib/ohai/plugins/openbsd/platform.rb
 - lib/ohai/plugins/openbsd/ps.rb
-- lib/ohai/plugins/openbsd/ssh_host_key.rb
-- lib/ohai/plugins/openbsd/uptime.rb
-- lib/ohai/plugins/openbsd/virtualization.rb
-- lib/ohai/plugins/os.rb
-- lib/ohai/plugins/passwd.rb
-- lib/ohai/plugins/perl.rb
-- lib/ohai/plugins/php.rb
-- lib/ohai/plugins/platform.rb
+- lib/ohai/plugins/openbsd/cpu.rb
+- lib/ohai/plugins/openbsd/filesystem.rb
 - lib/ohai/plugins/python.rb
-- lib/ohai/plugins/rackspace.rb
+- lib/ohai/plugins/network.rb
+- lib/ohai/plugins/kernel.rb
+- lib/ohai/plugins/cloud.rb
+- lib/ohai/plugins/java.rb
+- lib/ohai/plugins/platform.rb
 - lib/ohai/plugins/ruby.rb
-- lib/ohai/plugins/sigar/cpu.rb
-- lib/ohai/plugins/sigar/filesystem.rb
-- lib/ohai/plugins/sigar/hostname.rb
+- lib/ohai/plugins/os.rb
 - lib/ohai/plugins/sigar/memory.rb
+- lib/ohai/plugins/sigar/hostname.rb
+- lib/ohai/plugins/sigar/uptime.rb
 - lib/ohai/plugins/sigar/network.rb
 - lib/ohai/plugins/sigar/platform.rb
-- lib/ohai/plugins/sigar/uptime.rb
-- lib/ohai/plugins/solaris2/cpu.rb
-- lib/ohai/plugins/solaris2/hostname.rb
-- lib/ohai/plugins/solaris2/kernel.rb
-- lib/ohai/plugins/solaris2/network.rb
-- lib/ohai/plugins/solaris2/platform.rb
-- lib/ohai/plugins/solaris2/ps.rb
-- lib/ohai/plugins/solaris2/ssh_host_key.rb
-- lib/ohai/plugins/uptime.rb
-- lib/ohai/plugins/virtualization.rb
-- lib/ohai/plugins/windows/cpu.rb
-- lib/ohai/plugins/windows/filesystem.rb
+- lib/ohai/plugins/sigar/cpu.rb
+- lib/ohai/plugins/sigar/filesystem.rb
+- lib/ohai/plugins/command.rb
 - lib/ohai/plugins/windows/hostname.rb
-- lib/ohai/plugins/windows/kernel.rb
 - lib/ohai/plugins/windows/network.rb
+- lib/ohai/plugins/windows/kernel.rb
 - lib/ohai/plugins/windows/platform.rb
+- lib/ohai/plugins/windows/cpu.rb
+- lib/ohai/plugins/windows/filesystem.rb
+- lib/ohai/plugins/eucalyptus.rb
+- lib/ohai/plugins/netbsd/virtualization.rb
+- lib/ohai/plugins/netbsd/memory.rb
+- lib/ohai/plugins/netbsd/hostname.rb
+- lib/ohai/plugins/netbsd/uptime.rb
+- lib/ohai/plugins/netbsd/ssh_host_key.rb
+- lib/ohai/plugins/netbsd/network.rb
+- lib/ohai/plugins/netbsd/kernel.rb
+- lib/ohai/plugins/netbsd/platform.rb
+- lib/ohai/plugins/netbsd/ps.rb
+- lib/ohai/plugins/netbsd/cpu.rb
+- lib/ohai/plugins/netbsd/filesystem.rb
+- lib/ohai/plugins/aix/memory.rb
+- lib/ohai/plugins/aix/hostname.rb
+- lib/ohai/plugins/aix/uptime.rb
+- lib/ohai/plugins/aix/ssh_host_key.rb
+- lib/ohai/plugins/aix/network.rb
+- lib/ohai/plugins/aix/platform.rb
+- lib/ohai/plugins/aix/ps.rb
+- lib/ohai/plugins/aix/cpu.rb
+- lib/ohai/plugins/aix/filesystem.rb
+- lib/ohai/application.rb
+- lib/ohai/version.rb
+- lib/ohai/mash.rb
+- lib/ohai/exception.rb
+- lib/ohai/config.rb
+- lib/ohai/log.rb
 - lib/ohai/system.rb
-- lib/ohai.rb
-- spec/ohai/mixin/command_spec.rb
-- spec/ohai/mixin/from_file_spec.rb
-- spec/ohai/plugins/c_spec.rb
-- spec/ohai/plugins/chef_spec.rb
-- spec/ohai/plugins/cloud_spec.rb
-- spec/ohai/plugins/darwin/hostname_spec.rb
-- spec/ohai/plugins/darwin/kernel_spec.rb
-- spec/ohai/plugins/darwin/platform_spec.rb
-- spec/ohai/plugins/dmi_spec.rb
+- lib/ohai/mixin/string.rb
+- lib/ohai/mixin/from_file.rb
+- lib/ohai/mixin/command.rb
+- lib/ohai/mixin/ec2_metadata.rb
+- spec/ohai/plugins/groovy_spec.rb
+- spec/ohai/plugins/lua_spec.rb
 - spec/ohai/plugins/ec2_spec.rb
-- spec/ohai/plugins/erlang_spec.rb
-- spec/ohai/plugins/freebsd/hostname_spec.rb
+- spec/ohai/plugins/ruby_spec.rb
+- spec/ohai/plugins/rackspace_spec.rb
 - spec/ohai/plugins/freebsd/kernel_spec.rb
 - spec/ohai/plugins/freebsd/platform_spec.rb
-- spec/ohai/plugins/groovy_spec.rb
-- spec/ohai/plugins/hostname_spec.rb
-- spec/ohai/plugins/java_spec.rb
-- spec/ohai/plugins/kernel_spec.rb
+- spec/ohai/plugins/freebsd/hostname_spec.rb
+- spec/ohai/plugins/php_spec.rb
 - spec/ohai/plugins/linux/cpu_spec.rb
-- spec/ohai/plugins/linux/hostname_spec.rb
 - spec/ohai/plugins/linux/kernel_spec.rb
-- spec/ohai/plugins/linux/lsb_spec.rb
 - spec/ohai/plugins/linux/platform_spec.rb
 - spec/ohai/plugins/linux/uptime_spec.rb
 - spec/ohai/plugins/linux/virtualization_spec.rb
-- spec/ohai/plugins/lua_spec.rb
+- spec/ohai/plugins/linux/lsb_spec.rb
+- spec/ohai/plugins/linux/hostname_spec.rb
+- spec/ohai/plugins/chef_spec.rb
+- spec/ohai/plugins/darwin/kernel_spec.rb
+- spec/ohai/plugins/darwin/platform_spec.rb
+- spec/ohai/plugins/darwin/hostname_spec.rb
+- spec/ohai/plugins/python_spec.rb
+- spec/ohai/plugins/java_spec.rb
+- spec/ohai/plugins/kernel_spec.rb
+- spec/ohai/plugins/dmi_spec.rb
 - spec/ohai/plugins/mono_spec.rb
-- spec/ohai/plugins/netbsd/hostname_spec.rb
-- spec/ohai/plugins/netbsd/kernel_spec.rb
-- spec/ohai/plugins/netbsd/platform_spec.rb
-- spec/ohai/plugins/ohai_spec.rb
-- spec/ohai/plugins/ohai_time_spec.rb
-- spec/ohai/plugins/openbsd/hostname_spec.rb
+- spec/ohai/plugins/solaris2/network_spec.rb
+- spec/ohai/plugins/solaris2/kernel_spec.rb
+- spec/ohai/plugins/solaris2/virtualization_spec.rb
+- spec/ohai/plugins/solaris2/hostname_spec.rb
 - spec/ohai/plugins/openbsd/kernel_spec.rb
 - spec/ohai/plugins/openbsd/platform_spec.rb
+- spec/ohai/plugins/openbsd/hostname_spec.rb
+- spec/ohai/plugins/platform_spec.rb
+- spec/ohai/plugins/erlang_spec.rb
+- spec/ohai/plugins/perl_spec.rb
+- spec/ohai/plugins/c_spec.rb
+- spec/ohai/plugins/ohai_spec.rb
 - spec/ohai/plugins/os_spec.rb
 - spec/ohai/plugins/passwd_spec.rb
-- spec/ohai/plugins/perl_spec.rb
-- spec/ohai/plugins/php_spec.rb
-- spec/ohai/plugins/platform_spec.rb
-- spec/ohai/plugins/python_spec.rb
-- spec/ohai/plugins/rackspace_spec.rb
-- spec/ohai/plugins/ruby_spec.rb
-- spec/ohai/plugins/solaris2/hostname_spec.rb
-- spec/ohai/plugins/solaris2/kernel_spec.rb
-- spec/ohai/plugins/solaris2/network_spec.rb
+- spec/ohai/plugins/cloud_spec.rb
+- spec/ohai/plugins/eucalyptus_spec.rb
+- spec/ohai/plugins/netbsd/kernel_spec.rb
+- spec/ohai/plugins/netbsd/platform_spec.rb
+- spec/ohai/plugins/netbsd/hostname_spec.rb
+- spec/ohai/plugins/hostname_spec.rb
+- spec/ohai/plugins/ohai_time_spec.rb
 - spec/ohai/system_spec.rb
-- spec/ohai_spec.rb
-- spec/rcov.opts
-- spec/spec.opts
+- spec/ohai/mixin/command_spec.rb
+- spec/ohai/mixin/from_file_spec.rb
 - spec/spec_helper.rb
+- spec/spec.opts
+- spec/rcov.opts
+- spec/ohai_spec.rb
 - bin/ohai
 has_rdoc: true
 homepage: http://wiki.opscode.com/display/ohai
@@ -314,17 +313,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: