ohai 7.2.0.rc.2 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1436bcd73ef60c3c794bdf276c0b572e757455
-  data.tar.gz: b767aa0d9791d62f002005b904c2115585ce4139
+  metadata.gz: 8f5021abfe73ff336fe9486ae97057693bf26393
+  data.tar.gz: 5071190fbdfb48ac7f082ad9414c11ef2e4d3258
 SHA512:
-  metadata.gz: aced95949e6cb8df985e11c345dfba4a73f30a222fd06be5d250bcb36d69fa96c9566394a2bf3b4d6379ff765d307888d5765a61aaf648864af593f181ef7ef8
-  data.tar.gz: 82b6fa1453d0352261468a31e23af6a5a047ef681da5db209c4b49bbf87dcf3f5e17a352d9bf5308d67e1e207797bb60b8b3e8be386db482b2bef592e3373fd3
+  metadata.gz: b8c615bbf2ac0859d6d5880e8c3189abca58270a0e115ce364a443e9f7d34c3b36b9ef679f67d0788501c6d4cb4b0c002cd00dc80fca57229db462f88d264056
+  data.tar.gz: 92dc7cdb0928b81d0695bf2298725fe50887d85c81129c1c765790ca0ca72f6e2069913f2914744f61135e356f1b62eff4372c6f15b21b81b92ce4f7898724b0

data/lib/ohai/hints.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
+require 'ffi_yajl/json_gem'
 
 module Ohai
   module Hints

data/lib/ohai/plugins/aix/kernel.rb

@@ -22,10 +22,10 @@ Ohai.plugin(:Kernel) do
   collect_data(:aix) do
     kernel Mash.new
 
-    kernel[:name] = shell_out("uname -s").stdout.downcase
-    kernel[:release] = shell_out("uname -r").stdout
-    kernel[:version] = shell_out("uname -v").stdout
-    kernel[:machine] = shell_out("uname -p").stdout
+    kernel[:name] = shell_out("uname -s").stdout.split($/)[0].downcase
+    kernel[:release] = shell_out("uname -r").stdout.split($/)[0]
+    kernel[:version] = shell_out("uname -v").stdout.split($/)[0]
+    kernel[:machine] = shell_out("uname -p").stdout.split($/)[0]
     kernel[:modules] = Mash.new
   end
 end

data/lib/ohai/system.rb

@@ -29,7 +29,7 @@ require 'ohai/provides_map'
 require 'ohai/hints'
 require 'mixlib/shellout'
 
-require 'ffi_yajl'
+require 'ffi_yajl/json_gem'
 
 module Ohai
   class System

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '7.2.0.rc.2'
+  VERSION = '7.2.0'
 end

data/spec/unit/plugins/ec2_spec.rb

@@ -24,6 +24,8 @@ describe Ohai::System, "plugin ec2" do
   before(:each) do
     @plugin = get_plugin("ec2")
     @plugin[:network] = {:interfaces => {:eth0 => {} } }
+    File.stub(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(false)
+    File.stub(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(false)
   end
 
   shared_examples_for "!ec2" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.2.0.rc.2
+  version: 7.2.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -42,16 +42,16 @@ dependencies:
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -521,9 +521,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2