ohai 13.12.6 → 14.0.28

data/spec/unit/util/file_helper_spec.rb

@@ -28,6 +28,8 @@ describe "Ohai::Util::FileHelper" do
 
   before(:each) do
     allow(file_helper).to receive(:name).and_return("Fakeclass")
+    logger = instance_double("Mixlib::Log::Child", trace: nil, debug: nil, warn: nil)
+    allow(file_helper).to receive(:logger).and_return(logger)
     allow(File).to receive(:executable?).and_return(false)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 13.12.6
+  version: 14.0.28
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -42,16 +42,16 @@ dependencies:
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
@@ -70,22 +70,22 @@ dependencies:
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -162,20 +162,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.5.0.alpha.1
+        version: '12.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.5.0.alpha.1
+        version: '12.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '15'
 description: Ohai profiles your system and emits JSON
 email: adam@chef.io
 executables:
@@ -188,13 +188,13 @@ files:
 - README.md
 - Rakefile
 - bin/ohai
+- docs/man/man1/ohai.1
 - lib/ohai.rb
 - lib/ohai/application.rb
 - lib/ohai/common/dmi.rb
 - lib/ohai/config.rb
 - lib/ohai/dsl.rb
 - lib/ohai/dsl/plugin.rb
-- lib/ohai/dsl/plugin/versionvi.rb
 - lib/ohai/dsl/plugin/versionvii.rb
 - lib/ohai/exception.rb
 - lib/ohai/hints.rb
@@ -211,6 +211,7 @@ files:
 - lib/ohai/mixin/http_helper.rb
 - lib/ohai/mixin/network_constants.rb
 - lib/ohai/mixin/os.rb
+- lib/ohai/mixin/scaleway_metadata.rb
 - lib/ohai/mixin/seconds_to_human.rb
 - lib/ohai/mixin/softlayer_metadata.rb
 - lib/ohai/mixin/string.rb
@@ -226,7 +227,6 @@ files:
 - lib/ohai/plugins/aix/virtualization.rb
 - lib/ohai/plugins/azure.rb
 - lib/ohai/plugins/bsd/filesystem.rb
-- lib/ohai/plugins/bsd/filesystem2.rb
 - lib/ohai/plugins/bsd/virtualization.rb
 - lib/ohai/plugins/c.rb
 - lib/ohai/plugins/chef.rb
@@ -242,6 +242,7 @@ files:
 - lib/ohai/plugins/darwin/virtualization.rb
 - lib/ohai/plugins/digital_ocean.rb
 - lib/ohai/plugins/dmi.rb
+- lib/ohai/plugins/docker.rb
 - lib/ohai/plugins/dragonflybsd/cpu.rb
 - lib/ohai/plugins/dragonflybsd/memory.rb
 - lib/ohai/plugins/dragonflybsd/network.rb
@@ -262,12 +263,12 @@ files:
 - lib/ohai/plugins/haskell.rb
 - lib/ohai/plugins/hostname.rb
 - lib/ohai/plugins/init_package.rb
-- lib/ohai/plugins/ip_scopes.rb
 - lib/ohai/plugins/java.rb
 - lib/ohai/plugins/joyent.rb
 - lib/ohai/plugins/kernel.rb
 - lib/ohai/plugins/keys.rb
 - lib/ohai/plugins/languages.rb
+- lib/ohai/plugins/libvirt.rb
 - lib/ohai/plugins/linode.rb
 - lib/ohai/plugins/linux/block_device.rb
 - lib/ohai/plugins/linux/cpu.rb
@@ -313,6 +314,7 @@ files:
 - lib/ohai/plugins/ruby.rb
 - lib/ohai/plugins/rust.rb
 - lib/ohai/plugins/scala.rb
+- lib/ohai/plugins/scaleway.rb
 - lib/ohai/plugins/shard.rb
 - lib/ohai/plugins/shells.rb
 - lib/ohai/plugins/softlayer.rb
@@ -328,7 +330,6 @@ files:
 - lib/ohai/plugins/timezone.rb
 - lib/ohai/plugins/uptime.rb
 - lib/ohai/plugins/virtualbox.rb
-- lib/ohai/plugins/virtualization.rb
 - lib/ohai/plugins/vmware.rb
 - lib/ohai/plugins/windows/cpu.rb
 - lib/ohai/plugins/windows/drivers.rb
@@ -361,7 +362,6 @@ files:
 - spec/data/plugins/java.output
 - spec/data/plugins/lslpp.output
 - spec/data/plugins/lua.output
-- spec/data/plugins/messages.rb
 - spec/data/plugins/node.output
 - spec/data/plugins/pacman.output
 - spec/data/plugins/perl.output
@@ -372,7 +372,6 @@ files:
 - spec/data/plugins/python.output
 - spec/data/plugins/rpmquery.output
 - spec/data/plugins/uname.output
-- spec/data/plugins/v6message.rb
 - spec/data/plugins/v7message.rb
 - spec/data/plugins/what.output
 - spec/data/plugins/xlc.output
@@ -409,7 +408,6 @@ files:
 - spec/unit/plugins/aix/uptime_spec.rb
 - spec/unit/plugins/aix/virtualization_spec.rb
 - spec/unit/plugins/azure_spec.rb
-- spec/unit/plugins/bsd/filesystem2_spec.rb
 - spec/unit/plugins/bsd/filesystem_spec.rb
 - spec/unit/plugins/bsd/virtualization_spec.rb
 - spec/unit/plugins/c_spec.rb
@@ -429,6 +427,7 @@ files:
 - spec/unit/plugins/darwin/virtualization_spec.rb
 - spec/unit/plugins/digital_ocean_spec.rb
 - spec/unit/plugins/dmi_spec.rb
+- spec/unit/plugins/docker_spec.rb
 - spec/unit/plugins/ec2_spec.rb
 - spec/unit/plugins/elixir_spec.rb
 - spec/unit/plugins/erlang_spec.rb
@@ -445,7 +444,6 @@ files:
 - spec/unit/plugins/haskell_spec.rb
 - spec/unit/plugins/hostname_spec.rb
 - spec/unit/plugins/init_package_spec.rb
-- spec/unit/plugins/ip_scopes_spec.rb
 - spec/unit/plugins/java_spec.rb
 - spec/unit/plugins/joyent_spec.rb
 - spec/unit/plugins/kernel_spec.rb
@@ -494,6 +492,7 @@ files:
 - spec/unit/plugins/ruby_spec.rb
 - spec/unit/plugins/rust_spec.rb
 - spec/unit/plugins/scala_spec.rb
+- spec/unit/plugins/scaleway_spec.rb
 - spec/unit/plugins/shard_spec.rb
 - spec/unit/plugins/shells_spec.rb
 - spec/unit/plugins/softlayer_spec.rb
@@ -513,6 +512,7 @@ files:
 - spec/unit/plugins/vmware_spec.rb
 - spec/unit/plugins/windows/cpu_spec.rb
 - spec/unit/plugins/windows/fips_spec.rb
+- spec/unit/plugins/windows/kernel_spec.rb
 - spec/unit/plugins/windows/memory_spec.rb
 - spec/unit/plugins/windows/uptime_spec.rb
 - spec/unit/plugins/windows/virtualization_spec.rb
@@ -534,7 +534,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -542,7 +542,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON

data/lib/ohai/dsl/plugin/versionvi.rb

@@ -1,61 +0,0 @@
-#
-# Author:: Serdar Sutay (<serdar@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
-# 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 express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module Ohai
-  module DSL
-    class Plugin
-      class VersionVI < Plugin
-        attr_reader :version
-        attr_reader :source
-
-        def initialize(controller, plugin_path, plugin_dir_path)
-          super(controller.data)
-          @controller = controller
-          @version = :version6
-          @source = plugin_path
-          @plugin_dir_path = plugin_dir_path
-        end
-
-        def name
-          # Ohai V6 doesn't have any name specification for plugins.
-          # So we are using the partial path to infer the name of the plugin
-          partial_path = Pathname.new(@source).relative_path_from(Pathname.new(@plugin_dir_path)).to_s
-          partial_path.chomp(".rb").gsub("/", "::")
-        end
-
-        def self.version
-          :version6
-        end
-
-        def self.collect_contents(contents)
-          define_method(:run_plugin) { instance_eval(contents) }
-        end
-
-        def provides(*paths)
-          Ohai::Log.debug("Skipping provides '#{paths.join(",")}' for plugin '#{name}'")
-        end
-
-        def require_plugin(plugin_ref)
-          @controller.require_plugin(plugin_ref)
-        end
-
-      end
-    end
-  end
-end

data/lib/ohai/plugins/bsd/filesystem2.rb

@@ -1,121 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Tim Smith (<tsmith@chef.io>)
-# Author:: Phil Dibowitz (<phil@ipom.com>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
-# 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 express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-Ohai.plugin(:Filesystem2) do
-  provides "filesystem2"
-
-  def generate_device_view(fs)
-    view = {}
-    fs.each_value do |entry|
-      view[entry[:device]] = Mash.new unless view[entry[:device]]
-      entry.each do |key, val|
-        next if %w{device mount}.include?(key)
-        view[entry[:device]][key] = val
-      end
-      view[entry[:device]][:mounts] ||= []
-      if entry[:mount]
-        view[entry[:device]][:mounts] << entry[:mount]
-      end
-    end
-    view
-  end
-
-  def generate_mountpoint_view(fs)
-    view = {}
-    fs.each_value do |entry|
-      next unless entry[:mount]
-      view[entry[:mount]] = Mash.new unless view[entry[:mount]]
-      entry.each do |key, val|
-        next if %w{mount device}.include?(key)
-        view[entry[:mount]][key] = val
-      end
-      view[entry[:mount]][:devices] ||= []
-      if entry[:device]
-        view[entry[:mount]][:devices] << entry[:device]
-      end
-    end
-    view
-  end
-
-  collect_data(:freebsd, :openbsd, :netbsd, :dragonflybsd) do
-    fs = Mash.new
-
-    # Grab filesystem data from df
-    so = shell_out("df")
-    so.stdout.lines do |line|
-      case line
-      when /^Filesystem/
-        next
-      when /^(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(\S+)$/
-        key = "#{$1},#{$6}"
-        fs[key] = Mash.new
-        fs[key][:device] = $1
-        fs[key][:kb_size] = $2
-        fs[key][:kb_used] = $3
-        fs[key][:kb_available] = $4
-        fs[key][:percent_used] = $5
-        fs[key][:mount] = $6
-      end
-    end
-
-    # inode parsing from 'df -iP'
-    so = shell_out("df -iP")
-    so.stdout.lines do |line|
-      case line
-      when /^Filesystem/ # skip the header
-        next
-      when /^(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+(\d+)\s+(\d+)\s+(\d+)%\s+(\S+)$/
-        key = "#{$1},#{$9}"
-        fs[key] ||= Mash.new
-        fs[key][:device] = $1
-        fs[key][:inodes_used] = $6
-        fs[key][:inodes_available] = $7
-        fs[key][:total_inodes] = ($6.to_i + $7.to_i).to_s
-        fs[key][:inodes_percent_used] = $8
-        fs[key][:mount] = $9
-      end
-    end
-
-    # Grab mount information from mount
-    so = shell_out("mount -l")
-    so.stdout.lines do |line|
-      if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/
-        key = "#{$1},#{$2}"
-        fs[key] ||= Mash.new
-        fs[key][:device] = $1
-        fs[key][:mount] = $2
-        fs[key][:fs_type] = $3
-        fs[key][:mount_options] = $4.split(/,\s*/)
-      end
-    end
-
-    # create views
-    by_pair = fs
-    by_device = generate_device_view(fs)
-    by_mountpoint = generate_mountpoint_view(fs)
-
-    fs_data = Mash.new
-    fs_data["by_device"] = by_device
-    fs_data["by_mountpoint"] = by_mountpoint
-    fs_data["by_pair"] = by_pair
-
-    filesystem2 fs_data
-  end
-end

data/lib/ohai/plugins/ip_scopes.rb

@@ -1,67 +0,0 @@
-#
-# Author:: James Harton (<james@sociable.co.nz>)
-# Copyright:: Copyright (c) 2010 Sociable Limited.
-# 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 express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Ohai.plugin(:IpScopes) do
-  provides "network_ip_scope", "privateaddress"
-
-  depends "network/interfaces"
-
-  collect_data do
-    begin
-      require "ipaddr_extensions"
-
-      Ohai::Log.warn("The IpScopes Ohai plugin has been deprecated and will be removed from Ohai 14 (April 2018).")
-
-      network["interfaces"].keys.sort.each do |if_name|
-        next if network["interfaces"][if_name]["addresses"].nil?
-
-        interface = network["interfaces"][if_name]
-        interface["addresses"].each do |address, attrs|
-          begin
-            attrs["ip_scope"] = address.to_ip.scope
-
-            if private_addr?(address) && !tunnel_iface?(interface) && !ppp_iface?(interface) && !docker_iface?(interface)
-              privateaddress(address)
-            end
-          rescue ArgumentError
-            # Just silently fail if we can't create an IP from the string.
-          end
-        end
-      end
-
-    rescue LoadError => e
-      # our favourite gem is not installed. Boohoo.
-      Ohai::Log.debug("Plugin IpScopes: cannot load gem, plugin disabled: #{e}")
-    end
-  end
-
-  def private_addr?(address)
-    address.to_ip.scope =~ /PRIVATE/
-  end
-
-  def ppp_iface?(interface)
-    interface["type"] == "ppp"
-  end
-
-  def tunnel_iface?(interface)
-    interface["type"] == "tunl"
-  end
-
-  def docker_iface?(interface)
-    interface["type"] == "docker"
-  end
-end