ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/passwd.rb

@@ -1,104 +1,104 @@
-# frozen_string_literal: true
-
-Ohai.plugin(:Passwd) do
-  provides "etc", "current_user"
-  optional true
-
-  # @param [String] str
-  #
-  # @return [String]
-  #
-  def fix_encoding(str)
-    str.force_encoding(Encoding.default_external) if str.respond_to?(:force_encoding)
-    str
-  end
-
-  collect_data do
-    require "etc" unless defined?(Etc)
-
-    unless etc
-      etc Mash.new
-
-      etc[:passwd] = Mash.new
-      etc[:group] = Mash.new
-
-      Etc.passwd do |entry|
-        user_passwd_entry = Mash.new(dir: entry.dir, gid: entry.gid, uid: entry.uid, shell: entry.shell, gecos: entry.gecos)
-        user_passwd_entry.each_value { |v| fix_encoding(v) }
-        entry_name = fix_encoding(entry.name)
-        etc[:passwd][entry_name] = user_passwd_entry unless etc[:passwd].key?(entry_name)
-      end
-
-      Etc.group do |entry|
-        group_entry = Mash.new(gid: entry.gid,
-                               members: entry.mem.map { |u| fix_encoding(u) })
-
-        etc[:group][fix_encoding(entry.name)] = group_entry
-      end
-    end
-
-    unless current_user
-      current_user fix_encoding(Etc.getpwuid(Process.euid).name)
-    end
-  end
-
-  collect_data(:windows) do
-    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
-
-    unless etc
-      etc Mash.new
-
-      wmi = WmiLite::Wmi.new
-
-      etc[:passwd] = Mash.new
-      users = wmi.query("SELECT * FROM Win32_UserAccount WHERE LocalAccount = True")
-      users.each do |user|
-        uname = user["Name"].strip.downcase
-        Ohai::Log.debug("processing user #{uname}")
-        etc[:passwd][uname] = Mash.new
-        wmi_obj = user.wmi_ole_object
-        wmi_obj.properties_.each do |key|
-          etc[:passwd][uname][key.name.downcase] = user[key.name]
-        end
-      end
-
-      etc[:group] = Mash.new
-      groups = wmi.query("SELECT * FROM Win32_Group WHERE LocalAccount = True")
-      groups.each do |group|
-        gname = group["Name"].strip.downcase
-        Ohai::Log.debug("processing group #{gname}")
-        etc[:group][gname] = Mash.new
-        wmi_obj = group.wmi_ole_object
-        wmi_obj.properties_.each do |key|
-          etc[:group][gname][key.name.downcase] = group[key.name]
-        end
-
-        # This is the primary reason that we're using WMI instead of powershell
-        # cmdlets - the powershell start up cost is huge, and you *must* do this
-        # query for every. single. group. individually.
-
-        # The query returns nothing unless you specify domain *and* name, it's
-        # a path, not a set of queries.
-        subq = "Win32_Group.Domain='#{group["Domain"]}',Name='#{group["Name"]}'"
-        members = wmi.query(
-          "SELECT * FROM Win32_GroupUser WHERE GroupComponent=\"#{subq}\""
-        )
-        etc[:group][gname]["members"] = members.map do |member|
-          mi = {}
-          info = Hash[
-            member["partcomponent"].split(",").map { |x| x.split("=") }.map { |a, b| [a, b.undump] }
-          ]
-          if info.keys.any? { |x| x.match?("Win32_UserAccount") }
-            mi["type"] = :user
-          else
-            # NOTE: the type here is actually Win32_SystemAccount, because,
-            # that's what groups are in the Windows universe.
-            mi["type"] = :group
-          end
-          mi["name"] = info["Name"]
-          mi
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+Ohai.plugin(:Passwd) do
+  provides "etc", "current_user"
+  optional true
+
+  # @param [String] str
+  #
+  # @return [String]
+  #
+  def fix_encoding(str)
+    str.force_encoding(Encoding.default_external) if str.respond_to?(:force_encoding)
+    str
+  end
+
+  collect_data do
+    require "etc" unless defined?(Etc)
+
+    unless etc
+      etc Mash.new
+
+      etc[:passwd] = Mash.new
+      etc[:group] = Mash.new
+
+      Etc.passwd do |entry|
+        user_passwd_entry = Mash.new(dir: entry.dir, gid: entry.gid, uid: entry.uid, shell: entry.shell, gecos: entry.gecos)
+        user_passwd_entry.each_value { |v| fix_encoding(v) }
+        entry_name = fix_encoding(entry.name)
+        etc[:passwd][entry_name] = user_passwd_entry unless etc[:passwd].key?(entry_name)
+      end
+
+      Etc.group do |entry|
+        group_entry = Mash.new(gid: entry.gid,
+                               members: entry.mem.map { |u| fix_encoding(u) })
+
+        etc[:group][fix_encoding(entry.name)] = group_entry
+      end
+    end
+
+    unless current_user
+      current_user fix_encoding(Etc.getpwuid(Process.euid).name)
+    end
+  end
+
+  collect_data(:windows) do
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+
+    unless etc
+      etc Mash.new
+
+      wmi = WmiLite::Wmi.new
+
+      etc[:passwd] = Mash.new
+      users = wmi.query("SELECT * FROM Win32_UserAccount WHERE LocalAccount = True")
+      users.each do |user|
+        uname = user["Name"].strip.downcase
+        Ohai::Log.debug("processing user #{uname}")
+        etc[:passwd][uname] = Mash.new
+        wmi_obj = user.wmi_ole_object
+        wmi_obj.properties_.each do |key|
+          etc[:passwd][uname][key.name.downcase] = user[key.name]
+        end
+      end
+
+      etc[:group] = Mash.new
+      groups = wmi.query("SELECT * FROM Win32_Group WHERE LocalAccount = True")
+      groups.each do |group|
+        gname = group["Name"].strip.downcase
+        Ohai::Log.debug("processing group #{gname}")
+        etc[:group][gname] = Mash.new
+        wmi_obj = group.wmi_ole_object
+        wmi_obj.properties_.each do |key|
+          etc[:group][gname][key.name.downcase] = group[key.name]
+        end
+
+        # This is the primary reason that we're using WMI instead of powershell
+        # cmdlets - the powershell start up cost is huge, and you *must* do this
+        # query for every. single. group. individually.
+
+        # The query returns nothing unless you specify domain *and* name, it's
+        # a path, not a set of queries.
+        subq = "Win32_Group.Domain='#{group["Domain"]}',Name='#{group["Name"]}'"
+        members = wmi.query(
+          "SELECT * FROM Win32_GroupUser WHERE GroupComponent=\"#{subq}\""
+        )
+        etc[:group][gname]["members"] = members.map do |member|
+          mi = {}
+          info = Hash[
+            member["partcomponent"].split(",").map { |x| x.split("=") }.map { |a, b| [a, b.undump] }
+          ]
+          if info.keys.any? { |x| x.match?("Win32_UserAccount") }
+            mi["type"] = :user
+          else
+            # NOTE: the type here is actually Win32_SystemAccount, because,
+            # that's what groups are in the Windows universe.
+            mi["type"] = :group
+          end
+          mi["name"] = info["Name"]
+          mi
+        end
+      end
+    end
+  end
+end

data/lib/ohai/plugins/perl.rb

@@ -1,45 +1,45 @@
-#
-# Author:: Joshua Timberman (<joshua@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(:Perl) do
-  provides "languages/perl"
-  depends "languages".freeze
-
-  collect_data do
-
-    so = shell_out("perl -V:version -V:archname")
-    # Sample output:
-    # version='5.18.2';
-    # archname='darwin-thread-multi-2level';
-    if so.exitstatus == 0
-      perl = Mash.new
-      so.stdout.split(/\r?\n/).each do |line|
-        case line
-        when /^version=\'(.+)\';$/
-          perl[:version] = $1
-        when /^archname=\'(.+)\';$/
-          perl[:archname] = $1
-        end
-      end
-      languages[:perl] = perl unless perl.empty?
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace('Plugin Perl: Could not shell_out "perl -V:version -V:archname". Skipping plugin')
-
-  end
-end
+#
+# Author:: Joshua Timberman (<joshua@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(:Perl) do
+  provides "languages/perl"
+  depends "languages".freeze
+
+  collect_data do
+
+    so = shell_out("perl -V:version -V:archname")
+    # Sample output:
+    # version='5.18.2';
+    # archname='darwin-thread-multi-2level';
+    if so.exitstatus == 0
+      perl = Mash.new
+      so.stdout.split(/\r?\n/).each do |line|
+        case line
+        when /^version=\'(.+)\';$/
+          perl[:version] = $1
+        when /^archname=\'(.+)\';$/
+          perl[:archname] = $1
+        end
+      end
+      languages[:perl] = perl unless perl.empty?
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Perl: Could not shell_out "perl -V:version -V:archname". Skipping plugin')
+
+  end
+end

data/lib/ohai/plugins/php.rb

@@ -1,52 +1,52 @@
-#
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Author:: Tim Smith <tim@cozy.co>
-# Copyright:: Copyright (c) 2009 VMware, Inc.
-# Copyright:: Copyright (c) 2014 Cozy Services, Ltd.
-# 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(:PHP) do
-  provides "languages/php"
-  depends "languages".freeze
-
-  collect_data do
-
-    so = shell_out("php -v")
-    # Sample output:
-    # PHP 5.5.31 (cli) (built: Feb 20 2016 20:33:10)
-    # Copyright (c) 1997-2015 The PHP Group
-    # Zend Engine v2.5.0, Copyright (c) 1998-2015 Zend Technologies
-    if so.exitstatus == 0
-      php = Mash.new
-      so.stdout.each_line do |line|
-        case line
-        when /^PHP (\S+)(?:.*built: ([^)]+))?/
-          php[:version] = $1
-          php[:builddate] = $2
-        when /Zend Engine v([^\s]+),/
-          php[:zend_engine_version] = $1
-        when /Zend OPcache v([^\s]+),/
-          php[:zend_opcache_version] = $1
-        end
-      end
-
-      languages[:php] = php unless php.empty?
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace('Plugin Php: Could not shell_out "php -v". Skipping plugin')
-
-  end
-end
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Author:: Tim Smith <tim@cozy.co>
+# Copyright:: Copyright (c) 2009 VMware, Inc.
+# Copyright:: Copyright (c) 2014 Cozy Services, Ltd.
+# 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(:PHP) do
+  provides "languages/php"
+  depends "languages".freeze
+
+  collect_data do
+
+    so = shell_out("php -v")
+    # Sample output:
+    # PHP 5.5.31 (cli) (built: Feb 20 2016 20:33:10)
+    # Copyright (c) 1997-2015 The PHP Group
+    # Zend Engine v2.5.0, Copyright (c) 1998-2015 Zend Technologies
+    if so.exitstatus == 0
+      php = Mash.new
+      so.stdout.each_line do |line|
+        case line
+        when /^PHP (\S+)(?:.*built: ([^)]+))?/
+          php[:version] = $1
+          php[:builddate] = $2
+        when /Zend Engine v([^\s]+),/
+          php[:zend_engine_version] = $1
+        when /Zend OPcache v([^\s]+),/
+          php[:zend_opcache_version] = $1
+        end
+      end
+
+      languages[:php] = php unless php.empty?
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Php: Could not shell_out "php -v". Skipping plugin')
+
+  end
+end

data/lib/ohai/plugins/platform.rb

@@ -1,29 +1,29 @@
-# frozen_string_literal: true
-#
-# Author:: Adam Jacob (<adam@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(:Platform) do
-  provides "platform", "platform_version", "platform_family"
-  depends "os", "os_version"
-
-  collect_data(:default) do
-    platform os unless attribute?("platform")
-    platform_version os_version unless attribute?("platform_version")
-    platform_family platform unless attribute?("platform_family")
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Adam Jacob (<adam@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(:Platform) do
+  provides "platform", "platform_version", "platform_family"
+  depends "os", "os_version"
+
+  collect_data(:default) do
+    platform os unless attribute?("platform")
+    platform_version os_version unless attribute?("platform_version")
+    platform_family platform unless attribute?("platform_family")
+  end
+end

data/lib/ohai/plugins/powershell.rb

@@ -1,82 +1,82 @@
-#
-# 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(:Powershell) do
-  provides "languages/powershell"
-  depends "languages".freeze
-
-  collect_data(:windows) do
-
-    so = shell_out("powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable")
-    # Sample output:
-    #
-    # Name                           Value
-    # ----                           -----
-    # PSVersion                      4.0
-    # WSManStackVersion              3.0
-    # SerializationVersion           1.1.0.1
-    # CLRVersion                     4.0.30319.34014
-    # BuildVersion                   6.3.9600.16394
-    # PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0}
-    # PSRemotingProtocolVersion      2.2
-
-    if so.exitstatus == 0
-      powershell = Mash.new
-      version_info = {}
-      so.stdout.strip.each_line do |line|
-        kv = line.strip.split(/\s+/, 2)
-        version_info[kv[0]] = kv[1] if kv.length == 2
-      end
-      powershell[:version] = version_info["PSVersion"]
-      powershell[:ws_man_stack_version] = version_info["WSManStackVersion"]
-      powershell[:serialization_version] = version_info["SerializationVersion"]
-      powershell[:clr_version] = version_info["CLRVersion"]
-      powershell[:build_version] = version_info["BuildVersion"]
-      powershell[:compatible_versions] = parse_compatible_versions
-      powershell[:remoting_protocol_version] = version_info["PSRemotingProtocolVersion"]
-      languages[:powershell] = powershell unless powershell.empty?
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace('Plugin Powershell: Could not shell_out "powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable". Skipping plugin')
-
-  end
-
-  def version_command
-    [
-      "$progresspreference = 'silentlycontinue'",
-      "$PSVersionTable.PSCompatibleVersions | foreach {$_.tostring()}",
-    ].join("; ")
-  end
-
-  def powershell_command
-    ["powershell.exe",
-      "-NoLogo",
-      "-NonInteractive",
-      "-NoProfile",
-      "-Command",
-    ].join(" ")
-  end
-
-  def parse_compatible_versions
-    so = shell_out("#{powershell_command} \"#{version_command}\"")
-    versions = []
-    so.stdout.strip.each_line do |line|
-      versions << line.strip
-    end
-    versions
-  end
-end
+#
+# 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(:Powershell) do
+  provides "languages/powershell"
+  depends "languages".freeze
+
+  collect_data(:windows) do
+
+    so = shell_out("powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable")
+    # Sample output:
+    #
+    # Name                           Value
+    # ----                           -----
+    # PSVersion                      4.0
+    # WSManStackVersion              3.0
+    # SerializationVersion           1.1.0.1
+    # CLRVersion                     4.0.30319.34014
+    # BuildVersion                   6.3.9600.16394
+    # PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0}
+    # PSRemotingProtocolVersion      2.2
+
+    if so.exitstatus == 0
+      powershell = Mash.new
+      version_info = {}
+      so.stdout.strip.each_line do |line|
+        kv = line.strip.split(/\s+/, 2)
+        version_info[kv[0]] = kv[1] if kv.length == 2
+      end
+      powershell[:version] = version_info["PSVersion"]
+      powershell[:ws_man_stack_version] = version_info["WSManStackVersion"]
+      powershell[:serialization_version] = version_info["SerializationVersion"]
+      powershell[:clr_version] = version_info["CLRVersion"]
+      powershell[:build_version] = version_info["BuildVersion"]
+      powershell[:compatible_versions] = parse_compatible_versions
+      powershell[:remoting_protocol_version] = version_info["PSRemotingProtocolVersion"]
+      languages[:powershell] = powershell unless powershell.empty?
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Powershell: Could not shell_out "powershell.exe -NoLogo -NonInteractive -NoProfile -command $PSVersionTable". Skipping plugin')
+
+  end
+
+  def version_command
+    [
+      "$progresspreference = 'silentlycontinue'",
+      "$PSVersionTable.PSCompatibleVersions | foreach {$_.tostring()}",
+    ].join("; ")
+  end
+
+  def powershell_command
+    ["powershell.exe",
+      "-NoLogo",
+      "-NonInteractive",
+      "-NoProfile",
+      "-Command",
+    ].join(" ")
+  end
+
+  def parse_compatible_versions
+    so = shell_out("#{powershell_command} \"#{version_command}\"")
+    versions = []
+    so.stdout.strip.each_line do |line|
+      versions << line.strip
+    end
+    versions
+  end
+end