ohai 8.10.0 → 8.11.1

data/spec/functional/plugins/root_group_spec.rb

@@ -18,13 +18,13 @@
 # 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, 'root_group plugin' do
+describe Ohai::System, "root_group plugin" do
   let(:plugin) { get_plugin("root_group") }
 
-  describe 'windows platform', :windows_only do
-    let (:wmi) {  wmi = WmiLite::Wmi.new }
+  describe "windows platform", :windows_only do
+    let (:wmi) { wmi = WmiLite::Wmi.new }
 
     it 'should return the system\'s administrators (root) group' do
       # Notethat the Win32_Group WMI provider can be slow if your
@@ -33,7 +33,7 @@ describe Ohai::System, 'root_group plugin' do
       # something to watch if you run this test in such an environment.
       groups = wmi.query("select * from Win32_Group where sid = 'S-1-5-32-544'")
       expect(groups.length).to eq(1)
-      administrators_group = groups[0]['name'].downcase
+      administrators_group = groups[0]["name"].downcase
       plugin.run
       expect(plugin[:root_group].downcase).to be == administrators_group
     end

data/spec/ohai_spec.rb

@@ -16,7 +16,7 @@
 # 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 do
 

data/spec/spec_helper.rb

@@ -1,16 +1,16 @@
-require 'rspec'
-require 'rspec/collection_matchers'
+require "rspec"
+require "rspec/collection_matchers"
 
 # require 'pry-debugger'
 # require 'pry-stack_explorer'
 
 $:.unshift(File.expand_path("../..", __FILE__))
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 
-require 'spec/support/platform_helpers'
-require 'spec/support/integration_helper'
-require 'wmi-lite'
-require 'ohai'
+require "spec/support/platform_helpers"
+require "spec/support/integration_helper"
+require "wmi-lite"
+require "ohai"
 Ohai.config[:log_level] = :error
 
 PLUGIN_PATH = File.expand_path("../../lib/ohai/plugins", __FILE__)
@@ -112,8 +112,8 @@ RSpec.configure do |config|
   config.filter_run_excluding :unix_only => true unless unix?
   config.filter_run_excluding :ruby_18_only => true unless ruby_18?
   config.filter_run_excluding :ruby_19_only => true unless ruby_19?
-  config.filter_run_excluding :requires_root => true unless ENV['USER'] == 'root'
-  config.filter_run_excluding :requires_unprivileged_user => true if ENV['USER'] == 'root'
+  config.filter_run_excluding :requires_root => true unless ENV["USER"] == "root"
+  config.filter_run_excluding :requires_unprivileged_user => true if ENV["USER"] == "root"
 
   config.run_all_when_everything_filtered = true
 

data/spec/support/integration_helper.rb

@@ -1,11 +1,11 @@
-require 'tmpdir'
+require "tmpdir"
 
-module IntegrationSupport 
+module IntegrationSupport
   def when_plugins_directory(description, &block)
     context "When the plugins directory #{description}" do
 
       before(:each) do
-        @plugins_directory = Dir.mktmpdir('ohai-plugins')
+        @plugins_directory = Dir.mktmpdir("ohai-plugins")
       end
 
       after(:each) do
@@ -21,12 +21,12 @@ module IntegrationSupport
       def with_plugin(plugin_path, contents)
         filename = path_to(plugin_path)
         dir = File.dirname(filename)
-        FileUtils.mkdir_p(dir) unless dir == '.'
-        File.open(filename, 'w') do |file|
+        FileUtils.mkdir_p(dir) unless dir == "."
+        File.open(filename, "w") do |file|
           file.write(contents)
         end
       end
-      
+
       def path_to(plugin_path)
         File.expand_path(plugin_path, @plugins_directory)
       end
@@ -36,7 +36,7 @@ module IntegrationSupport
           with_plugin(plugin_path, contents)
         end
       end
-    
+
       instance_eval(&block)
     end
   end

data/spec/support/platform_helpers.rb

@@ -28,4 +28,4 @@ def freebsd?
   !!(RUBY_PLATFORM =~ /freebsd/)
 end
 
-DEV_NULL = windows? ? 'NUL' : '/dev/null'
+DEV_NULL = windows? ? "NUL" : "/dev/null"

data/spec/unit/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(:argv) { [] }
   let(:app) { Ohai::Application.new }
@@ -35,12 +35,12 @@ RSpec.describe 'Ohai::Application' do
   end
 
   describe '#configure_ohai' do
-    describe 'loading configuration from a file' do
-      let(:config_file) { '/local/workstation/config' }
-      let(:config_loader) { instance_double('ChefConfig::WorkstationConfigLoader') }
+    describe "loading configuration from a file" do
+      let(:config_file) { "/local/workstation/config" }
+      let(:config_loader) { instance_double("ChefConfig::WorkstationConfigLoader") }
 
-      context 'when specified on the command line' do
-        let(:argv) { [ '-c', config_file ] }
+      context "when specified on the command line" do
+        let(:argv) { [ "-c", config_file ] }
 
         before(:each) do
           if windows?
@@ -54,13 +54,13 @@ RSpec.describe 'Ohai::Application' do
           end
         end
 
-        it 'loads the configuration file' do
+        it "loads the configuration file" do
           expect(config_loader).to receive(:load)
           app.configure_ohai
         end
 
-        context 'when the configuration file does not exist' do
-          it 'terminates the application' do
+        context "when the configuration file does not exist" do
+          it "terminates the application" do
             expect(config_loader).to receive(:load).and_raise(ChefConfig::ConfigurationError)
             expect(Ohai::Application).to receive(:fatal!)
             app.configure_ohai
@@ -68,25 +68,25 @@ RSpec.describe 'Ohai::Application' do
         end
       end
 
-      context 'when a local workstation config exists' do
+      context "when a local workstation config exists" do
         before(:each) do
           expect(ChefConfig::WorkstationConfigLoader).to receive(:new).
             with(nil, Ohai::Log).
             and_return(config_loader)
         end
 
-        it 'loads the configuration file' do
+        it "loads the configuration file" do
           expect(config_loader).to receive(:load)
           app.configure_ohai
         end
       end
     end
 
-    context 'when CLI options are provided' do
-      let(:argv) { [ '-d', directory ] }
-      let(:directory) { '/some/fantastic/plugins' }
+    context "when CLI options are provided" do
+      let(:argv) { [ "-d", directory ] }
+      let(:directory) { "/some/fantastic/plugins" }
 
-      it 'does not generate deprecated config warnings for cli options' do
+      it "does not generate deprecated config warnings for cli options" do
         expect(Ohai::Log).to_not receive(:warn).
           with(/Ohai::Config\[:directory\] is deprecated/)
         app.configure_ohai

data/spec/unit/config_spec.rb

@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require_relative '../spec_helper'
+require_relative "../spec_helper"
 
-require 'ohai/config'
+require "ohai/config"
 
 RSpec.describe Ohai::Config do
 

data/spec/unit/dsl/plugin_spec.rb

@@ -124,33 +124,33 @@ end
 
 describe Ohai::DSL::Plugin::VersionVII do
   it "should not modify the plugin name when the plugin is named correctly" do
-    plugin = Ohai.plugin(:FunkyVALIDpluginName) { }.new({ })
+    plugin = Ohai.plugin(:FunkyVALIDpluginName) {}.new({})
     expect(plugin.name).to eql(:FunkyVALIDpluginName)
   end
 
   describe "when the plugin is named incorrectly" do
     context "because the plugin name doesn't start with a capital letter" do
       it "should raise an Ohai::Exceptions::InvalidPluginName exception" do
-        expect{ Ohai.plugin(:badName) { } }.to raise_error(Ohai::Exceptions::InvalidPluginName, /badName is not a valid plugin name/)
+        expect { Ohai.plugin(:badName) {} }.to raise_error(Ohai::Exceptions::InvalidPluginName, /badName is not a valid plugin name/)
       end
     end
 
     context "because the plugin name contains an underscore" do
       it "should raise an Ohai::Exceptions::InvalidPluginName exception" do
-        expect{ Ohai.plugin(:Bad_Name) { } }.to raise_error(Ohai::Exceptions::InvalidPluginName, /Bad_Name is not a valid plugin name/)
+        expect { Ohai.plugin(:Bad_Name) {} }.to raise_error(Ohai::Exceptions::InvalidPluginName, /Bad_Name is not a valid plugin name/)
       end
     end
 
     context "because the plugin name isn't a symbol" do
       it "should raise an Ohai::Exceptions::InvalidPluginName exception" do
-        expect{ Ohai.plugin(1138) { } }.to raise_error(Ohai::Exceptions::InvalidPluginName, /1138 is not a valid plugin name/)
+        expect { Ohai.plugin(1138) {} }.to raise_error(Ohai::Exceptions::InvalidPluginName, /1138 is not a valid plugin name/)
       end
     end
   end
 
   describe "#version" do
     it "should save the plugin version as :version7" do
-      plugin = Ohai.plugin(:Test) { }
+      plugin = Ohai.plugin(:Test) {}
       expect(plugin.version).to eql(:version7)
     end
   end
@@ -163,7 +163,7 @@ describe Ohai::DSL::Plugin::VersionVII do
 
     it "should collect a list of attributes" do
       plugin = Ohai.plugin(:Test) { provides("one", "two", "three") }
-      expect(plugin.provides_attrs).to eql(["one", "two", "three"])
+      expect(plugin.provides_attrs).to eql(%w{one two three})
     end
 
     it "should collect from multiple provides statements" do
@@ -172,19 +172,19 @@ describe Ohai::DSL::Plugin::VersionVII do
         provides("two", "three")
         provides("four")
       }
-      expect(plugin.provides_attrs).to eql(["one", "two", "three", "four"])
+      expect(plugin.provides_attrs).to eql(%w{one two three four})
     end
 
     it "should collect attributes across multiple plugin files" do
       plugin = Ohai.plugin(:Test) { provides("one") }
       plugin = Ohai.plugin(:Test) { provides("two", "three") }
-      expect(plugin.provides_attrs).to eql(["one", "two", "three"])
+      expect(plugin.provides_attrs).to eql(%w{one two three})
     end
 
     it "should collect unique attributes" do
       plugin = Ohai.plugin(:Test) { provides("one") }
       plugin = Ohai.plugin(:Test) { provides("one", "two") }
-      expect(plugin.provides_attrs).to eql(["one", "two"])
+      expect(plugin.provides_attrs).to eql(%w{one two})
     end
   end
 
@@ -196,7 +196,7 @@ describe Ohai::DSL::Plugin::VersionVII do
 
     it "should collect a list of dependencies" do
       plugin = Ohai.plugin(:Test) { depends("one", "two", "three") }
-      expect(plugin.depends_attrs).to eql(["one", "two", "three"])
+      expect(plugin.depends_attrs).to eql(%w{one two three})
     end
 
     it "should collect from multiple depends statements" do
@@ -205,35 +205,35 @@ describe Ohai::DSL::Plugin::VersionVII do
         depends("two", "three")
         depends("four")
       }
-      expect(plugin.depends_attrs).to eql(["one", "two", "three", "four"])
+      expect(plugin.depends_attrs).to eql(%w{one two three four})
     end
 
     it "should collect dependencies across multiple plugin files" do
       plugin = Ohai.plugin(:Test) { depends("one") }
       plugin = Ohai.plugin(:Test) { depends("two", "three") }
-      expect(plugin.depends_attrs).to eql(["one", "two", "three"])
+      expect(plugin.depends_attrs).to eql(%w{one two three})
     end
 
     it "should collect unique attributes" do
       plugin = Ohai.plugin(:Test) { depends("one") }
       plugin = Ohai.plugin(:Test) { depends("one", "two") }
-      expect(plugin.depends_attrs).to eql(["one", "two"])
+      expect(plugin.depends_attrs).to eql(%w{one two})
     end
   end
 
   describe "#collect_data" do
     it "should save as :default if no platform is given" do
-      plugin = Ohai.plugin(:Test) { collect_data { } }
+      plugin = Ohai.plugin(:Test) { collect_data {} }
       expect(plugin.data_collector).to have_key(:default)
     end
 
     it "should save a single given platform" do
-      plugin = Ohai.plugin(:Test) { collect_data(:ubuntu) { } }
+      plugin = Ohai.plugin(:Test) { collect_data(:ubuntu) {} }
       expect(plugin.data_collector).to have_key(:ubuntu)
     end
 
     it "should save a list of platforms" do
-      plugin = Ohai.plugin(:Test) { collect_data(:freebsd, :netbsd, :openbsd) { } }
+      plugin = Ohai.plugin(:Test) { collect_data(:freebsd, :netbsd, :openbsd) {} }
       [:freebsd, :netbsd, :openbsd].each do |platform|
         expect(plugin.data_collector).to have_key(platform)
       end
@@ -241,9 +241,9 @@ describe Ohai::DSL::Plugin::VersionVII do
 
     it "should save multiple collect_data blocks" do
       plugin = Ohai.plugin(:Test) {
-        collect_data { }
-        collect_data(:windows) { }
-        collect_data(:darwin) { }
+        collect_data {}
+        collect_data(:windows) {}
+        collect_data(:darwin) {}
       }
       [:darwin, :default, :windows].each do |platform|
         expect(plugin.data_collector).to have_key(platform)
@@ -251,8 +251,8 @@ describe Ohai::DSL::Plugin::VersionVII do
     end
 
     it "should save platforms across multiple plugins" do
-      plugin = Ohai.plugin(:Test) { collect_data { } }
-      plugin = Ohai.plugin(:Test) { collect_data(:aix, :sigar) { } }
+      plugin = Ohai.plugin(:Test) { collect_data {} }
+      plugin = Ohai.plugin(:Test) { collect_data(:aix, :sigar) {} }
       [:aix, :default, :sigar].each do |platform|
         expect(plugin.data_collector).to have_key(platform)
       end
@@ -261,17 +261,17 @@ describe Ohai::DSL::Plugin::VersionVII do
     it "should fail a platform has already been defined in the same plugin" do
       expect {
         Ohai.plugin(:Test) {
-          collect_data { }
-          collect_data { }
+          collect_data {}
+          collect_data {}
         }
       }.to raise_error(Ohai::Exceptions::IllegalPluginDefinition, /collect_data already defined/)
     end
 
     it "should fail if a platform has already been defined in another plugin file" do
-      Ohai.plugin(:Test) { collect_data { } }
+      Ohai.plugin(:Test) { collect_data {} }
       expect {
         Ohai.plugin(:Test) {
-          collect_data { }
+          collect_data {}
         }
       }.to raise_error(Ohai::Exceptions::IllegalPluginDefinition, /collect_data already defined/)
     end
@@ -295,7 +295,7 @@ describe Ohai::DSL::Plugin::VersionVII do
 
   describe "#configuration" do
     let(:plugin) do
-      klass = Ohai.plugin(camel_name) { }
+      klass = Ohai.plugin(camel_name) {}
       klass.new({})
     end
 
@@ -325,7 +325,7 @@ describe Ohai::DSL::Plugin::VersionVII do
       end
 
       it "returns nil when the suboption is not configured" do
-        Ohai.config[:plugin][snake_name][:foo] = { }
+        Ohai.config[:plugin][snake_name][:foo] = {}
         expect(plugin.configuration(:foo, :bar)).to eq(nil)
       end
 
@@ -376,7 +376,7 @@ end
 describe Ohai::DSL::Plugin::VersionVI do
   describe "#version" do
     it "should save the plugin version as :version6" do
-      plugin = Class.new(Ohai::DSL::Plugin::VersionVI) { }
+      plugin = Class.new(Ohai::DSL::Plugin::VersionVI) {}
       expect(plugin.version).to eql(:version6)
     end
   end

data/spec/unit/hints_spec.rb

@@ -17,7 +17,7 @@
 # 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::Hints" do
   # We are using the plugins directory infrastructure to test hints
@@ -54,11 +54,11 @@ EOF
     end
 
     it "hint? should return the data for full hints" do
-      expect(Ohai::Hints.hint?("cloud")).to eq({"name" => "circus"})
+      expect(Ohai::Hints.hint?("cloud")).to eq({ "name" => "circus" })
     end
 
     it "hint? should return empty hash for empty hints" do
-      expect(Ohai::Hints.hint?("cloud_empty")).to eq({ })
+      expect(Ohai::Hints.hint?("cloud_empty")).to eq({})
     end
   end
 

data/spec/unit/loader_spec.rb

@@ -17,13 +17,13 @@
 # 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::Loader do
   extend IntegrationSupport
 
   let(:loader) { Ohai::Loader.new(ohai) }
-  let(:ohai) { double('Ohai::System', :data => Mash.new, :provides_map => provides_map) }
+  let(:ohai) { double("Ohai::System", :data => Mash.new, :provides_map => provides_map) }
   let(:provides_map) { Ohai::ProvidesMap.new }
 
   describe "#initialize" do
@@ -150,7 +150,7 @@ EOF
         end
 
         it "does not raise an error" do
-          expect{ loader.load_plugin(path_to("extra_s.rb")) }.not_to raise_error
+          expect { loader.load_plugin(path_to("extra_s.rb")) }.not_to raise_error
         end
       end
 
@@ -161,7 +161,7 @@ EOF
         end
 
         it "does not raise an error" do
-          expect{ loader.load_plugin(path_to("no_method.rb")) }.not_to raise_error
+          expect { loader.load_plugin(path_to("no_method.rb")) }.not_to raise_error
         end
       end
 
@@ -172,7 +172,7 @@ EOF
         end
 
         it "does not raise an error" do
-          expect{ loader.load_plugin(path_to("illegal_def.rb")) }.not_to raise_error
+          expect { loader.load_plugin(path_to("illegal_def.rb")) }.not_to raise_error
         end
       end
 
@@ -183,7 +183,7 @@ EOF
         end
 
         it "does not raise an error" do
-          expect{ loader.load_plugin(path_to("unexpected_error.rb")) }.not_to raise_error
+          expect { loader.load_plugin(path_to("unexpected_error.rb")) }.not_to raise_error
         end
       end
 
@@ -194,7 +194,7 @@ EOF
         end
 
         it "does not raise an error" do
-          expect{ loader.load_plugin(path_to("bad_symbol.rb")) }.not_to raise_error
+          expect { loader.load_plugin(path_to("bad_symbol.rb")) }.not_to raise_error
         end
       end
 
@@ -205,7 +205,7 @@ EOF
         end
 
         it "does not raise an error" do
-          expect{ loader.load_plugin(path_to("no_end.rb")) }.not_to raise_error
+          expect { loader.load_plugin(path_to("no_end.rb")) }.not_to raise_error
         end
       end
 
@@ -216,7 +216,7 @@ EOF
         end
 
         it "does not raise an error" do
-          expect{ loader.load_plugin(path_to("bad_name.rb")) }.not_to raise_error
+          expect { loader.load_plugin(path_to("bad_name.rb")) }.not_to raise_error
         end
       end
     end