ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/haskell.rb

@@ -1,96 +1,96 @@
-# frozen_string_literal: true
-# Author:: Chris Dituri (<csdituri@gmail.com>)
-# Copyright:: Copyright (c) 2016 Chris Dituri
-# 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(:Haskell) do
-
-  provides "languages/haskell",
-    "languages/haskell/ghc",
-    "languages/haskell/ghci",
-    "languages/haskell/cabal",
-    "languages/haskell/stack"
-
-  depends "languages"
-
-  collect_data(:default) do
-    haskell = Mash.new
-
-    # Check for ghc
-    begin
-      so = shell_out("ghc --version")
-
-      # Sample output:
-      # The Glorious Glasgow Haskell Compilation System, version 7.6.3
-      if so.exitstatus == 0
-        haskell[:ghc] = Mash.new
-        haskell[:ghc][:version] = so.stdout.split[-1]
-        haskell[:ghc][:description] = so.stdout.chomp
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Haskell: Could not shell_out "ghc --version". Skipping data')
-    end
-
-    # Check for ghci
-    begin
-      so = shell_out("ghci --version")
-
-      # Sample output:
-      # The Glorious Glasgow Haskell Compilation System, version 7.6.3
-      if so.exitstatus == 0
-        haskell[:ghci] = Mash.new
-        haskell[:ghci][:version] = so.stdout.split[-1]
-        haskell[:ghci][:description] = so.stdout.chomp
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Haskell: Could not shell_out "ghci --version". Skipping data')
-    end
-
-    # Check for cabal
-    begin
-      so = shell_out("cabal --version")
-
-      # Sample output:
-      # cabal-install version 1.16.0.2
-      # using version 1.16.0 of the Cabal library
-      if so.exitstatus == 0
-        haskell[:cabal] = Mash.new
-        haskell[:cabal][:version] = so.stdout.split("\n")[0].split[-1]
-        haskell[:cabal][:description] = so.stdout.split("\n")[0].chomp
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Haskell: Could not shell_out "cabal --version". Skipping data')
-    end
-
-    # Check for stack
-    begin
-      so = shell_out("stack --version")
-
-      # Sample output:
-      # Version 1.1.0, Git revision 0e9430aad55841b5ff2c6c2851f0548c16bce7cf (3540 commits) x86_64 hpack-0.13.0
-      # or
-      # Version 1.2.0 x86_64 hpack-0.14.0
-      if so.exitstatus == 0
-        haskell[:stack] = Mash.new
-        haskell[:stack][:version] = /Version ([^\s,]*)/.match(so.stdout)[1] rescue nil
-        haskell[:stack][:description] = so.stdout.chomp
-      end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Haskell: Could not shell_out "stack --version". Skipping data')
-    end
-
-    languages[:haskell] = haskell unless haskell.empty?
-  end
-end
+# frozen_string_literal: true
+# Author:: Chris Dituri (<csdituri@gmail.com>)
+# Copyright:: Copyright (c) 2016 Chris Dituri
+# 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(:Haskell) do
+
+  provides "languages/haskell",
+    "languages/haskell/ghc",
+    "languages/haskell/ghci",
+    "languages/haskell/cabal",
+    "languages/haskell/stack"
+
+  depends "languages"
+
+  collect_data(:default) do
+    haskell = Mash.new
+
+    # Check for ghc
+    begin
+      so = shell_out("ghc --version")
+
+      # Sample output:
+      # The Glorious Glasgow Haskell Compilation System, version 7.6.3
+      if so.exitstatus == 0
+        haskell[:ghc] = Mash.new
+        haskell[:ghc][:version] = so.stdout.split[-1]
+        haskell[:ghc][:description] = so.stdout.chomp
+      end
+    rescue Ohai::Exceptions::Exec
+      logger.trace('Plugin Haskell: Could not shell_out "ghc --version". Skipping data')
+    end
+
+    # Check for ghci
+    begin
+      so = shell_out("ghci --version")
+
+      # Sample output:
+      # The Glorious Glasgow Haskell Compilation System, version 7.6.3
+      if so.exitstatus == 0
+        haskell[:ghci] = Mash.new
+        haskell[:ghci][:version] = so.stdout.split[-1]
+        haskell[:ghci][:description] = so.stdout.chomp
+      end
+    rescue Ohai::Exceptions::Exec
+      logger.trace('Plugin Haskell: Could not shell_out "ghci --version". Skipping data')
+    end
+
+    # Check for cabal
+    begin
+      so = shell_out("cabal --version")
+
+      # Sample output:
+      # cabal-install version 1.16.0.2
+      # using version 1.16.0 of the Cabal library
+      if so.exitstatus == 0
+        haskell[:cabal] = Mash.new
+        haskell[:cabal][:version] = so.stdout.split("\n")[0].split[-1]
+        haskell[:cabal][:description] = so.stdout.split("\n")[0].chomp
+      end
+    rescue Ohai::Exceptions::Exec
+      logger.trace('Plugin Haskell: Could not shell_out "cabal --version". Skipping data')
+    end
+
+    # Check for stack
+    begin
+      so = shell_out("stack --version")
+
+      # Sample output:
+      # Version 1.1.0, Git revision 0e9430aad55841b5ff2c6c2851f0548c16bce7cf (3540 commits) x86_64 hpack-0.13.0
+      # or
+      # Version 1.2.0 x86_64 hpack-0.14.0
+      if so.exitstatus == 0
+        haskell[:stack] = Mash.new
+        haskell[:stack][:version] = /Version ([^\s,]*)/.match(so.stdout)[1] rescue nil
+        haskell[:stack][:description] = so.stdout.chomp
+      end
+    rescue Ohai::Exceptions::Exec
+      logger.trace('Plugin Haskell: Could not shell_out "stack --version". Skipping data')
+    end
+
+    languages[:haskell] = haskell unless haskell.empty?
+  end
+end

data/lib/ohai/plugins/hostname.rb

@@ -1,133 +1,133 @@
-# frozen_string_literal: true
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Benjamin Black (<nostromo@gmail.com>)
-# Author:: Bryan McLellan (<btm@loftninjas.org>)
-# Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Author:: Doug MacEachern (<dougm@vmware.com>)
-# Author:: James Gartrell (<jgartrel@gmail.com>)
-# Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# Copyright:: Copyright (c) 2009 Bryan McLellan
-# Copyright:: Copyright (c) 2009 Daniel DeLeo
-# 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.
-#
-
-require_relative "../mixin/network_helper"
-
-Ohai.plugin(:Hostname) do
-  include Ohai::Mixin::NetworkHelper
-
-  provides "domain", "hostname", "fqdn", "machinename"
-
-  # hostname : short hostname
-  # machinename : output of hostname command (might be short on solaris)
-  # fqdn : result of canonicalizing hostname using DNS or /etc/hosts
-  # domain : domain part of FQDN
-  #
-  # hostname and machinename should always exist
-  # fqdn and domain may be broken if DNS is broken on the host
-
-  def from_cmd(cmd)
-    shell_out(cmd).stdout.strip
-  end
-
-  # forward and reverse lookup to canonicalize FQDN (hostname -f equivalent)
-  def resolve_fqdn
-    canonicalize_hostname_with_retries(from_cmd("hostname"))
-  end
-
-  def collect_domain
-    # Domain is everything after the first dot
-    if fqdn
-      fqdn =~ /.+?\.(.*)/
-      domain $1
-    end
-  end
-
-  def collect_hostname
-    # Hostname is everything before the first dot
-    if machinename
-      machinename =~ /([^.]+)\.?/
-      hostname $1
-    elsif fqdn
-      fqdn =~ /(.+?)\./
-      hostname $1
-    end
-  end
-
-  collect_data(:default) do
-    machinename from_cmd("hostname")
-    fqdn resolve_fqdn
-    collect_hostname
-    collect_domain
-  end
-
-  collect_data(:aix) do
-    machinename from_cmd("hostname -s")
-    fqdn resolve_fqdn || from_cmd("hostname")
-    collect_hostname
-    collect_domain
-  end
-
-  collect_data(:netbsd, :openbsd, :dragonflybsd) do
-    hostname from_cmd("hostname -s")
-    fqdn resolve_fqdn
-    machinename from_cmd("hostname")
-    collect_domain
-  end
-
-  collect_data(:darwin) do
-    hostname from_cmd("hostname -s")
-    machinename from_cmd("hostname")
-    fqdn resolve_fqdn
-    domain collect_domain
-  end
-
-  collect_data(:freebsd) do
-    hostname from_cmd("hostname -s")
-    machinename from_cmd("hostname")
-    fqdn resolve_fqdn
-    collect_domain
-  end
-
-  collect_data(:linux) do
-    hostname from_cmd("hostname -s")
-    machinename from_cmd("hostname")
-    fqdn resolve_fqdn
-    domain collect_domain
-  end
-
-  collect_data(:solaris2) do
-    machinename from_cmd("hostname")
-    hostname from_cmd("hostname")
-    fqdn resolve_fqdn
-    domain collect_domain
-  end
-
-  collect_data(:windows) do
-    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
-    require "socket" unless defined?(Socket)
-
-    wmi = WmiLite::Wmi.new
-    host = wmi.first_of("Win32_ComputerSystem")
-
-    hostname host["dnshostname"].to_s
-    machinename host["name"].to_s
-    fqdn canonicalize_hostname_with_retries(Socket.gethostname)
-    domain collect_domain
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Benjamin Black (<nostromo@gmail.com>)
+# Author:: Bryan McLellan (<btm@loftninjas.org>)
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Author:: Doug MacEachern (<dougm@vmware.com>)
+# Author:: James Gartrell (<jgartrel@gmail.com>)
+# Author:: Isa Farnik (<isa@chef.io>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009 Bryan McLellan
+# Copyright:: Copyright (c) 2009 Daniel DeLeo
+# 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.
+#
+
+require_relative "../mixin/network_helper"
+
+Ohai.plugin(:Hostname) do
+  include Ohai::Mixin::NetworkHelper
+
+  provides "domain", "hostname", "fqdn", "machinename"
+
+  # hostname : short hostname
+  # machinename : output of hostname command (might be short on solaris)
+  # fqdn : result of canonicalizing hostname using DNS or /etc/hosts
+  # domain : domain part of FQDN
+  #
+  # hostname and machinename should always exist
+  # fqdn and domain may be broken if DNS is broken on the host
+
+  def from_cmd(cmd)
+    shell_out(cmd).stdout.strip
+  end
+
+  # forward and reverse lookup to canonicalize FQDN (hostname -f equivalent)
+  def resolve_fqdn
+    canonicalize_hostname_with_retries(from_cmd("hostname"))
+  end
+
+  def collect_domain
+    # Domain is everything after the first dot
+    if fqdn
+      fqdn =~ /.+?\.(.*)/
+      domain $1
+    end
+  end
+
+  def collect_hostname
+    # Hostname is everything before the first dot
+    if machinename
+      machinename =~ /([^.]+)\.?/
+      hostname $1
+    elsif fqdn
+      fqdn =~ /(.+?)\./
+      hostname $1
+    end
+  end
+
+  collect_data(:default) do
+    machinename from_cmd("hostname")
+    fqdn resolve_fqdn
+    collect_hostname
+    collect_domain
+  end
+
+  collect_data(:aix) do
+    machinename from_cmd("hostname -s")
+    fqdn resolve_fqdn || from_cmd("hostname")
+    collect_hostname
+    collect_domain
+  end
+
+  collect_data(:netbsd, :openbsd, :dragonflybsd) do
+    hostname from_cmd("hostname -s")
+    fqdn resolve_fqdn
+    machinename from_cmd("hostname")
+    collect_domain
+  end
+
+  collect_data(:darwin) do
+    hostname from_cmd("hostname -s")
+    machinename from_cmd("hostname")
+    fqdn resolve_fqdn
+    domain collect_domain
+  end
+
+  collect_data(:freebsd) do
+    hostname from_cmd("hostname -s")
+    machinename from_cmd("hostname")
+    fqdn resolve_fqdn
+    collect_domain
+  end
+
+  collect_data(:linux) do
+    hostname from_cmd("hostname -s")
+    machinename from_cmd("hostname")
+    fqdn resolve_fqdn
+    domain collect_domain
+  end
+
+  collect_data(:solaris2) do
+    machinename from_cmd("hostname")
+    hostname from_cmd("hostname")
+    fqdn resolve_fqdn
+    domain collect_domain
+  end
+
+  collect_data(:windows) do
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+    require "socket" unless defined?(Socket)
+
+    wmi = WmiLite::Wmi.new
+    host = wmi.first_of("Win32_ComputerSystem")
+
+    hostname host["dnshostname"].to_s
+    machinename host["name"].to_s
+    fqdn canonicalize_hostname_with_retries(Socket.gethostname)
+    domain collect_domain
+  end
+end

data/lib/ohai/plugins/init_package.rb

@@ -1,26 +1,26 @@
-# frozen_string_literal: true
-#
-# Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
-# Copyright:: Copyright (c) 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(:InitPackage) do
-  provides "init_package"
-
-  collect_data(:linux) do
-    init_package file_exist?("/proc/1/comm") ? file_open("/proc/1/comm").gets.chomp : "init"
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
+# Copyright:: Copyright (c) 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(:InitPackage) do
+  provides "init_package"
+
+  collect_data(:linux) do
+    init_package file_exist?("/proc/1/comm") ? file_open("/proc/1/comm").gets.chomp : "init"
+  end
+end

data/lib/ohai/plugins/java.rb

@@ -1,78 +1,78 @@
-# frozen_string_literal: true
-#
-# Author:: Benjamin Black (<bb@chef.io>)
-# Copyright:: Copyright (c) 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(:Java) do
-  provides "languages/java"
-  depends "languages"
-
-  def get_java_info
-    so = shell_out("java -mx64m -version")
-    # Sample output:
-    # java version "1.8.0_60"
-    # Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
-    # Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
-    if so.exitstatus == 0
-      java = Mash.new
-      so.stderr.split(/\r?\n/).each do |line|
-        case line
-        when /(?:java|openjdk) version \"([0-9\.\_]+)\"/
-          java[:version] = $1
-        when /^(.+Runtime Environment.*) \((build)\s*(.+)\)$/
-          java[:runtime] = { "name" => $1, "build" => $3 }
-        when /^(.+ (Client|Server) VM) \(build\s*(.+)\)$/
-          java[:hotspot] = { "name" => $1, "build" => $3 }
-        end
-      end
-
-      languages[:java] = java unless java.empty?
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace('Plugin Java: Could not shell_out "java -mx64m -version". Skipping plugin')
-  end
-
-  # On Mac OS X, the development tools include "stubs" for JVM executables that
-  # prompt the user to install the JVM if they desire. In our case we simply
-  # wish to detect if the JVM is there and do not want to trigger a popup
-  # window. As a workaround, we can run the java_home executable and check its
-  # exit status to determine if the `java` executable is the real one or the OS
-  # X stub. In the terminal, it looks like this:
-  #
-  #   $ /usr/libexec/java_home
-  #   Unable to find any JVMs matching version "(null)".
-  #   No Java runtime present, try --request to install.
-  #
-  #   $ echo $?
-  #   1
-  #
-  # This check always returns true when not on darwin because it is just a
-  # workaround for this particular annoyance.
-  def has_real_java?
-    return true unless on_darwin?
-
-    shell_out("/usr/libexec/java_home").status.success?
-  end
-
-  def on_darwin?
-    RUBY_PLATFORM.downcase.include?("darwin")
-  end
-
-  collect_data do
-    get_java_info if has_real_java?
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Benjamin Black (<bb@chef.io>)
+# Copyright:: Copyright (c) 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(:Java) do
+  provides "languages/java"
+  depends "languages"
+
+  def get_java_info
+    so = shell_out("java -mx64m -version")
+    # Sample output:
+    # java version "1.8.0_60"
+    # Java(TM) SE Runtime Environment (build 1.8.0_60-b27)
+    # Java HotSpot(TM) 64-Bit Server VM (build 25.60-b23, mixed mode)
+    if so.exitstatus == 0
+      java = Mash.new
+      so.stderr.split(/\r?\n/).each do |line|
+        case line
+        when /(?:java|openjdk) version \"([0-9\.\_]+)\"/
+          java[:version] = $1
+        when /^(.+Runtime Environment.*) \((build)\s*(.+)\)$/
+          java[:runtime] = { "name" => $1, "build" => $3 }
+        when /^(.+ (Client|Server) VM) \(build\s*(.+)\)$/
+          java[:hotspot] = { "name" => $1, "build" => $3 }
+        end
+      end
+
+      languages[:java] = java unless java.empty?
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Java: Could not shell_out "java -mx64m -version". Skipping plugin')
+  end
+
+  # On Mac OS X, the development tools include "stubs" for JVM executables that
+  # prompt the user to install the JVM if they desire. In our case we simply
+  # wish to detect if the JVM is there and do not want to trigger a popup
+  # window. As a workaround, we can run the java_home executable and check its
+  # exit status to determine if the `java` executable is the real one or the OS
+  # X stub. In the terminal, it looks like this:
+  #
+  #   $ /usr/libexec/java_home
+  #   Unable to find any JVMs matching version "(null)".
+  #   No Java runtime present, try --request to install.
+  #
+  #   $ echo $?
+  #   1
+  #
+  # This check always returns true when not on darwin because it is just a
+  # workaround for this particular annoyance.
+  def has_real_java?
+    return true unless on_darwin?
+
+    shell_out("/usr/libexec/java_home").status.success?
+  end
+
+  def on_darwin?
+    RUBY_PLATFORM.downcase.include?("darwin")
+  end
+
+  collect_data do
+    get_java_info if has_real_java?
+  end
+end