ohai 7.4.0 → 7.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTkwZmVlYzk1MmMzNGZiZDY2MWNkNWMwOTE1MTJmYTQ2NTc0MmYxMw==
+    Yjk5OTY3MGYwNTBhNGFmODNlYWYwMGIxNTcxZmY4ZDA4MzQxNTdlMg==
   data.tar.gz: !binary |-
-    YTRmMGU3MjFiZWQ0ODk2ZTUwNTU3MzM3NDZlZjU0OThjYmM2YWE3Yw==
+    ZjRlYjkwYjE5ODRkYmRjMjljZWQ1ZDQ0YjVhMzk4NGUxNDRlZGRmMg==
 SHA512:
   metadata.gz: !binary |-
-    ZWQ5NWFiMjU2MWU3ODBkNmNhYzBmYzAyNTQ5Y2E5YTM3NGE2MDU1OTRmNGY2
-    NzI3MGI2M2Q4OGIyMWRlZmIzNWZlMmJkZDk2OTQ3NzQwYWY5NzUxNTZkNTc1
-    YzVmMDU5M2UxNTJmYjMzYzg1ODUxMWViZGJlMDI2OGI2MzVhOWE=
+    MGNiNTJmM2Q3NDQ5NWZiZjY4MWFjMGJlOGFhOTUyYzE0MjQxNjg3MTIzODQ0
+    ZThmOTgxMDM2MzhlYWJjOTkxYjFmYjZhMDU1MzE5MjFmOGVlNjI5ZTcyNTVl
+    OWVkYTM1NWU5NWZmNTljNTE3YmZmM2Y3YWIxYWY3YTJjMGU2MDU=
   data.tar.gz: !binary |-
-    NGQ2ODAwZGI2YWRkZTE3OTZlMDNlYTY2YWIyOTM1ZmIxOTVmOGIwYzk2OTYy
-    NTRkMzYxNWUzMTVkNmUwMTUzNDdiOWE4ZWRmMjdlYjZlZDJlNmVkOTMzYWIy
-    Y2FmMTY3Y2ZmYmE3YTMyOTBkYWY0MzYwMWIzNDllNzk2MjVjMDE=
+    N2Q5Y2UzMzczYWU3MzRkNTNkZjk3ZmI5NGM0ODU5Y2M5NDMwMjUxM2NlZmUz
+    NDMwYzhjYWQ2MWMwMDgzOGYyNzUxOTQ4MjI3OWNhMTQyNTFjMWM5MGU0NzVi
+    N2Y3NDExZWNmYmFlNGM0NTFjNmRmZDE2ZDhkY2YyYTc4YTBjYWU=

data/lib/ohai/hints.rb

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

data/lib/ohai/system.rb

@@ -29,8 +29,6 @@ require 'ohai/provides_map'
 require 'ohai/hints'
 require 'mixlib/shellout'
 
-require 'ffi_yajl/json_gem'
-
 module Ohai
   class System
     include Ohai::Mixin::ConstantHelper

data/lib/ohai/version.rb

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

data/spec/unit/plugins/erlang_spec.rb

@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-require 'json'
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin erlang" do
@@ -28,7 +27,7 @@ describe Ohai::System, "plugin erlang" do
     @stderr = "Erlang (ASYNC_THREADS,SMP,HIPE) (BEAM) emulator version 5.6.2\n"
     @plugin.stub(:shell_out).with("erl +V").and_return(mock_shell_out(0, "", @stderr))
   end
-  
+
   it "should get the erlang version from erl +V" do
     @plugin.should_receive(:shell_out).with("erl +V").and_return(mock_shell_out(0, "", @stderr))
     @plugin.run
@@ -38,17 +37,17 @@ describe Ohai::System, "plugin erlang" do
     @plugin.run
     @plugin.languages[:erlang][:version].should eql("5.6.2")
   end
-  
+
   it "should set languages[:erlang][:options]" do
     @plugin.run
     @plugin.languages[:erlang][:options].should eql(["ASYNC_THREADS", "SMP", "HIPE"])
   end
-  
+
   it "should set languages[:erlang][:emulator]" do
     @plugin.run
     @plugin.languages[:erlang][:emulator].should eql("BEAM")
   end
-  
+
   it "should not set the languages[:erlang] tree up if erlang command fails" do
     @status = 1
     @stdin = ""

data/spec/unit/plugins/php_spec.rb

@@ -18,7 +18,6 @@
 # limitations under the License.
 #
 
-require 'json'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
 
 describe Ohai::System, "plugin php" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.4.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -258,14 +258,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/ohai
 - docs/man/man1/ohai.1
+- lib/ohai.rb
 - lib/ohai/application.rb
 - lib/ohai/common/dmi.rb
 - lib/ohai/config.rb
+- lib/ohai/dsl.rb
+- lib/ohai/dsl/plugin.rb
 - lib/ohai/dsl/plugin/versionvi.rb
 - lib/ohai/dsl/plugin/versionvii.rb
-- lib/ohai/dsl/plugin.rb
-- lib/ohai/dsl.rb
 - lib/ohai/exception.rb
 - lib/ohai/hints.rb
 - lib/ohai/loader.rb
@@ -385,10 +387,9 @@ files:
 - lib/ohai/runner.rb
 - lib/ohai/system.rb
 - lib/ohai/util/file_helper.rb
-- lib/ohai/util/win32/group_helper.rb
 - lib/ohai/util/win32.rb
+- lib/ohai/util/win32/group_helper.rb
 - lib/ohai/version.rb
-- lib/ohai.rb
 - spec/data/plugins/___lib64___libc.so.6.output
 - spec/data/plugins/___lib___libc.so.6.output
 - spec/data/plugins/cc.output
@@ -509,7 +510,6 @@ files:
 - spec/unit/runner_spec.rb
 - spec/unit/system_spec.rb
 - spec/unit/util/file_helper_spec.rb
-- bin/ohai
 homepage: http://wiki.opscode.com/display/chef/Ohai
 licenses: []
 metadata: {}
@@ -529,7 +529,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON