ohai 8.26.1 → 13.0.0

data/lib/ohai/plugins/linux/virtualization.rb

@@ -26,10 +26,6 @@ Ohai.plugin(:Virtualization) do
     which("lxc-version")
   end
 
-  def docker_exists?
-    which("docker")
-  end
-
   def nova_exists?
     which("nova")
   end
@@ -185,7 +181,7 @@ Ohai.plugin(:Virtualization) do
     if File.exist?("/proc/self/cgroup")
       cgroup_content = File.read("/proc/self/cgroup")
       if cgroup_content =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$} ||
-          cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-?.+$}
+          cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-.+$}
         Ohai::Log.debug("Plugin Virtualization: /proc/self/cgroup indicates #{$1} container. Detecting as #{$1} guest")
         virtualization[:system] = $1
         virtualization[:role] = "guest"

data/lib/ohai/plugins/scala.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 Ohai.plugin(:Scala) do
-  provides "languages/scala", "languages/scala/sbt"
+  provides "languages/scala"
   depends "languages"
 
   collect_data(:default) do
@@ -32,18 +32,6 @@ Ohai.plugin(:Scala) do
       Ohai::Log.debug('Plugin Scala: Could not shell_out "scala -version". Skipping data')
     end
 
-    # Check for sbt
-    begin
-      # sbt launcher version 0.13.7
-      so = shell_out("sbt --version", timeout: 5)
-      if so.exitstatus == 0
-        scala[:sbt] = Mash.new
-        scala[:sbt][:version] = so.stdout.split[3]
-      end
-    rescue Ohai::Exceptions::Exec
-      Ohai::Log.debug('Plugin Scala: Could not shell_out "sbt --version". Skipping data')
-    end
-
     languages[:scala] = scala unless scala.empty?
   end
 end

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

@@ -103,8 +103,7 @@ Ohai.plugin(:Network) do
     cint = nil
 
     so.stdout.lines do |line|
-      # regex: http://rubular.com/r/Iag7JLVTVe
-      if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+) index (\d+)/
+      if line =~ /^([0-9a-zA-Z\.\:\-]+)\S/
         cint = $1
         iface[cint] = Mash.new unless iface[cint]
         iface[cint][:mtu] = $2

data/lib/ohai/plugins/uptime.rb

@@ -43,15 +43,6 @@ Ohai.plugin(:Uptime) do
     return [nil, nil]
   end
 
-  collect_data(:hpux, :default) do
-    require "sigar"
-
-    sigar = Sigar.new
-    uptime = sigar.uptime.uptime
-    uptime_seconds uptime.to_i * 1000
-    uptime seconds_to_human(uptime.to_i)
-  end
-
   collect_data(:darwin) do
     data = collect_uptime("/usr/sbin/sysctl")
     uptime_seconds data.first

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

@@ -60,7 +60,8 @@ Ohai.plugin(:CPU) do
                                        processor["stepping"]
                                      end
       cpu[current_cpu]["physical_id"] = processor["deviceid"]
-      cpu[current_cpu]["model_name"] = processor["description"]
+      cpu[current_cpu]["model_name"] = processor["name"]
+      cpu[current_cpu]["description"] = processor["description"]
       cpu[current_cpu]["mhz"] = processor["maxclockspeed"].to_s
       cpu[current_cpu]["cache_size"] = "#{processor['l2cachesize']} KB"
     end

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

@@ -1,6 +1,6 @@
 #
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# 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");

data/lib/ohai/runner.rb

@@ -22,13 +22,11 @@ require "ohai/dsl"
 module Ohai
   class Runner
 
-    attr_reader :failed_plugins
     # safe_run: set to true if this runner will run plugins in
     # safe-mode. default false.
     def initialize(controller, safe_run = false)
       @provides_map = controller.provides_map
       @safe_run = safe_run
-      @failed_plugins = []
     end
 
     # Runs plugins and any un-run dependencies.
@@ -84,9 +82,6 @@ module Ohai
 
         if dependency_providers.empty?
           @safe_run ? next_plugin.safe_run : next_plugin.run
-          if next_plugin.failed
-            @failed_plugins << next_plugin.name
-          end
         else
           visited << next_plugin << dependency_providers.first
         end

data/lib/ohai/system.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@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");
@@ -39,10 +39,14 @@ module Ohai
     attr_reader :provides_map
     attr_reader :v6_dependency_solver
 
+    # the cli flag is used to determine if we're being constructed by
+    # something like chef-client (which doesn't not set this flag) and
+    # which sets up its own loggers, or if we're coming from Ohai::Application
+    # and therefore need to configure Ohai's own logger.
     def initialize(config = {})
+      @cli = config[:invoked_from_cli]
       @plugin_path = ""
       @config = config
-      @failed_plugins = []
       reset_system
     end
 
@@ -52,7 +56,7 @@ module Ohai
       @v6_dependency_solver = Hash.new
 
       configure_ohai
-      configure_logging
+      configure_logging if @cli
 
       @loader = Ohai::Loader.new(self)
       @runner = Ohai::Runner.new(self, true)
@@ -103,11 +107,18 @@ module Ohai
         Ohai::Log.error("Encountered error while running plugins: #{e.inspect}")
         raise
       end
-      critical_failed = Ohai::Config.ohai[:critical_plugins] & @runner.failed_plugins
-      unless critical_failed.empty?
-        msg = "The following Ohai plugins marked as critical failed: #{critical_failed}. Exiting."
-        raise Ohai::Exceptions::CriticalPluginFailure, msg
+
+      # Freeze all strings.
+      freeze_strings!
+    end
+
+    def run_additional_plugins(plugin_path)
+      @loader.load_additional(plugin_path).each do |plugin|
+        Ohai::Log.debug "Running plugin #{plugin}"
+        @runner.run_plugin(plugin)
       end
+
+      freeze_strings!
     end
 
     def have_v6_plugin?(name)
@@ -215,7 +226,6 @@ module Ohai
     private
 
     def configure_ohai
-      Ohai::Config.merge_deprecated_config
       Ohai.config.merge!(@config)
 
       if Ohai.config[:directory] &&
@@ -233,5 +243,25 @@ module Ohai
         Ohai::Log.level = Ohai.config[:log_level]
       end
     end
+
+    # Freeze all string values in @data. This makes them immutable and saves
+    # a bit of RAM.
+    #
+    # @api private
+    # @return [void]
+    def freeze_strings!
+      # Recursive visitor pattern helper.
+      visitor = lambda do |val|
+        case val
+        when Hash
+          val.each_value { |v| visitor.call(v) }
+        when Array
+          val.each { |v| visitor.call(v) }
+        when String
+          val.freeze
+        end
+      end
+      visitor.call(@data)
+    end
   end
 end

data/lib/ohai/version.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@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");
@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "8.26.1"
+  VERSION = "13.0.0"
 end

data/ohai.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://docs.chef.io/ohai.html"
 
-  s.required_ruby_version = ">= 2.1.0"
+  s.required_ruby_version = ">= 2.3"
 
   s.add_dependency "systemu", "~> 2.6.4"
   s.add_dependency "ffi-yajl", "~> 2.2"

data/spec/functional/application_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../spec_helper"
-
 require "ohai/application"
 
 RSpec.describe "Ohai::Application" do
@@ -86,45 +85,6 @@ RSpec.describe "Ohai::Application" do
       end
     end
 
-    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(:config_content) do
-        <<-CONFIG
-log_location "#{log_location}"
-log_level    :#{log_level}
-Ohai::Config[:disabled_plugins] = #{disabled_plugins}
-Ohai::Config[:plugin_path] << "#{plugin_path}"
-CONFIG
-      end
-
-      # config settings
-      let(:disabled_plugins) { [ :Foo, :Baz ] }
-
-      let(:log_level) { :debug }
-
-      let(:log_location) { "path/to/log" }
-
-      let(:plugin_path) { "/path/to/plugins" }
-
-      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.
-        options = [ :log_location, :log_level, :disabled_plugins ]
-        options.each do |option|
-          expect(Ohai::Log).to receive(:warn).
-            with(/Ohai::Config\[:#{option}\] is deprecated/)
-        end
-        app.configure_ohai
-      end
-    end
-
     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

data/spec/functional/plugins/powershell_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, "languages plugin" do
   VERSION_MATCHING_REGEX = /^(?:[\d]+\.)+[\d]+$/

data/spec/functional/plugins/root_group_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, "root_group plugin" do
   let(:plugin) { get_plugin("root_group") }

data/spec/functional/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/ohai_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 do
 

data/spec/support/integration_helper.rb

@@ -1,3 +1,20 @@
+#
+# License:: Apache License, Version 2.0
+#
+# 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 expressed or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+#
+
 require "tmpdir"
 
 module IntegrationSupport

data/spec/support/platform_helpers.rb

@@ -1,3 +1,20 @@
+#
+# License:: Apache License, Version 2.0
+#
+# 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 expressed or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+#
+
 def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end

data/spec/unit/application_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../spec_helper"
-
 require "ohai/application"
 
 RSpec.describe "Ohai::Application" do

data/spec/unit/config_spec.rb

@@ -17,79 +17,10 @@
 #
 
 require_relative "../spec_helper"
-
 require "ohai/config"
 
 RSpec.describe Ohai::Config do
 
-  describe "top-level configuration options" do
-    shared_examples_for "option" do
-      it "logs a deprecation warning and sets the value" do
-        expect(Ohai::Log).to receive(:warn).
-          with(/Ohai::Config\[:#{option}\] is deprecated/)
-        Ohai::Config[option] = value
-        expect(Ohai::Config[option]).to eq(value)
-      end
-    end
-
-    shared_examples_for "appendable option" do
-      it "sets the value" do
-        expect(Ohai::Log).to_not receive(:warn)
-        Ohai::Config[option] << value
-        expect(Ohai::Config[option]).to include(value)
-      end
-    end
-
-    describe ":directory" do
-      include_examples "option" do
-        let(:option) { :directory }
-        let(:value)  { "/some/fantastic/plugins" }
-      end
-    end
-
-    describe ":disabled_plugins" do
-      include_examples "option" do
-        let(:option) { :disabled_plugins }
-        let(:value)  { [ :Foo, :Baz ] }
-      end
-    end
-
-    describe ":hints_path" do
-      include_examples "appendable option" do
-        let(:option) { :hints_path }
-        let(:value)  { "/some/helpful/hints" }
-      end
-    end
-
-    describe ":log_level" do
-      include_examples "option" do
-        let(:option) { :log_level }
-        let(:value)  { :cheese }
-      end
-    end
-
-    describe ":log_location" do
-      include_examples "option" do
-        let(:option) { :log_location }
-        let(:value)  { "/etc/chef/cache/loooogs" }
-      end
-    end
-
-    describe ":plugin_path" do
-      include_examples "appendable option" do
-        let(:option) { :plugin_path }
-        let(:value)  { "/some/fantastic/plugins" }
-      end
-    end
-
-    describe ":version" do
-      include_examples "option" do
-        let(:option) { :version }
-        let(:value)  { "8.2.0" }
-      end
-    end
-  end
-
   describe "config_context :ohai" do
     describe "option :plugin" do
       it "gets configured with a value" do
@@ -118,48 +49,6 @@ RSpec.describe Ohai::Config do
     end
   end
 
-  describe "::merge_deprecated_config" do
-    before(:each) do
-      allow(Ohai::Log).to receive(:warn)
-      configure_ohai
-    end
-
-    def configure_ohai
-      Ohai::Config[:directory] = "/some/fantastic/plugins"
-      Ohai::Config[:disabled_plugins] = [ :Foo, :Baz ]
-      Ohai::Config[:log_level] = :debug
-    end
-
-    it "merges top-level config values into the ohai config context" do
-      Ohai::Config.merge_deprecated_config
-      expect(Ohai::Config.ohai.configuration).to eq (Ohai::Config.configuration)
-    end
-
-    shared_examples_for "delayed warn" do
-      it "logs a deprecation warning and merges the value" do
-        expect(Ohai::Log).to receive(:warn).
-          with(/Ohai::Config\[:#{option}\] is deprecated/)
-        Ohai::Config[option] << value
-        Ohai::Config.merge_deprecated_config
-        expect(Ohai::Config.ohai[option]).to include(value)
-      end
-    end
-
-    context "when :hints_path is set" do
-      include_examples "delayed warn" do
-        let(:option) { :hints_path }
-        let(:value)  { "/some/helpful/hints" }
-      end
-    end
-
-    context "when :plugin_path is set" do
-      include_examples "delayed warn" do
-        let(:option) { :plugin_path }
-        let(:value)  { "/some/fantastic/plugins" }
-      end
-    end
-  end
-
   describe "Ohai.config" do
     it "returns the ohai config context" do
       expect(Ohai.config).to eq(Ohai::Config.ohai)