ohai 8.23.0 → 8.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89282c58ac1e24456ce207bd1a1c32fb0985ddb1
-  data.tar.gz: 3ba00373a8b89ebca6c67321df854d71191ab451
+  metadata.gz: 07d099fa68ce5783f29292000c8bb150e29b96a0
+  data.tar.gz: 5c7b6897d48af717c7371227a03c2897f3f30522
 SHA512:
-  metadata.gz: 838cfac284099378f5ca37317abe23598e7610370ca94406c3fbe98a9a775c955f40ec2c5391985a5a555a04317f0653d71a380c1e812d855810f8047b3dace4
-  data.tar.gz: e09dc27cc5ad660bfbd8433b72579a581ce979167c20063c9bfb2bfc12cdc2b741c65e1bbdf3457afacd41ee1f43b52f2f5f8d8b22e9d6d69049e47bc3562deb
+  metadata.gz: e34a92fa1e6c2ca35a92ea1d3ef1be961a5b178dd788eddabc8b77ba57fd02e7b4ccbe25c80a3271ea4c91a165ab60372b60654933661bd5afbcf5db5c663594
+  data.tar.gz: 432e34cc2e643412f89db7d7919cd6fda6a5c332233c22b495919fda103824a88c28d5973b8980061b315d835bf72722d998615591838980564a1dbb5771c3ac

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 group :development do
   gem "sigar", :platform => "ruby"
 
-  gem "chefstyle"
+  gem "chefstyle", "0.4.0"
   gem "overcommit", ">= 0.34.1"
   gem "pry-byebug"
   gem "pry-stack_explorer"

data/lib/ohai/common/dmi.rb

@@ -65,6 +65,9 @@ module Ohai
         37 =>  "memory_channel",
         38 =>  "ipmi_device",
         39 =>  "power_supply",
+        40 =>  "additional_information",
+        41 =>  "onboard_devices_extended_information",
+        42 =>  "management_controller_host_interfaces",
         126 => "disabled_entries",
         127 => "end_of_table_marker",
       }

data/lib/ohai/config.rb

@@ -47,7 +47,7 @@ module Ohai
       end
 
       def default_plugin_path
-        [ File.expand_path(File.join(File.dirname(__FILE__), "plugins")) ]
+        [ File.expand_path(File.join(File.dirname(__FILE__), "plugins")), ChefConfig::Config.platform_specific_path("/etc/chef/ohai/plugins") ]
       end
     end
 

data/lib/ohai/loader.rb

@@ -40,7 +40,7 @@ module Ohai
       # Finds all the *.rb files under the configured paths in :plugin_path
       def self.find_all_in(plugin_dir)
         unless Dir.exist?(plugin_dir)
-          Ohai::Log.warn("The plugin path #{plugin_dir} does not exist. Skipping...")
+          Ohai::Log.info("The plugin path #{plugin_dir} does not exist. Skipping...")
           return []
         end
 

data/lib/ohai/mixin/ec2_metadata.rb

@@ -2,7 +2,7 @@
 # Author:: Tim Dysinger (<tim@dysinger.net>)
 # Author:: Benjamin Black (<bb@chef.io>)
 # Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: 2009-2017 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +43,7 @@ module Ohai
       EC2_METADATA_ADDR = "169.254.169.254" unless defined?(EC2_METADATA_ADDR)
       EC2_SUPPORTED_VERSIONS = %w{ 1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 2007-12-15
                                    2008-02-01 2008-09-01 2009-04-04 2011-01-01 2011-05-01 2012-01-12
-                                   2014-11-05 2014-02-25 }
+                                   2014-11-05 2014-02-25 2016-04-19 2016-06-30 2016-09-02}
 
       EC2_ARRAY_VALUES = %w{security-groups}
       EC2_ARRAY_DIR    = %w{network/interfaces/macs}

data/lib/ohai/plugins/ec2.rb

@@ -97,6 +97,8 @@ Ohai.plugin(:EC2) do
       end
       ec2[:userdata] = fetch_userdata
       ec2[:account_id] = fetch_dynamic_data["accountId"]
+      ec2[:availability_zone] = fetch_dynamic_data["availabilityZone"]
+      ec2[:region] = fetch_dynamic_data["region"]
       # ASCII-8BIT is equivalent to BINARY in this case
       if ec2[:userdata] && ec2[:userdata].encoding.to_s == "ASCII-8BIT"
         Ohai::Log.debug("Plugin EC2: Binary UserData Found. Storing in base64")

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

@@ -1,6 +1,8 @@
 #
 # Author:: Tim Smith <tsmith@limelight.com>
+# Author:: Phil Dibowitz <phild@ipomc.com>
 # Copyright:: Copyright (c) 2013-2014, Limelight Networks, Inc.
+# Copyright:: Copyright (c) 2017 Facebook, Inc.
 # Plugin:: mdadm
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,15 +54,19 @@ Ohai.plugin(:Mdadm) do
   collect_data(:linux) do
     # gather a list of all raid arrays
     if File.exist?("/proc/mdstat")
-      devices = []
+      devices = {}
       File.open("/proc/mdstat").each do |line|
-        devices << Regexp.last_match[1] if line =~ /(md[0-9]+)/
+        if line =~ /(md[0-9]+)/
+          device = Regexp.last_match[1]
+          pieces = line.split(/\s+/)
+          devices[device] = pieces[4..-1].map { |s| s.match(/(.+)\[\d\]/)[1] }
+        end
       end
 
       # create the mdadm mash and gather individual information if devices are present
       unless devices.empty?
         mdadm Mash.new
-        devices.sort.each do |device|
+        devices.keys.sort.each do |device|
           mdadm[device] = Mash.new
 
           # gather detailed information on the array
@@ -68,6 +74,7 @@ Ohai.plugin(:Mdadm) do
 
           # if the mdadm command was sucessful pass so.stdout to create_raid_device_mash to grab the tidbits we want
           mdadm[device] = create_raid_device_mash(so.stdout) if so.stdout
+          mdadm[device]["members"] = devices[device]
         end
       end
     end

data/lib/ohai/plugins/lua.rb

@@ -27,7 +27,9 @@ Ohai.plugin(:Lua) do
       # Lua 5.2.4  Copyright (C) 1994-2015 Lua.org, PUC-Rio
       if so.exitstatus == 0
         lua = Mash.new
-        lua[:version] = so.stderr.split[1]
+        # at some point in lua's history they went from outputting the version
+        # on stderr to doing it on stdout. This handles old / new versions
+        lua[:version] = so.stdout.empty? ? so.stderr.split[1] : so.stdout.split[1]
         languages[:lua] = lua if lua[:version]
       end
     rescue Ohai::Exceptions::Exec

data/lib/ohai/plugins/scala.rb

@@ -23,9 +23,10 @@ Ohai.plugin(:Scala) do
     begin
       so = shell_out("scala -version")
       # Sample output:
-      # Scala code runner version 2.11.8 -- Copyright 2002-2016, LAMP/EPFL
+      # cat: /release: No such file or directory
+      # Scala code runner version 2.12.1 -- Copyright 2002-2016, LAMP/EPFL and Lightbend, Inc.
       if so.exitstatus == 0
-        scala[:version] = so.stderr.split[4]
+        scala[:version] = so.stderr.match(/.*version (\S*)/)[1]
       end
     rescue Ohai::Exceptions::Exec
       Ohai::Log.debug('Plugin Scala: Could not shell_out "scala -version". Skipping data')
@@ -34,7 +35,7 @@ Ohai.plugin(:Scala) do
     # Check for sbt
     begin
       # sbt launcher version 0.13.7
-      so = shell_out("sbt --version")
+      so = shell_out("sbt --version", timeout: 5)
       if so.exitstatus == 0
         scala[:sbt] = Mash.new
         scala[:sbt][:version] = so.stdout.split[3]

data/lib/ohai/system.rb

@@ -28,6 +28,7 @@ require "ohai/mixin/constant_helper"
 require "ohai/provides_map"
 require "ohai/hints"
 require "mixlib/shellout"
+require "ohai/config"
 
 module Ohai
   class System

data/lib/ohai/version.rb

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

data/ohai.gemspec

@@ -25,15 +25,11 @@ Gem::Specification.new do |s|
   s.add_dependency "ipaddress"
   s.add_dependency "wmi-lite", "~> 1.0"
   s.add_dependency "ffi", "~> 1.9"
+  s.add_dependency "chef-config", ">= 12.5.0.alpha.1", "< 14"
   # Note for ohai developers: If chef-config causes you grief, try:
   #     bundle install --with development
   # this should work as long as chef is a development dependency in Gemfile.
   #
-  # Chef depends on ohai and chef-config. Ohai depends on chef-config. The
-  # version of chef-config that chef depends on is whatver version chef
-  # happens to be on master. This will need to be updated again once work on
-  # Chef 13 starts, otherwise builds will break.
-  s.add_dependency "chef-config", ">= 12.5.0.alpha.1", "< 13"
 
   s.bindir = "bin"
   s.executables = %w{ohai}

data/spec/unit/loader_spec.rb

@@ -222,7 +222,7 @@ EOF
 
       describe "when plugin directory does not exist" do
         it "logs an invalid plugin path warning" do
-          expect(Ohai::Log).to receive(:warn).with(/The plugin path.*does not exist/)
+          expect(Ohai::Log).to receive(:info).with(/The plugin path.*does not exist/)
           allow(Dir).to receive(:exist?).with("/bogus/dir").and_return(false)
           Ohai::Loader::PluginFile.find_all_in("/bogus/dir")
         end

data/spec/unit/plugins/ec2_spec.rb

@@ -127,6 +127,49 @@ describe Ohai::System, "plugin ec2" do
         expect(plugin[:ec2]["account_id"]).to eq("4815162342")
       end
 
+      it "fetches AWS region" do
+        paths.each do |name, body|
+          expect(@http_client).to receive(:get).
+            with("/2012-01-12/#{name}").
+            and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+        end
+        expect(@http_client).to receive(:get).
+          with("/2012-01-12/user-data/").
+          and_return(double("Net::HTTP Response", :body => "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", :code => "200"))
+        expect(@http_client).to receive(:get).
+          with("/2012-01-12/dynamic/instance-identity/document/").
+          and_return(double("Net::HTTP Response", :body => "{\"region\":\"us-east-1\"}", :code => "200"))
+
+        plugin.run
+
+        expect(plugin[:ec2]).not_to be_nil
+        expect(plugin[:ec2]["instance_type"]).to eq("c1.medium")
+        expect(plugin[:ec2]["ami_id"]).to eq("ami-5d2dc934")
+        expect(plugin[:ec2]["security_groups"]).to eql %w{group1 group2}
+        expect(plugin[:ec2]["region"]).to eq("us-east-1")
+      end
+
+      it "fetches AWS availability zone" do
+        paths.each do |name, body|
+          expect(@http_client).to receive(:get).
+            with("/2012-01-12/#{name}").
+            and_return(double("Net::HTTP Response", :body => body, :code => "200"))
+        end
+        expect(@http_client).to receive(:get).
+          with("/2012-01-12/user-data/").
+          and_return(double("Net::HTTP Response", :body => "^_<8B>^H^H<C7>U^@^Csomething^@KT<C8><C9>,)<C9>IU(I-.I<CB><CC>I<E5>^B^@^Qz<BF><B0>^R^@^@^@", :code => "200"))
+        expect(@http_client).to receive(:get).
+          with("/2012-01-12/dynamic/instance-identity/document/").
+          and_return(double("Net::HTTP Response", :body => "{\"availabilityZone\":\"us-east-1d\"}", :code => "200"))
+
+        plugin.run
+
+        expect(plugin[:ec2]).not_to be_nil
+        expect(plugin[:ec2]["instance_type"]).to eq("c1.medium")
+        expect(plugin[:ec2]["ami_id"]).to eq("ami-5d2dc934")
+        expect(plugin[:ec2]["security_groups"]).to eql %w{group1 group2}
+        expect(plugin[:ec2]["availability_zone"]).to eq("us-east-1d")
+      end
     end
 
     it "parses ec2 network/ directory as a multi-level hash" do

data/spec/unit/plugins/linux/mdadm_spec.rb

@@ -99,6 +99,12 @@ MD
       end
     end
 
+    it "should detect member devies" do
+      @plugin.run
+      expect(@plugin[:mdadm][:md0][:members].sort).to eq(
+        %w{sdc sdd sde sdf sdg sdh}
+      )
+    end
   end
 
 end

data/spec/unit/plugins/lua_spec.rb

@@ -26,8 +26,8 @@ describe Ohai::System, "plugin lua" do
 
   before(:each) do
     plugin[:languages] = Mash.new
-    @stderr = "Lua 5.1.2  Copyright (C) 1994-2008 Lua.org, PUC-Rio\n"
-    allow(plugin).to receive(:shell_out).with("lua -v").and_return(mock_shell_out(0, "", @stderr))
+    @message = "Lua 5.1.2  Copyright (C) 1994-2008 Lua.org, PUC-Rio\n"
+    allow(plugin).to receive(:shell_out).with("lua -v").and_return(mock_shell_out(0, "", @message))
   end
 
   it "gets the lua version from running lua -v" do
@@ -51,4 +51,10 @@ describe Ohai::System, "plugin lua" do
     plugin.run
     expect(plugin.languages).not_to have_key(:lua)
   end
+
+  it "sets languages[:lua][:version] when 'lua -v' returns output on stdout not stderr" do
+    allow(plugin).to receive(:shell_out).with("lua -v").and_return(mock_shell_out(0, @message, ""))
+    plugin.run
+    expect(plugin.languages[:lua][:version]).to eql("5.1.2")
+  end
 end

data/spec/unit/plugins/scala_spec.rb

@@ -33,7 +33,7 @@ describe Ohai::System, "plugin scala" do
       .with("scala -version")
       .and_return(mock_shell_out(0, "", scala_out))
     allow(plugin).to receive(:shell_out)
-      .with("sbt --version")
+      .with("sbt --version", { :timeout => 5 })
       .and_return(mock_shell_out(0, sbt_out, ""))
   end
 
@@ -80,7 +80,7 @@ describe Ohai::System, "plugin scala" do
         .and_return(mock_shell_out(0, "", scala_out))
 
       allow(plugin).to receive(:shell_out)
-        .with("sbt --version")
+        .with("sbt --version", { :timeout => 5 })
         .and_raise( Ohai::Exceptions::Exec )
       plugin.run
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.23.0
+  version: 8.24.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -165,7 +165,7 @@ dependencies:
         version: 12.5.0.alpha.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ dependencies:
         version: 12.5.0.alpha.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
 description: Ohai profiles your system and emits JSON
 email: adam@chef.io
 executables:
@@ -546,7 +546,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON