ohai 8.26.1 → 13.0.0

data/spec/unit/plugins/windows/cpu_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 shared_examples "a cpu" do |cpu_no|
   describe "cpu #{cpu_no}" do
@@ -32,8 +32,13 @@ shared_examples "a cpu" do |cpu_no|
       expect(@plugin[:cpu]["#{cpu_no}"][:vendor_id]).to eq("GenuineIntel")
     end
 
-    it "should set model_name to Intel64 Family 6 Model 70 Stepping 1" do
+    it "should set model_name to Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz" do
       expect(@plugin[:cpu]["#{cpu_no}"][:model_name])
+        .to eq("Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz")
+    end
+
+    it "should set description to Intel64 Family 6 Model 70 Stepping 1" do
+      expect(@plugin[:cpu]["#{cpu_no}"][:description])
         .to eq("Intel64 Family 6 Model 70 Stepping 1")
     end
 
@@ -64,6 +69,7 @@ describe Ohai::System, "Windows cpu plugin" do
     @double_wmi_instance = instance_double(WmiLite::Wmi)
 
     @processors = [{ "description" => "Intel64 Family 6 Model 70 Stepping 1",
+                     "name" => "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz",
                      "deviceid" => "CPU0",
                      "family" => 2,
                      "manufacturer" => "GenuineIntel",
@@ -75,6 +81,7 @@ describe Ohai::System, "Windows cpu plugin" do
                      "l2cachesize" => 64 },
 
                    { "description" => "Intel64 Family 6 Model 70 Stepping 1",
+                     "name" => "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz",
                      "deviceid" => "CPU1",
                      "family" => 2,
                      "manufacturer" => "GenuineIntel",

data/spec/unit/plugins/windows/fips_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "plugin fips", :windows_only do
   let(:enabled) { 0 }

data/spec/unit/plugins/windows/memory_spec.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Windows memory plugin", :windows_only do
   before do

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Windows plugin uptime" do
 

data/spec/unit/plugins/windows/virtualization_spec.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../../spec_helper.rb")
+require_relative "../../../spec_helper.rb"
 
 describe Ohai::System, "Windows virtualization platform" do
   let(:plugin) { get_plugin("windows/virtualization") }

data/spec/unit/provides_map_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb")
+require_relative "../spec_helper.rb"
 
 describe Ohai::ProvidesMap do
 

data/spec/unit/runner_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb")
+require_relative "../spec_helper.rb"
 
 describe Ohai::Runner, "run_plugin" do
   let(:safe_run) { true }

data/spec/unit/system_spec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Claire McQuin (<claire@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2008-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,13 +17,14 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb")
+require_relative "../spec_helper.rb"
 require "ohai/mixin/os"
 
 describe "Ohai::System" do
   extend IntegrationSupport
 
-  let(:ohai) { Ohai::System.new }
+  let(:ohai_external) {}
+  let(:ohai) { Ohai::System.new({ invoked_from_cli: true }) }
 
   describe "#initialize" do
     it "returns an Ohai::System object" do
@@ -38,24 +39,11 @@ describe "Ohai::System" do
       expect(ohai.v6_dependency_solver).to be_a_kind_of(Hash)
     end
 
-    it "merges deprecated config settings into the ohai config context" do
-      expect(Ohai::Log).to receive(:warn).
-        with(/Ohai::Config\[:disabled_plugins\] is deprecated/)
-      Ohai::Config[:disabled_plugins] = [ :Foo, :Baz ]
-      expect(Ohai::Config).to receive(:merge_deprecated_config).
-        and_call_original
-      Ohai::System.new
-      expect(Ohai.config[:disabled_plugins]).to eq([ :Foo, :Baz ])
-    end
-
     it "merges provided configuration options into the ohai config context" do
       config = {
         disabled_plugins: [ :Foo, :Baz ],
         directory: "/some/extra/plugins",
-        critical_plugins: [ :Foo, :Bar ],
       }
-      allow(Ohai::Config).to receive(:merge_deprecated_config)
-      expect(Ohai.config).to receive(:merge!).with(config).and_call_original
       Ohai::System.new(config)
       config.each do |option, value|
         expect(Ohai.config[option]).to eq(value)
@@ -67,57 +55,36 @@ describe "Ohai::System" do
 
       it "adds directory to plugin_path" do
         Ohai.config[:directory] = directory
-        Ohai::System.new
+        Ohai::System.new({ invoked_from_cli: true })
         expect(Ohai.config[:plugin_path]).to include(directory)
       end
     end
 
-    shared_examples_for "appendable deprecated configuration option" do
-      it "logs a warning and configures the option on the ohai config context" do
-        Ohai::Config[option] << value
-        expect(Ohai::Log).to receive(:warn).
-          with(/Ohai::Config\[:#{option}\] is deprecated/)
-        Ohai::System.new
-        expect(Ohai.config[option]).to include(value)
-      end
-    end
-
-    context "when a top-level hints_path is configured" do
-      include_examples "appendable deprecated configuration option" do
-        let(:option) { :hints_path }
-        let(:value) { "/path/to/hints" }
-      end
-    end
-
-    context "when a top-level plugin_path is configured" do
-      include_examples "appendable deprecated configuration option" do
-        let(:option) { :plugin_path }
-        let(:value) { "/path/to/plugins" }
-      end
-    end
-
-    context "first time configuration" do
-      before { allow(Ohai::Log).to receive(:configured?).and_return(false) }
-
+    context "when testing the intializer that does way too much" do
       it "configures logging" do
         log_level = :debug
         Ohai.config[:log_level] = log_level
         expect(Ohai::Log).to receive(:level=).with(log_level)
-        Ohai::System.new
+        Ohai::System.new({ invoked_from_cli: true })
       end
 
       it "resolves log_level when set to :auto" do
         expect(Ohai::Log).to receive(:level=).with(:info)
-        Ohai::System.new
+        Ohai::System.new({ invoked_from_cli: true })
       end
-    end
 
-    context "after first time configuration" do
-      before { allow(Ohai::Log).to receive(:configured?).and_return(true) }
+      context "when called externally" do
+        it "does not configure logging" do
+          log_level = :debug
+          Ohai.config[:log_level] = log_level
+          expect(Ohai::Log).not_to receive(:level=).with(log_level)
+          Ohai::System.new()
+        end
 
-      it "configures logging" do
-        expect(Ohai::Log).not_to receive(:init).with(Ohai.config[:log_location])
-        Ohai::System.new
+        it "does not resolve log_level when set to :auto" do
+          expect(Ohai::Log).not_to receive(:level=).with(:info)
+          Ohai::System.new()
+        end
       end
     end
   end
@@ -199,6 +166,8 @@ EOF
         ohai.all_plugins
         expect(ohai.data[:zoo]).to eq("animals")
         expect(ohai.data[:park]).to eq("plants")
+        expect(ohai.data[:zoo]).to be_frozen
+        expect(ohai.data[:park]).to be_frozen
       end
 
       describe "when using :disabled_plugins" do
@@ -338,15 +307,6 @@ Ohai.plugin(:Park) do
     park("plants")
   end
 end
-EOF
-
-      with_plugin("fails.rb", <<EOF)
-Ohai.plugin(:Fails) do
-  provides 'fails'
-  collect_data(:default) do
-    fail 'thing'
-  end
-end
 EOF
 
       it "should collect data from all the plugins" do
@@ -354,6 +314,8 @@ EOF
         ohai.all_plugins
         expect(ohai.data[:zoo]).to eq("animals")
         expect(ohai.data[:park]).to eq("plants")
+        expect(ohai.data[:zoo]).to be_frozen
+        expect(ohai.data[:park]).to be_frozen
       end
 
       it "should write an error to Ohai::Log" do
@@ -381,21 +343,6 @@ EOF
           expect(ohai.data[:park]).to eq("plants")
         end
       end
-
-      describe "when using :critical_plugins" do
-        before do
-          Ohai.config[:critical_plugins] = [ :Fails ]
-        end
-        after do
-          Ohai.config[:critical_plugins] = []
-        end
-
-        it "should fail when critical plugins fail" do
-          Ohai.config[:plugin_path] = [ path_to(".") ]
-          expect { ohai.all_plugins }.to raise_error(Ohai::Exceptions::CriticalPluginFailure)
-        end
-
-      end
     end
 
     when_plugins_directory "contains v6 & v7 plugins in different directories" do
@@ -764,4 +711,49 @@ EOF
     end
   end
 
+  describe "when loading a specific plugin path" do
+    when_plugins_directory "contains v7 plugins" do
+      with_plugin("my_cookbook/canteloupe.rb", <<-E)
+        Ohai.plugin(:Canteloupe) do
+          provides 'canteloupe'
+
+          collect_data do
+            canteloupe Mash.new
+          end
+        end
+      E
+
+      with_plugin("english/english.rb", <<-E)
+        Ohai.plugin(:English) do
+          provides 'canteloupe/english'
+
+          depends 'canteloupe'
+
+          collect_data do
+            canteloupe[:english] = Mash.new
+            canteloupe[:english][:version] = 2014
+          end
+        end
+      E
+
+      with_plugin("french/french.rb", <<-E)
+        Ohai.plugin(:French) do
+          provides 'canteloupe/french'
+
+          depends 'canteloupe'
+
+          collect_data do
+            canteloupe[:french] = Mash.new
+            canteloupe[:french][:version] = 2012
+          end
+        end
+      E
+
+      it "should run all the plugins" do
+        ohai.run_additional_plugins(@plugins_directory)
+        expect(ohai.data[:canteloupe][:english][:version]).to eq(2014)
+        expect(ohai.data[:canteloupe][:french][:version]).to eq(2012)
+      end
+    end
+  end
 end

data/spec/unit/util/file_helper_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "spec_helper"
+require_relative "../../spec_helper.rb"
 require "ohai/util/file_helper"
 
 class FileHelperMock

data/spec/unit/util/ip_helper_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 require "ipaddress"
-require "spec_helper"
+require_relative "../../spec_helper.rb"
 require "ohai/util/ip_helper"
 
 class IpHelperMock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.26.1
+  version: 13.0.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -205,8 +205,10 @@ files:
 - lib/ohai/mixin/command.rb
 - lib/ohai/mixin/constant_helper.rb
 - lib/ohai/mixin/dmi_decode.rb
+- lib/ohai/mixin/do_metadata.rb
 - lib/ohai/mixin/ec2_metadata.rb
 - lib/ohai/mixin/gce_metadata.rb
+- lib/ohai/mixin/http_helper.rb
 - lib/ohai/mixin/network_constants.rb
 - lib/ohai/mixin/os.rb
 - lib/ohai/mixin/seconds_to_human.rb
@@ -228,11 +230,9 @@ files:
 - lib/ohai/plugins/c.rb
 - lib/ohai/plugins/chef.rb
 - lib/ohai/plugins/cloud.rb
-- lib/ohai/plugins/cloud_v2.rb
 - lib/ohai/plugins/command.rb
 - lib/ohai/plugins/darwin/cpu.rb
 - lib/ohai/plugins/darwin/filesystem.rb
-- lib/ohai/plugins/darwin/filesystem2.rb
 - lib/ohai/plugins/darwin/hardware.rb
 - lib/ohai/plugins/darwin/memory.rb
 - lib/ohai/plugins/darwin/network.rb
@@ -271,11 +271,9 @@ files:
 - lib/ohai/plugins/linux/block_device.rb
 - lib/ohai/plugins/linux/cpu.rb
 - lib/ohai/plugins/linux/filesystem.rb
-- lib/ohai/plugins/linux/filesystem2.rb
 - lib/ohai/plugins/linux/fips.rb
 - lib/ohai/plugins/linux/hostnamectl.rb
 - lib/ohai/plugins/linux/lsb.rb
-- lib/ohai/plugins/linux/lspci.rb
 - lib/ohai/plugins/linux/machineid.rb
 - lib/ohai/plugins/linux/mdadm.rb
 - lib/ohai/plugins/linux/memory.rb
@@ -290,7 +288,6 @@ files:
 - lib/ohai/plugins/netbsd/network.rb
 - lib/ohai/plugins/netbsd/platform.rb
 - lib/ohai/plugins/network.rb
-- lib/ohai/plugins/network_listeners.rb
 - lib/ohai/plugins/nodejs.rb
 - lib/ohai/plugins/ohai.rb
 - lib/ohai/plugins/ohai_time.rb
@@ -315,12 +312,6 @@ files:
 - lib/ohai/plugins/scala.rb
 - lib/ohai/plugins/shard.rb
 - lib/ohai/plugins/shells.rb
-- lib/ohai/plugins/sigar/cpu.rb
-- lib/ohai/plugins/sigar/filesystem.rb
-- lib/ohai/plugins/sigar/memory.rb
-- lib/ohai/plugins/sigar/network.rb
-- lib/ohai/plugins/sigar/network_route.rb
-- lib/ohai/plugins/sigar/platform.rb
 - lib/ohai/plugins/softlayer.rb
 - lib/ohai/plugins/solaris2/cpu.rb
 - lib/ohai/plugins/solaris2/dmi.rb
@@ -418,9 +409,7 @@ files:
 - spec/unit/plugins/c_spec.rb
 - spec/unit/plugins/chef_spec.rb
 - spec/unit/plugins/cloud_spec.rb
-- spec/unit/plugins/cloud_v2_spec.rb
 - spec/unit/plugins/darwin/cpu_spec.rb
-- spec/unit/plugins/darwin/filesystem2_spec.rb
 - spec/unit/plugins/darwin/filesystem_spec.rb
 - spec/unit/plugins/darwin/hardware_spec.rb
 - spec/unit/plugins/darwin/hardware_system_profiler_output.rb
@@ -457,14 +446,12 @@ files:
 - spec/unit/plugins/linode_spec.rb
 - spec/unit/plugins/linux/block_device_spec.rb
 - spec/unit/plugins/linux/cpu_spec.rb
-- spec/unit/plugins/linux/filesystem2_spec.rb
 - spec/unit/plugins/linux/filesystem_spec.rb
 - spec/unit/plugins/linux/fips_spec.rb
 - spec/unit/plugins/linux/hostname_spec.rb
 - spec/unit/plugins/linux/hostnamectl_spec.rb
 - spec/unit/plugins/linux/kernel_spec.rb
 - spec/unit/plugins/linux/lsb_spec.rb
-- spec/unit/plugins/linux/lspci_spec.rb
 - spec/unit/plugins/linux/machineid_spec.rb
 - spec/unit/plugins/linux/mdadm_spec.rb
 - spec/unit/plugins/linux/memory_spec.rb
@@ -501,7 +488,6 @@ files:
 - spec/unit/plugins/scala_spec.rb
 - spec/unit/plugins/shard_spec.rb
 - spec/unit/plugins/shells_spec.rb
-- spec/unit/plugins/sigar/network_route_spec.rb
 - spec/unit/plugins/softlayer_spec.rb
 - spec/unit/plugins/solaris2/cpu_spec.rb
 - spec/unit/plugins/solaris2/dmi_spec.rb
@@ -540,7 +526,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -548,7 +534,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON