ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/c.rb

@@ -1,178 +1,178 @@
-# frozen_string_literal: true
-#
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 VMware, 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(:C) do
-  provides "languages/c"
-  depends "languages"
-
-  def collect(cmd, &block)
-    so = shell_out(cmd)
-    if so.exitstatus == 0
-      yield(so)
-    else
-      logger.trace("Plugin C: '#{cmd}' failed. Skipping data.")
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace("Plugin C: '#{cmd}' binary could not be found. Skipping data.")
-  end
-
-  def xcode_installed?
-    logger.trace("Plugin C: Checking for Xcode Command Line Tools.")
-    so = shell_out("/usr/bin/xcode-select -p")
-    if so.exitstatus == 0
-      logger.trace("Plugin C: Xcode Command Line Tools found.")
-      true
-    else
-      logger.trace("Plugin C: Xcode Command Line Tools not found.")
-      false
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace("Plugin C: xcode-select binary could not be found. Skipping data.")
-  end
-
-  def collect_gcc
-    # gcc
-    # Sample output on os x:
-    # Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1
-    # Apple LLVM version 7.3.0 (clang-703.0.29)
-    # Target: x86_64-apple-darwin15.4.0
-    # Thread model: posix
-    # InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
-    #
-    #
-    # Sample output on Linux:
-    # Using built-in specs.
-    # COLLECT_GCC=gcc
-    # COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper
-    # Target: x86_64-linux-gnu
-    # Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.4' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-trace --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
-    # Thread model: posix
-    # gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.4)
-    gcc = Mash.new
-    collect("gcc -v") do |so|
-      so.stderr.each_line do |line|
-        case line
-        when /^(.*version\s(\S*).*)/
-          gcc[:description] = $1
-          gcc[:version] = $2
-        when /^Target:\s(.*)/
-          gcc[:target] = $1
-        when /^Configured with:\s(.*)/
-          gcc[:configured_with] = $1
-        when /^Thread model:\s(.*)/
-          gcc[:thread_model] = $1
-        end
-      end
-    end
-    @c[:gcc] = gcc unless gcc.empty?
-  end
-
-  def collect_glibc
-    # glibc
-    collect("ldd --version") do |so|
-      description = so.stdout.split($/).first
-      if description =~ /(\d+\.\d+\.?\d*)/
-        @c[:glibc] = Mash.new
-        @c[:glibc][:version] = $1
-        @c[:glibc][:description] = description
-      end
-    end
-  end
-
-  def check_for_cl
-    # ms cl
-    collect("cl /?") do |so|
-      description = so.stderr.lines.first.chomp
-      if description =~ /Compiler Version ([\d\.]+)/
-        @c[:cl] = Mash.new
-        @c[:cl][:version] = $1
-        @c[:cl][:description] = description
-      end
-    end
-  end
-
-  def check_for_devenv
-    # ms vs
-    collect("devenv.com /?") do |so|
-      lines = so.stdout.split($/)
-      description = lines[0].length == 0 ? lines[1] : lines[0]
-      if description =~ /Visual Studio Version ([\d\.]+)/
-        @c[:vs] = Mash.new
-        @c[:vs][:version] = $1.chop
-        @c[:vs][:description] = description
-      end
-    end
-  end
-
-  def collect_xlc
-    # IBM XL C/C++ for AIX, V13.1.3 (5725-C72, 5765-J07)
-    # Version: 13.01.0003.0000
-    so = shell_out("xlc -qversion")
-    if so.exitstatus == 0 || (so.exitstatus >> 8) == 249
-      description = so.stdout.split($/).first
-      if description =~ /V(\d+\.\d+(.\d+)?)/
-        @c[:xlc] = Mash.new
-        @c[:xlc][:version] = $1
-        @c[:xlc][:description] = description.strip
-      end
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace("Plugin C: 'xlc' binary could not be found. Skipping data.")
-  end
-
-  def collect_sun_pro
-    # sun pro
-    collect("cc -V -flags") do |so|
-      output = so.stderr.split
-      if so.stderr =~ /^cc: Sun C/ && output.size >= 4
-        @c[:sunpro] = Mash.new
-        @c[:sunpro][:version] = output[3]
-        @c[:sunpro][:description] = so.stderr.chomp
-      end
-    end
-  end
-
-  collect_data(:aix) do
-    @c = Mash.new
-    collect_xlc
-    collect_gcc
-    languages[:c] = @c unless @c.empty?
-  end
-
-  collect_data(:darwin) do
-    @c = Mash.new
-    collect_gcc if xcode_installed?
-    languages[:c] = @c unless @c.empty?
-  end
-
-  collect_data(:windows) do
-    @c = Mash.new
-    check_for_cl
-    check_for_devenv
-    languages[:c] = @c unless @c.empty?
-  end
-
-  collect_data(:default) do
-    @c = Mash.new
-    collect_gcc
-    collect_glibc
-    collect_sun_pro
-    languages[:c] = @c unless @c.empty?
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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(:C) do
+  provides "languages/c"
+  depends "languages"
+
+  def collect(cmd, &block)
+    so = shell_out(cmd)
+    if so.exitstatus == 0
+      yield(so)
+    else
+      logger.trace("Plugin C: '#{cmd}' failed. Skipping data.")
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin C: '#{cmd}' binary could not be found. Skipping data.")
+  end
+
+  def xcode_installed?
+    logger.trace("Plugin C: Checking for Xcode Command Line Tools.")
+    so = shell_out("/usr/bin/xcode-select -p")
+    if so.exitstatus == 0
+      logger.trace("Plugin C: Xcode Command Line Tools found.")
+      true
+    else
+      logger.trace("Plugin C: Xcode Command Line Tools not found.")
+      false
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin C: xcode-select binary could not be found. Skipping data.")
+  end
+
+  def collect_gcc
+    # gcc
+    # Sample output on os x:
+    # Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1
+    # Apple LLVM version 7.3.0 (clang-703.0.29)
+    # Target: x86_64-apple-darwin15.4.0
+    # Thread model: posix
+    # InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
+    #
+    #
+    # Sample output on Linux:
+    # Using built-in specs.
+    # COLLECT_GCC=gcc
+    # COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper
+    # Target: x86_64-linux-gnu
+    # Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.4' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-trace --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
+    # Thread model: posix
+    # gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.4)
+    gcc = Mash.new
+    collect("gcc -v") do |so|
+      so.stderr.each_line do |line|
+        case line
+        when /^(.*version\s(\S*).*)/
+          gcc[:description] = $1
+          gcc[:version] = $2
+        when /^Target:\s(.*)/
+          gcc[:target] = $1
+        when /^Configured with:\s(.*)/
+          gcc[:configured_with] = $1
+        when /^Thread model:\s(.*)/
+          gcc[:thread_model] = $1
+        end
+      end
+    end
+    @c[:gcc] = gcc unless gcc.empty?
+  end
+
+  def collect_glibc
+    # glibc
+    collect("ldd --version") do |so|
+      description = so.stdout.split($/).first
+      if description =~ /(\d+\.\d+\.?\d*)/
+        @c[:glibc] = Mash.new
+        @c[:glibc][:version] = $1
+        @c[:glibc][:description] = description
+      end
+    end
+  end
+
+  def check_for_cl
+    # ms cl
+    collect("cl /?") do |so|
+      description = so.stderr.lines.first.chomp
+      if description =~ /Compiler Version ([\d\.]+)/
+        @c[:cl] = Mash.new
+        @c[:cl][:version] = $1
+        @c[:cl][:description] = description
+      end
+    end
+  end
+
+  def check_for_devenv
+    # ms vs
+    collect("devenv.com /?") do |so|
+      lines = so.stdout.split($/)
+      description = lines[0].length == 0 ? lines[1] : lines[0]
+      if description =~ /Visual Studio Version ([\d\.]+)/
+        @c[:vs] = Mash.new
+        @c[:vs][:version] = $1.chop
+        @c[:vs][:description] = description
+      end
+    end
+  end
+
+  def collect_xlc
+    # IBM XL C/C++ for AIX, V13.1.3 (5725-C72, 5765-J07)
+    # Version: 13.01.0003.0000
+    so = shell_out("xlc -qversion")
+    if so.exitstatus == 0 || (so.exitstatus >> 8) == 249
+      description = so.stdout.split($/).first
+      if description =~ /V(\d+\.\d+(.\d+)?)/
+        @c[:xlc] = Mash.new
+        @c[:xlc][:version] = $1
+        @c[:xlc][:description] = description.strip
+      end
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin C: 'xlc' binary could not be found. Skipping data.")
+  end
+
+  def collect_sun_pro
+    # sun pro
+    collect("cc -V -flags") do |so|
+      output = so.stderr.split
+      if so.stderr =~ /^cc: Sun C/ && output.size >= 4
+        @c[:sunpro] = Mash.new
+        @c[:sunpro][:version] = output[3]
+        @c[:sunpro][:description] = so.stderr.chomp
+      end
+    end
+  end
+
+  collect_data(:aix) do
+    @c = Mash.new
+    collect_xlc
+    collect_gcc
+    languages[:c] = @c unless @c.empty?
+  end
+
+  collect_data(:darwin) do
+    @c = Mash.new
+    collect_gcc if xcode_installed?
+    languages[:c] = @c unless @c.empty?
+  end
+
+  collect_data(:windows) do
+    @c = Mash.new
+    check_for_cl
+    check_for_devenv
+    languages[:c] = @c unless @c.empty?
+  end
+
+  collect_data(:default) do
+    @c = Mash.new
+    collect_gcc
+    collect_glibc
+    collect_sun_pro
+    languages[:c] = @c unless @c.empty?
+  end
+end

data/lib/ohai/plugins/chef.rb

@@ -1,50 +1,50 @@
-# frozen_string_literal: true
-#
-# Author:: Tollef Fog Heen <tfheen@err.no>
-# Copyright:: Copyright (c) 2010 Tollef Fog Heen
-# 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(:Chef) do
-  provides "chef_packages/chef"
-
-  def chef_effortless?
-    # Determine if client is being run as a Habitat package.
-    if Chef::CHEF_ROOT.include?("hab/pkgs/chef/chef")
-      # Determine if client is running in zero mode which would show it is using the Effortless pattern.
-      # Explicitly set response to true or nil, not false
-      ChefConfig::Config["chef_server_url"].include?("chefzero://")
-    end
-  end
-
-  collect_data(:default, :target) do
-    begin
-      require "chef/version"
-      require "chef-config/config" unless defined?(ChefConfig::Config)
-    rescue LoadError
-      logger.trace("Plugin Chef: Unable to load the chef gem to determine the version")
-      # this catches when you've done a major version bump of ohai, but
-      # your chef gem is incompatible, so we can't load it in the same VM
-      # (affects mostly internal testing)
-      next # avoids us writing an empty mash
-    end
-
-    chef_packages Mash.new unless chef_packages
-    chef_packages[:chef] = Mash.new
-    chef_packages[:chef][:version] = Chef::VERSION
-    chef_packages[:chef][:chef_root] = Chef::CHEF_ROOT
-    chef_packages[:chef][:chef_effortless] = chef_effortless?
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Tollef Fog Heen <tfheen@err.no>
+# Copyright:: Copyright (c) 2010 Tollef Fog Heen
+# 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(:Chef) do
+  provides "chef_packages/chef"
+
+  def chef_effortless?
+    # Determine if client is being run as a Habitat package.
+    if Chef::CHEF_ROOT.include?("hab/pkgs/chef/chef")
+      # Determine if client is running in zero mode which would show it is using the Effortless pattern.
+      # Explicitly set response to true or nil, not false
+      ChefConfig::Config["chef_server_url"].include?("chefzero://")
+    end
+  end
+
+  collect_data(:default, :target) do
+    begin
+      require "chef/version"
+      require "chef-config/config" unless defined?(ChefConfig::Config)
+    rescue LoadError
+      logger.trace("Plugin Chef: Unable to load the chef gem to determine the version")
+      # this catches when you've done a major version bump of ohai, but
+      # your chef gem is incompatible, so we can't load it in the same VM
+      # (affects mostly internal testing)
+      next # avoids us writing an empty mash
+    end
+
+    chef_packages Mash.new unless chef_packages
+    chef_packages[:chef] = Mash.new
+    chef_packages[:chef][:version] = Chef::VERSION
+    chef_packages[:chef][:chef_root] = Chef::CHEF_ROOT
+    chef_packages[:chef][:chef_effortless] = chef_effortless?
+  end
+end