ohai 14.2.0 → 14.3.0

data/lib/ohai/plugins/solaris2/memory.rb

@@ -24,8 +24,8 @@ Ohai.plugin(:Memory) do
     memory[:total] = "#{meminfo.split[2].to_i * 1024}kB"
 
     tokens = shell_out("swap -s").stdout.strip.split
-    used_swap = tokens[8][0..-1].to_i #strip k from end
-    free_swap = tokens[10][0..-1].to_i #strip k from end
+    used_swap = tokens[8][0..-1].to_i # strip k from end
+    free_swap = tokens[10][0..-1].to_i # strip k from end
     memory[:swap][:total] = "#{used_swap + free_swap}kB"
     memory[:swap][:free] = "#{free_swap}kB"
   end

data/lib/ohai/plugins/solaris2/network.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Benjamin Black (<nostromo@gmail.com>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,40 +18,40 @@
 
 # EXAMPLE SOLARIS IFCONFIG OUTPUT; CURRENTLY, ONLY SIMPLE STUFF IS SUPPORTED (E.G., NO TUNNELS)
 # DEAR SUN: YOU GET AN F FOR YOUR IFCONFIG
-#lo0:3: flags=2001000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4,VIRTUAL> mtu 8232 index 1
-#        inet 127.0.0.1 netmask ff000000
-#e1000g0:3: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 3
-#        inet 72.2.115.28 netmask ffffff80 broadcast 72.2.115.127
-#e1000g2:1: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 4
-#        inet 10.2.115.28 netmask ffffff80 broadcast 10.2.115.127
-#        inet6 2001:0db8:3c4d:55:a00:20ff:fe8e:f3ad/64
-#ip.tun0: flags=2200851<UP,POINTOPOINT,RUNNING,MULTICAST,NONUD,IPv6> mtu 1480 index 3
-#       inet tunnel src 109.146.85.57   tunnel dst 109.146.85.212
-#       tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
-#       tunnel hop limit 60
-#       inet6 fe80::6d92:5539/10 --> fe80::6d92:55d4
-#ip.tun0:1: flags=2200851<UP,POINTOPOINT,RUNNING,MULTICAST,NONUD,IPv6> mtu 1480 index 3
-#       inet6 2::45/128 --> 2::46
-#lo0: flags=1000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4> mtu 8232 index 1
-#    inet 127.0.0.1 netmask ff000000
-#eri0: flags=1004843<UP,BROADCAST,RUNNING,MULTICAST,DHCP,IPv4> mtu 1500 \
-#index 2
-#    inet 172.17.128.208 netmask ffffff00 broadcast 172.17.128.255
-#ip6.tun0: flags=10008d1<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST,IPv4> \
-#mtu 1460
-#    index 3
-#    inet6 tunnel src fe80::1 tunnel dst fe80::2
-#    tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
-#    tunnel hop limit 60 tunnel encapsulation limit 4
-#    inet 10.0.0.208 --> 10.0.0.210 netmask ff000000
-#qfe1: flags=2000841<UP,RUNNING,MULTICAST,IPv6> mtu 1500 index 3
-# usesrc vni0
-# inet6 fe80::203:baff:fe17:4be0/10
-# ether 0:3:ba:17:4b:e0
-#vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 0
-# index 5
-# srcof qfe1
-# inet6 fe80::203:baff:fe17:4444/128
+# lo0:3: flags=2001000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4,VIRTUAL> mtu 8232 index 1
+#         inet 127.0.0.1 netmask ff000000
+# e1000g0:3: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 3
+#         inet 72.2.115.28 netmask ffffff80 broadcast 72.2.115.127
+# e1000g2:1: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 4
+#         inet 10.2.115.28 netmask ffffff80 broadcast 10.2.115.127
+#         inet6 2001:0db8:3c4d:55:a00:20ff:fe8e:f3ad/64
+# ip.tun0: flags=2200851<UP,POINTOPOINT,RUNNING,MULTICAST,NONUD,IPv6> mtu 1480 index 3
+#        inet tunnel src 109.146.85.57   tunnel dst 109.146.85.212
+#        tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
+#        tunnel hop limit 60
+#        inet6 fe80::6d92:5539/10 --> fe80::6d92:55d4
+# ip.tun0:1: flags=2200851<UP,POINTOPOINT,RUNNING,MULTICAST,NONUD,IPv6> mtu 1480 index 3
+#        inet6 2::45/128 --> 2::46
+# lo0: flags=1000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4> mtu 8232 index 1
+#     inet 127.0.0.1 netmask ff000000
+# eri0: flags=1004843<UP,BROADCAST,RUNNING,MULTICAST,DHCP,IPv4> mtu 1500 \
+# index 2
+#     inet 172.17.128.208 netmask ffffff00 broadcast 172.17.128.255
+# ip6.tun0: flags=10008d1<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST,IPv4> \
+# mtu 1460
+#     index 3
+#     inet6 tunnel src fe80::1 tunnel dst fe80::2
+#     tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
+#     tunnel hop limit 60 tunnel encapsulation limit 4
+#     inet 10.0.0.208 --> 10.0.0.210 netmask ff000000
+# qfe1: flags=2000841<UP,RUNNING,MULTICAST,IPv6> mtu 1500 index 3
+#  usesrc vni0
+#  inet6 fe80::203:baff:fe17:4be0/10
+#  ether 0:3:ba:17:4b:e0
+# vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 0
+#  index 5
+#  srcof qfe1
+#  inet6 fe80::203:baff:fe17:4444/128
 
 # Extracted from http://illumos.org/hcl/
 unless defined?(ETHERNET_ENCAPS)
@@ -59,7 +59,7 @@ unless defined?(ETHERNET_ENCAPS)
                         dmfe e1000g efe elxl emlxs eri hermon hme hxge igb
                         iprb ipw iwh iwi iwk iwp ixgb ixgbe mwl mxfe myri10ge
                         nge ntxn nxge pcn platform qfe qlc ral rge rtls rtw rwd
-                        rwn sfe tavor vr wpi xge yge aggr}
+                        rwn sfe tavor vr wpi xge yge aggr}.freeze
 end
 
 Ohai.plugin(:Network) do

data/lib/ohai/plugins/windows/network.rb

@@ -102,7 +102,7 @@ Ohai.plugin(:Network) do
           ip_and_subnet = ip.dup
           ip_and_subnet << "/#{iface[cint][:configuration][:ip_subnet][ip_index]}" if iface[cint][:configuration][:ip_subnet]
           ip2 = IPAddress(ip_and_subnet)
-          iface[cint][:addresses][ip] = Mash.new(:prefixlen => ip2.prefix)
+          iface[cint][:addresses][ip] = Mash.new(prefixlen: ip2.prefix)
           if ip2.ipv6?
             iface[cint][:addresses][ip][:family] = "inet6"
             iface[cint][:addresses][ip][:scope] = "Link" if ip =~ /^fe80/i
@@ -123,7 +123,7 @@ Ohai.plugin(:Network) do
             "family" => "lladdr",
           }
         end
-        iface[cint][:mtu] = iface[cint][:configuration][:mtu] if iface[cint][:configuration].has_key?(:mtu)
+        iface[cint][:mtu] = iface[cint][:configuration][:mtu] if iface[cint][:configuration].key?(:mtu)
         iface[cint][:type] = iface[cint][:instance][:adapter_type] if iface[cint][:instance][:adapter_type]
         iface[cint][:arp] = {}
         iface[cint][:encapsulation] = windows_encaps_lookup(iface[cint][:instance][:adapter_type]) if iface[cint][:instance][:adapter_type]

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

@@ -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".freeze
 
       def self.windows_root_group_name
         administrators_sid_result = FFI::MemoryPointer.new(:pointer)

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "14.2.0"
+  VERSION = "14.3.0".freeze
 end

data/spec/functional/application_spec.rb

@@ -58,8 +58,8 @@ RSpec.describe "Ohai::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/)
+          expect(Ohai::Log).to receive(:fatal)
+            .with(/Specified config file #{argv[1]} does not exist/)
           expect { app.configure_ohai }.to raise_error(SystemExit)
         end
       end
@@ -75,8 +75,8 @@ RSpec.describe "Ohai::Application" do
       let(:env) { { "KNIFE_HOME" => config_dir } }
 
       before(:each) do
-        allow_any_instance_of(ChefConfig::WorkstationConfigLoader).
-          to receive(:env).and_return(env)
+        allow_any_instance_of(ChefConfig::WorkstationConfigLoader)
+          .to receive(:env).and_return(env)
       end
 
       it "loads the workstation configuration file" do
@@ -97,8 +97,8 @@ RSpec.describe "Ohai::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/)
+        expect(Ohai::Log).to receive(:fatal)
+          .with(/You have invalid ruby syntax in your config file/)
         expect { app.configure_ohai }.to raise_error(SystemExit)
       end
     end

data/spec/functional/loader_spec.rb

@@ -28,10 +28,10 @@ RSpec.describe "Ohai::Loader" do
       before(:each) do
         Ohai.config[:plugin_path] = plugin_path
 
-        plugin_content = <<-EOF
-Ohai.plugin(:Foo) do
-  provides 'foo'
-end
+        plugin_content = <<~EOF
+          Ohai.plugin(:Foo) do
+            provides 'foo'
+          end
 EOF
         File.open(File.join(plugin_directory, "foo.rb"), "w+") do |f|
           f.write(plugin_content)

data/spec/functional/plugins/windows/uptime_spec.rb

@@ -28,8 +28,7 @@ describe Ohai::System, "Windows plugin uptime" do
     end
 
     let(:wmi) do
-      double("wmi", { :first_of =>
-        { "lastbootuptime" => "20160912103128.597219+0000" },
+      double("wmi", { first_of:         { "lastbootuptime" => "20160912103128.597219+0000" },
       })
     end
 

data/spec/spec_helper.rb

@@ -105,12 +105,12 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.filter_run :focus => true
+  config.filter_run focus: true
 
-  config.filter_run_excluding :windows_only => true unless windows?
-  config.filter_run_excluding :unix_only => true unless unix?
-  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 windows_only: true unless windows?
+  config.filter_run_excluding unix_only: true unless unix?
+  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/unit/application_spec.rb

@@ -43,13 +43,13 @@ RSpec.describe "Ohai::Application" do
 
         before(:each) do
           if windows?
-            expect(ChefConfig::WorkstationConfigLoader).to receive(:new).
-              with("C:#{config_file}", Ohai::Log).
-              and_return(config_loader)
+            expect(ChefConfig::WorkstationConfigLoader).to receive(:new)
+              .with("C:#{config_file}", Ohai::Log)
+              .and_return(config_loader)
           else
-            expect(ChefConfig::WorkstationConfigLoader).to receive(:new).
-              with(config_file, Ohai::Log).
-              and_return(config_loader)
+            expect(ChefConfig::WorkstationConfigLoader).to receive(:new)
+              .with(config_file, Ohai::Log)
+              .and_return(config_loader)
           end
         end
 
@@ -69,9 +69,9 @@ RSpec.describe "Ohai::Application" 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)
+          expect(ChefConfig::WorkstationConfigLoader).to receive(:new)
+            .with(nil, Ohai::Log)
+            .and_return(config_loader)
         end
 
         it "loads the configuration file" do
@@ -86,8 +86,8 @@ RSpec.describe "Ohai::Application" do
       let(:directory) { "/some/fantastic/plugins" }
 
       it "does not generate deprecated config warnings for cli options" do
-        expect(Ohai::Log).to_not receive(:warn).
-          with(/Ohai::Config\[:directory\] is deprecated/)
+        expect(Ohai::Log).to_not receive(:warn)
+          .with(/Ohai::Config\[:directory\] is deprecated/)
         app.configure_ohai
       end
     end

data/spec/unit/config_spec.rb

@@ -30,21 +30,21 @@ RSpec.describe Ohai::Config do
       end
 
       it "gets configured with a Hash" do
-        value = { :bar => true, :baz => true }
+        value = { bar: true, baz: true }
         Ohai::Config.ohai[:plugin][:foo] = value
         expect(Ohai::Config.ohai[:plugin]).to have_key(:foo)
         expect(Ohai::Config.ohai[:plugin][:foo]).to eq(value)
       end
 
       it "raises an error if the plugin name is not a symbol" do
-        expect { Ohai::Config.ohai[:plugin]["foo"] = false }.
-          to raise_error(Ohai::Exceptions::PluginConfigError, /Expected Symbol/)
+        expect { Ohai::Config.ohai[:plugin]["foo"] = false }
+          .to raise_error(Ohai::Exceptions::PluginConfigError, /Expected Symbol/)
       end
 
       it "raises an error if the value Hash has non-Symbol key" do
         value = { :bar => true, "baz" => true }
-        expect { Ohai::Config.ohai[:plugin][:foo] = value }.
-          to raise_error(Ohai::Exceptions::PluginConfigError, /Expected Symbol/)
+        expect { Ohai::Config.ohai[:plugin][:foo] = value }
+          .to raise_error(Ohai::Exceptions::PluginConfigError, /Expected Symbol/)
       end
     end
   end

data/spec/unit/dsl/plugin_spec.rb

@@ -203,8 +203,8 @@ shared_examples "Ohai::DSL::Plugin" do
       describe "as a list" do
         describe "of strings" do
           it "returns true when the attribute exists" do
-            expect(plugin.get_attribute("the_monarch", "arch_rival")).
-              to eql("dr_venture")
+            expect(plugin.get_attribute("the_monarch", "arch_rival"))
+              .to eql("dr_venture")
           end
 
           describe "when the attribute does not exist" do
@@ -239,8 +239,8 @@ shared_examples "Ohai::DSL::Plugin" do
 
         describe "of symbols" do
           it "returns true when the attribute exists" do
-            expect(plugin.get_attribute(:the_monarch, :arch_rival)).
-              to eql("dr_venture")
+            expect(plugin.get_attribute(:the_monarch, :arch_rival))
+              .to eql("dr_venture")
           end
 
           describe "when the attribute does not exist" do
@@ -592,7 +592,7 @@ describe Ohai::DSL::Plugin::VersionVII do
       include_examples "plugin config lookup"
 
       it "returns the configuration sub-option value" do
-        Ohai.config[:plugin][snake_name][:foo] = { :bar => true }
+        Ohai.config[:plugin][snake_name][:foo] = { bar: true }
         expect(plugin.configuration(:foo, :bar)).to eq(true)
       end
     end

data/spec/unit/hints_spec.rb

@@ -42,8 +42,8 @@ describe "Ohai::Hints" do
   end
 
   when_plugins_directory "contains empty and full hints" do
-    with_plugin("cloud.json", <<EOF)
-{"name":"circus"}
+    with_plugin("cloud.json", <<~EOF)
+      {"name":"circus"}
 EOF
 
     with_plugin("cloud_empty.json", <<EOF)

data/spec/unit/loader_spec.rb

@@ -23,7 +23,7 @@ describe Ohai::Loader do
   extend IntegrationSupport
 
   let(:loader) { Ohai::Loader.new(ohai) }
-  let(:ohai) { double("Ohai::System", :data => Mash.new, :provides_map => provides_map, logger: Ohai::Log) }
+  let(:ohai) { double("Ohai::System", data: Mash.new, provides_map: provides_map, logger: Ohai::Log) }
   let(:provides_map) { Ohai::ProvidesMap.new }
 
   describe "#initialize" do
@@ -34,16 +34,16 @@ describe Ohai::Loader do
   end
 
   when_plugins_directory "is an additional plugin path" do
-    with_plugin("cookbook_a/alpha.rb", <<EOF)
-Ohai.plugin(:Alpha) do
-  provides "alpha"
-end
+    with_plugin("cookbook_a/alpha.rb", <<~EOF)
+      Ohai.plugin(:Alpha) do
+        provides "alpha"
+      end
 EOF
 
-    with_plugin("cookbook_b/beta.rb", <<EOF)
-Ohai.plugin(:Beta) do
-  provides "beta"
-end
+    with_plugin("cookbook_b/beta.rb", <<~EOF)
+      Ohai.plugin(:Beta) do
+        provides "beta"
+      end
 EOF
 
     describe "#load_additional" do
@@ -59,50 +59,50 @@ EOF
   end
 
   when_plugins_directory "contains invalid plugins" do
-    with_plugin("extra_s.rb", <<EOF)
-Ohai.plugins(:ExtraS) do
-  provides "the_letter_s"
-end
+    with_plugin("extra_s.rb", <<~EOF)
+      Ohai.plugins(:ExtraS) do
+        provides "the_letter_s"
+      end
 EOF
 
-    with_plugin("no_method.rb", <<EOF)
-Ohai.plugin(:NoMethod) do
-  really_wants "this_attribute"
-end
+    with_plugin("no_method.rb", <<~EOF)
+      Ohai.plugin(:NoMethod) do
+        really_wants "this_attribute"
+      end
 EOF
 
-    with_plugin("illegal_def.rb", <<EOF)
-Ohai.plugin(:Zoo) do
-  collect_data(:darwin) do
-  end
-  collect_data(:darwin) do
-  end
-end
+    with_plugin("illegal_def.rb", <<~EOF)
+      Ohai.plugin(:Zoo) do
+        collect_data(:darwin) do
+        end
+        collect_data(:darwin) do
+        end
+      end
 EOF
 
-    with_plugin("unexpected_error.rb", <<EOF)
-Ohai.plugin(:Zoo) do
-  raise "You aren't expecting this."
-end
+    with_plugin("unexpected_error.rb", <<~EOF)
+      Ohai.plugin(:Zoo) do
+        raise "You aren't expecting this."
+      end
 EOF
 
-    with_plugin("bad_symbol.rb", <<EOF)
-Ohai.plugin(:1nval!d) do
-  provides "not_a_symbol"
-end
+    with_plugin("bad_symbol.rb", <<~EOF)
+      Ohai.plugin(:1nval!d) do
+        provides "not_a_symbol"
+      end
 EOF
 
-    with_plugin("no_end.rb", <<EOF)
-Ohai.plugin(:NoEnd) do
-  provides "fish_oil"
-  collect_data do
-end
+    with_plugin("no_end.rb", <<~EOF)
+      Ohai.plugin(:NoEnd) do
+        provides "fish_oil"
+        collect_data do
+      end
 EOF
 
-    with_plugin("bad_name.rb", <<EOF)
-Ohai.plugin(:you_give_plugins_a_bad_name) do
-  provides "that/one/song"
-end
+    with_plugin("bad_name.rb", <<~EOF)
+      Ohai.plugin(:you_give_plugins_a_bad_name) do
+        provides "that/one/song"
+      end
 EOF
 
     describe "load_plugin() method" do

data/spec/unit/mixin/azure_metadata_spec.rb

@@ -43,7 +43,7 @@ describe Ohai::Mixin::AzureMetadata do
 
   describe "#fetch_metadata" do
     it "returns an empty hash given a non-200 response" do
-      http_mock = double("http", { :code => "500" })
+      http_mock = double("http", { code: "500" })
       allow(mixin).to receive(:http_get).and_return(http_mock)
 
       expect(mixin.logger).to receive(:warn)
@@ -52,7 +52,7 @@ describe Ohai::Mixin::AzureMetadata do
     end
 
     it "returns an empty hash given invalid JSON response" do
-      http_mock = double("http", { :code => "200", :body => '{ "foo" "bar"}' })
+      http_mock = double("http", { code: "200", body: '{ "foo" "bar"}' })
       allow(mixin).to receive(:http_get).and_return(http_mock)
 
       expect(mixin.logger).to receive(:warn)
@@ -61,7 +61,7 @@ describe Ohai::Mixin::AzureMetadata do
     end
 
     it "returns a populated hash given valid JSON response" do
-      http_mock = double("http", { :code => "200", :body => '{ "foo": "bar"}' })
+      http_mock = double("http", { code: "200", body: '{ "foo": "bar"}' })
       allow(mixin).to receive(:http_get).and_return(http_mock)
 
       expect(mixin.logger).not_to receive(:warn)