ohai 8.10.0 → 8.11.1

data/lib/ohai/provides_map.rb

@@ -17,10 +17,10 @@
 # limitations under the License.
 #
 
-require 'ohai/mash'
-require 'ohai/exception'
-require 'ohai/mixin/os'
-require 'ohai/dsl'
+require "ohai/mash"
+require "ohai/exception"
+require "ohai/mixin/os"
+require "ohai/dsl"
 
 module Ohai
   class ProvidesMap
@@ -102,7 +102,7 @@ module Ohai
       plugins.uniq
     end
 
-    def all_plugins(attribute_filter=nil)
+    def all_plugins(attribute_filter = nil)
       if attribute_filter.nil?
         collected = []
         collect_plugins_in(map, collected).uniq
@@ -117,7 +117,7 @@ module Ohai
       raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains duplicate '/' characters: #{attribute}" if attribute.match(/\/\/+/)
       raise Ohai::Exceptions::AttributeSyntaxError, "Attribute contains a trailing '/': #{attribute}" if attribute.match(/\/$/)
 
-      parts = attribute.split('/')
+      parts = attribute.split("/")
       parts.shift if parts.length != 0 && parts[0].length == 0 # attribute begins with a '/'
       parts
     end
@@ -144,7 +144,7 @@ module Ohai
       # attribute under attr (if attribute = attr/sub1/sub2 then we
       # search provides_map[attr] for sub1/sub2)
       unless rest.empty?
-        subtree = select_closest_subtree(provides_map[attr], rest.join('/'))
+        subtree = select_closest_subtree(provides_map[attr], rest.join("/"))
       end
 
       if subtree.nil?

data/lib/ohai/runner.rb

@@ -17,7 +17,7 @@
 # limitations under the License
 #
 
-require 'ohai/dsl'
+require "ohai/dsl"
 
 module Ohai
   class Runner
@@ -50,7 +50,7 @@ module Ohai
         raise
       rescue SystemExit # abort or exit from plug-in should exit Ohai with failure code
         raise
-      rescue Exception,Errno::ENOENT => e
+      rescue Exception, Errno::ENOENT => e
         Ohai::Log.debug("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
       end
     end
@@ -63,7 +63,7 @@ module Ohai
 
     def run_v7_plugin(plugin)
       visited = [ plugin ]
-      while !visited.empty?
+      until visited.empty?
         next_plugin = visited.pop
 
         next if next_plugin.has_run?

data/lib/ohai/system.rb

@@ -16,18 +16,18 @@
 # limitations under the License.
 #
 
-require 'ohai/loader'
-require 'ohai/log'
-require 'ohai/mash'
-require 'ohai/runner'
-require 'ohai/dsl'
-require 'ohai/mixin/command'
-require 'ohai/mixin/os'
-require 'ohai/mixin/string'
-require 'ohai/mixin/constant_helper'
-require 'ohai/provides_map'
-require 'ohai/hints'
-require 'mixlib/shellout'
+require "ohai/loader"
+require "ohai/log"
+require "ohai/mash"
+require "ohai/runner"
+require "ohai/dsl"
+require "ohai/mixin/command"
+require "ohai/mixin/os"
+require "ohai/mixin/string"
+require "ohai/mixin/constant_helper"
+require "ohai/provides_map"
+require "ohai/hints"
+require "mixlib/shellout"
 
 module Ohai
   class System
@@ -65,7 +65,7 @@ module Ohai
       @data[key]
     end
 
-    def all_plugins(attribute_filter=nil)
+    def all_plugins(attribute_filter = nil)
       # Reset the system when all_plugins is called since this function
       # can be run multiple times in order to pick up any changes in the
       # config or plugins with Chef.
@@ -88,7 +88,7 @@ module Ohai
       # Users who are migrating from ohai 6 may give one or more Ohai 6 plugin
       # names as the +attribute_filter+. In this case we return early because
       # the v7 plugin provides map will not have an entry for this plugin.
-      if attribute_filter and Array(attribute_filter).all? {|filter_item| have_v6_plugin?(filter_item) }
+      if attribute_filter and Array(attribute_filter).all? { |filter_item| have_v6_plugin?(filter_item) }
         return true
       end
 
@@ -104,7 +104,7 @@ module Ohai
     end
 
     def have_v6_plugin?(name)
-      @v6_dependency_solver.values.any? {|v6plugin| v6plugin.name == name }
+      @v6_dependency_solver.values.any? { |v6plugin| v6plugin.name == name }
     end
 
     def pathify_v6_plugin(plugin_name)
@@ -117,7 +117,7 @@ module Ohai
     # Make sure that you are not breaking backwards compatibility
     # if you are changing any of the APIs below.
     #
-    def require_plugin(plugin_ref, force=false)
+    def require_plugin(plugin_ref, force = false)
       plugins = [ ]
       # This method is only callable by version 6 plugins.
       # First we check if there exists a v6 plugin that fulfills the dependency.
@@ -147,7 +147,7 @@ module Ohai
           rescue Ohai::Exceptions::DependencyCycle, Ohai::Exceptions::AttributeNotFound => e
             Ohai::Log.error("Encountered error while running plugins: #{e.inspect}")
             raise
-          rescue Exception,Errno::ENOENT => e
+          rescue Exception, Errno::ENOENT => e
             Ohai::Log.debug("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
           end
         end
@@ -163,7 +163,7 @@ module Ohai
     #
     # This method takes a naive approach to v6 plugins: it simply re-runs all
     # of them whenever called.
-    def refresh_plugins(attribute_filter=nil)
+    def refresh_plugins(attribute_filter = nil)
       Ohai::Hints.refresh_hints()
       @provides_map.all_plugins(attribute_filter).each do |plugin|
         plugin.reset!
@@ -181,7 +181,7 @@ module Ohai
     #
     # Pretty Print this object as JSON
     #
-    def json_pretty_print(item=nil)
+    def json_pretty_print(item = nil)
       FFI_Yajl::Encoder.new(pretty: true, validate_utf8: false).encode(item || @data)
     end
 
@@ -192,7 +192,7 @@ module Ohai
       end
       raise ArgumentError, "I cannot find an attribute named #{a}!" if data.nil?
       case data
-      when Hash,Mash,Array,Fixnum
+      when Hash, Mash, Array, Fixnum
         json_pretty_print(data)
       when String
         if data.respond_to?(:lines)
@@ -206,6 +206,7 @@ module Ohai
     end
 
     private
+
     def configure_ohai
       Ohai::Config.merge_deprecated_config
       Ohai.config.merge!(@config)

data/lib/ohai/util/file_helper.rb

@@ -22,7 +22,7 @@ module Ohai
   module Util
     module FileHelper
       def which(cmd)
-        paths = ENV['PATH'].split(File::PATH_SEPARATOR) + [ '/bin', '/usr/bin', '/sbin', '/usr/sbin' ]
+        paths = ENV["PATH"].split(File::PATH_SEPARATOR) + [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ]
         paths.each do |path|
           filename = File.join(path, cmd)
           return filename if File.executable?(filename)
@@ -32,4 +32,3 @@ module Ohai
     end
   end
 end
-

data/lib/ohai/util/ip_helper.rb

@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ipaddress'
+require "ipaddress"
 
 module Ohai
   module Util
     module IpHelper
       # Corresponding to RFC 4192 + RFC 4193
-      IPV6_LINK_LOCAL_UNICAST_BLOCK = IPAddress('fe80::/10')
-      IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress('fc00::/7')
+      IPV6_LINK_LOCAL_UNICAST_BLOCK = IPAddress("fe80::/10")
+      IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress("fc00::/7")
 
       def private_address?(addr)
         ip = IPAddress(addr)
@@ -47,7 +47,7 @@ module Ohai
         if ip.respond_to? :loopback?
           ip.loopback?
         else
-          IPAddress('127.0.0.0/8').include? ip
+          IPAddress("127.0.0.0/8").include? ip
         end
       end
     end

data/lib/ohai/util/win32.rb

@@ -21,19 +21,19 @@ module Ohai
     module Win32
       if RUBY_PLATFORM =~ /mswin|mingw|windows/
 
-        require 'ffi'
+        require "ffi"
 
         extend FFI::Library
 
-        ffi_lib 'advapi32'
+        ffi_lib "advapi32"
 
         attach_function :lookup_account_sid,
-        :LookupAccountSidA,[ :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :long
+        :LookupAccountSidA, [ :pointer, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :long
 
         attach_function :convert_string_sid_to_sid,
-        :ConvertStringSidToSidA,[ :pointer, :pointer ], :long
+        :ConvertStringSidToSidA, [ :pointer, :pointer ], :long
 
-        ffi_lib 'kernel32'
+        ffi_lib "kernel32"
 
         attach_function :local_free,
         :LocalFree, [ :pointer ], :long

data/lib/ohai/util/win32/group_helper.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ohai/util/win32'
+require "ohai/util/win32"
 
 module Ohai
   module Util
@@ -26,7 +26,7 @@ module Ohai
       # internal name for the Administrators group, which lets us work
       # properly in environments with a renamed or localized name for the
       # Administrators group
-      BUILTIN_ADMINISTRATORS_SID = 'S-1-5-32-544'
+      BUILTIN_ADMINISTRATORS_SID = "S-1-5-32-544"
 
       def self.windows_root_group_name
         administrators_group_name_result = nil
@@ -40,8 +40,8 @@ module Ohai
         end
 
         administrators_group_name_buffer = 0.chr * 260
-        administrators_group_name_length = [administrators_group_name_buffer.length].pack('L')
-        domain_name_length_buffer = [260].pack('L')
+        administrators_group_name_length = [administrators_group_name_buffer.length].pack("L")
+        domain_name_length_buffer = [260].pack("L")
         sid_use_result = 0.chr * 4
 
         # Use LookupAccountSid rather than WMI's Win32_Group class because WMI will attempt
@@ -73,4 +73,3 @@ module Ohai
     end
   end
 end
-

data/lib/ohai/version.rb

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

data/ohai.gemspec

@@ -1,6 +1,6 @@
 
-$:.unshift File.expand_path('../lib', __FILE__)
-require 'ohai/version'
+$:.unshift File.expand_path("../lib", __FILE__)
+require "ohai/version"
 
 Gem::Specification.new do |s|
   s.name = "ohai"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-config", "~> 2.0"
   s.add_dependency "mixlib-log"
   s.add_dependency "mixlib-shellout", "~> 2.0"
+  s.add_dependency "plist"
   s.add_dependency "ipaddress"
   s.add_dependency "wmi-lite", "~> 1.0"
   s.add_dependency "ffi", "~> 1.9"
@@ -40,10 +41,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-mocks", "~> 3.0"
   s.add_development_dependency "rspec-collection_matchers", "~> 1.0"
   s.add_development_dependency "rspec_junit_formatter"
+  s.add_development_dependency "github_changelog_generator", "1.11.3"
 
   s.bindir = "bin"
-  s.executables = %w(ohai)
+  s.executables = %w{ohai}
 
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.md Gemfile Rakefile) + Dir.glob("*.gemspec") + Dir.glob("{docs,lib,spec}/**/*")
+  s.require_path = "lib"
+  s.files = %w{LICENSE README.md Gemfile Rakefile} + Dir.glob("*.gemspec") + Dir.glob("{docs,lib,spec}/**/*")
 end

data/spec/functional/application_spec.rb

@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require_relative '../spec_helper'
+require_relative "../spec_helper"
 
-require 'ohai/application'
+require "ohai/application"
 
-RSpec.describe 'Ohai::Application' do
+RSpec.describe "Ohai::Application" do
 
   let(:app) { Ohai::Application.new }
   let(:argv) { [] }
@@ -37,12 +37,12 @@ RSpec.describe 'Ohai::Application' do
 
   describe '#configure_ohai' do
 
-    let(:config_content) { '' }
-    let(:config_dir) { Dir.mktmpdir('.chef') }
-    let(:config_location) { File.join(config_dir, 'config.rb') }
+    let(:config_content) { "" }
+    let(:config_dir) { Dir.mktmpdir(".chef") }
+    let(:config_location) { File.join(config_dir, "config.rb") }
 
     before(:each) do
-      File.open(config_location, 'w+') do |f|
+      File.open(config_location, "w+") do |f|
         f.write(config_content)
       end
     end
@@ -51,13 +51,13 @@ RSpec.describe 'Ohai::Application' do
       FileUtils.rm_rf(config_dir)
     end
 
-    context 'when a configuration file is provided as a command line option' do
+    context "when a configuration file is provided as a command line option" do
 
-      let(:argv) { [ '-c', config_location + '.oops' ] }
+      let(:argv) { [ "-c", config_location + ".oops" ] }
 
-      context 'and the configuration file does not exist' do
+      context "and the configuration file does not exist" do
 
-        it 'logs an error and terminates the application' do
+        it "logs an error and terminates the application" do
           expect(STDERR).to receive(:puts).with(/FATAL:/)
           expect(Ohai::Log).to receive(:fatal).
             with(/Specified config file #{argv[1]} does not exist/)
@@ -66,33 +66,33 @@ RSpec.describe 'Ohai::Application' do
       end
     end
 
-    context 'when a workstation configuration file exists' do
+    context "when a workstation configuration file exists" do
 
-      let(:config_content) { 'ohai.disabled_plugins = [ :Foo, :Baz ]' }
+      let(:config_content) { "ohai.disabled_plugins = [ :Foo, :Baz ]" }
 
       # env['KNIFE_HOME']/config.rb is the first config file the workstation
       # config loader looks for:
       # https://github.com/chef/chef/blob/master/chef-config/lib/chef-config/workstation_config_loader.rb#L102
-      let(:env) { { 'KNIFE_HOME' => config_dir } }
+      let(:env) { { "KNIFE_HOME" => config_dir } }
 
       before(:each) do
         allow_any_instance_of(ChefConfig::WorkstationConfigLoader).
           to receive(:env).and_return(env)
       end
 
-      it 'loads the workstation configuration file' do
+      it "loads the workstation configuration file" do
         app.configure_ohai
         expect(Ohai.config[:disabled_plugins]).to eq([ :Foo, :Baz ])
       end
     end
 
-    context 'when the configuration file contains deprecated config options' do
+    context "when the configuration file contains deprecated config options" do
       # For the purpose of these tests it doesn't matter if the configuration
       # file was specified via command line or discovered on the local
       # workstation. It's easier if we pass the configuration file as a cli
       # argument (there's less to stub).
 
-      let(:argv) { [ '-c', config_location ] }
+      let(:argv) { [ "-c", config_location ] }
 
       let(:config_content) do
         <<-CONFIG
@@ -108,11 +108,11 @@ CONFIG
 
       let(:log_level) { :debug }
 
-      let(:log_location) { 'path/to/log' }
+      let(:log_location) { "path/to/log" }
 
-      let(:plugin_path) { '/path/to/plugins' }
+      let(:plugin_path) { "/path/to/plugins" }
 
-      it 'logs warnings for deprecated top-level options' do
+      it "logs warnings for deprecated top-level options" do
         # deprecation warnings for options need to be stubbed in the order
         # they are received, in this case it's the order they appear in the
         # configuration file.
@@ -125,17 +125,17 @@ CONFIG
       end
     end
 
-    context 'when the configuration file has a syntax error' do
+    context "when the configuration file has a syntax error" do
       # For the purpose of these tests it doesn't matter if the configuration
       # file was specified via command line or discovered on the local
       # workstation. It's easier if we pass the configuration file as a cli
       # argument (there's less to stub).
 
-      let(:argv) { [ '-c', config_location ] }
+      let(:argv) { [ "-c", config_location ] }
 
       let(:config_content) { 'config_location "blaaaaa' }
 
-      it 'logs an error and terminates the application' do
+      it "logs an error and terminates the application" do
         expect(STDERR).to receive(:puts).with(/FATAL:/)
         expect(Ohai::Log).to receive(:fatal).
           with(/You have invalid ruby syntax in your config file/)

data/spec/functional/loader_spec.rb

@@ -33,7 +33,7 @@ Ohai.plugin(:Foo) do
   provides 'foo'
 end
 EOF
-        File.open(File.join(plugin_directory, "foo.rb"), 'w+') do |f|
+        File.open(File.join(plugin_directory, "foo.rb"), "w+") do |f|
           f.write(plugin_content)
         end
       end

data/spec/functional/plugins/powershell_spec.rb

@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 
-describe Ohai::System, 'languages plugin' do
+describe Ohai::System, "languages plugin" do
   VERSION_MATCHING_REGEX = /^(?:[\d]+\.)+[\d]+$/
-  describe 'powershell plugin', :windows_only do
+  describe "powershell plugin", :windows_only do
     RSpec.shared_examples "a version looking thing" do
-      it 'should be present' do
+      it "should be present" do
         expect(subject).not_to be_nil
       end
-      it 'should look like a version' do
+      it "should look like a version" do
         expect(subject).to match(VERSION_MATCHING_REGEX)
       end
     end
@@ -37,42 +37,42 @@ describe Ohai::System, 'languages plugin' do
 
     subject { @plugin[:languages][:powershell] }
 
-    it 'should have information about powershell' do
+    it "should have information about powershell" do
       expect(subject).not_to be_nil
     end
 
     describe :version do
       subject { @plugin.languages[:powershell][described_class] }
-      it_behaves_like 'a version looking thing'
+      it_behaves_like "a version looking thing"
     end
 
     describe :ws_man_stack_version do
       subject { @plugin.languages[:powershell][described_class] }
-      it_behaves_like 'a version looking thing'
+      it_behaves_like "a version looking thing"
     end
 
     describe :serialization_version do
       subject { @plugin.languages[:powershell][described_class] }
-      it_behaves_like 'a version looking thing'
+      it_behaves_like "a version looking thing"
     end
 
     describe :clr_version do
       subject { @plugin.languages[:powershell][described_class] }
-      it_behaves_like 'a version looking thing'
+      it_behaves_like "a version looking thing"
     end
 
     describe :build_version do
       subject { @plugin.languages[:powershell][described_class] }
-      it_behaves_like 'a version looking thing'
+      it_behaves_like "a version looking thing"
     end
 
     describe :remoting_protocol_version do
       subject { @plugin.languages[:powershell][described_class] }
-      it_behaves_like 'a version looking thing'
+      it_behaves_like "a version looking thing"
     end
 
     describe :compatible_versions do
-      it 'has compatible_versions that look like versions' do
+      it "has compatible_versions that look like versions" do
         @plugin.languages[:powershell][described_class].each do |version|
           expect(version).to match(VERSION_MATCHING_REGEX)
         end