ohai 16.6.5 → 16.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86cf0dbd863325b1c5104d78cb1b848d924bfc1c67375df2f42d4cc855cccf1a
-  data.tar.gz: 20131622886b909b75708612f8340e59366f9d74b109f4f4176e34b6578f750c
+  metadata.gz: 57f034c4995360aa8eb45d92d95ddee35d307411506e57be5a55b9a5e58b52f3
+  data.tar.gz: dcffcadad6b0a1038b1715397ec2e9ee54000d42ac7cf3f2229e7bbe42e69395
 SHA512:
-  metadata.gz: 142be9e566d266d83e0561a662e5170c5d4b497d044279b51360393c9956004a4217ef5a3151d93f139fcd30fd9c6c07c35c9dde5d4e8b53c6b91532d3b884ce
-  data.tar.gz: 30d6872cb01724ae5bc88f1f65aa7b5693a47502be8f94492c28367c8408cd1fe82278efd1dc3e70ff9cbb83ea9ba9bd74ff4be2a850c9bf764b33c17d19297a
+  metadata.gz: 9198da99387e9dfcc99350cba0a7e1e95f2a1e1de7fecf4ecf76b311d38352214b1f76179aa20bcd42f0017f7a8c5d9e73f251c016eb9e8c83d4e0be234da0a8
+  data.tar.gz: bbd44815894afe658ab51d54088589f4c66d62a5099a81c93c48801a8aa454f9c8af38498b667a2fe51088889145a5b05cf376860459c4889453a088c066f9f5

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
 gemspec
@@ -19,15 +20,9 @@ group :development do
   gem "rubocop-rspec"
 end
 
-group :docs do
-  gem "github-markup"
-  gem "redcarpet"
-  gem "yard"
-end
-
 group :debug do
   gem "pry"
   gem "pry-byebug"
-  gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
+  gem "pry-stack_explorer"
   gem "rb-readline"
 end

data/bin/ohai

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.

data/lib/ohai.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/application.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
 # Copyright:: Copyright (c) 2009 Mathieu Sauve-Frankel.

data/lib/ohai/common/dmi.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Kurt Yoder (ktyopscode@yoderhome.com)
 # Copyright:: Copyright (c) 2010 Kurt Yoder

data/lib/ohai/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Claire McQuin (<claire@chef.io>)

data/lib/ohai/dsl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Serdar Sutay (<serdar@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/dsl/plugin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Claire McQuin (<claire@chef.io>)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Serdar Sutay (<serdar@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/exception.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/hints.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Serdar Sutay (<serdar@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/log.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/mash.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/mixin/azure_metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Smith (<tsmith@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -31,7 +32,7 @@ module Ohai
     #
     module AzureMetadata
 
-      AZURE_METADATA_ADDR ||= "169.254.169.254".freeze
+      AZURE_METADATA_ADDR ||= "169.254.169.254"
 
       # it's important that the newer versions are at the end of this array so we can skip sorting it
       AZURE_SUPPORTED_VERSIONS ||= %w{ 2017-04-02 2017-08-01 2017-12-01 2018-02-01 2018-04-02

data/lib/ohai/mixin/chef_utils_wiring.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/mixin/command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $stderr.puts "WARN: Ohai::Mixin::Command is deprecated, please use Ohai::Mixin::ShellOut or remove if the reference is unnecessary"
 require_relative "shell_out"
 Ohai::Mixin::Command = Ohai::Mixin::ShellOut unless defined?(Ohai::Mixin::Command)

data/lib/ohai/mixin/constant_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Serdar Sutay (<serdar@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/mixin/dmi_decode.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Smith <tsmith@chef.io>
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/mixin/do_metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 # Author:: Dylan Page (<dpage@digitalocean.com>)
 # License:: Apache License, Version 2.0
@@ -20,8 +21,8 @@ module Ohai
   module Mixin
     module DOMetadata
 
-      DO_METADATA_ADDR ||= "169.254.169.254".freeze
-      DO_METADATA_URL ||= "/metadata/v1.json".freeze
+      DO_METADATA_ADDR ||= "169.254.169.254"
+      DO_METADATA_URL ||= "/metadata/v1.json"
 
       def http_client
         Net::HTTP.start(DO_METADATA_ADDR).tap { |h| h.read_timeout = 6 }

data/lib/ohai/mixin/ec2_metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
 # Author:: Benjamin Black (<bb@chef.io>)
@@ -39,7 +40,7 @@ module Ohai
     #
     module Ec2Metadata
 
-      EC2_METADATA_ADDR ||= "169.254.169.254".freeze
+      EC2_METADATA_ADDR ||= "169.254.169.254"
       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-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02 }.freeze

data/lib/ohai/mixin/gce_metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Ranjib Dey (<dey.ranjib@gmail.com>)
 # License:: Apache License, Version 2.0
@@ -21,8 +22,8 @@ module Ohai
     module GCEMetadata
 
       # Trailing dot to host is added to avoid DNS search path
-      GCE_METADATA_ADDR ||= "metadata.google.internal.".freeze
-      GCE_METADATA_URL ||= "/computeMetadata/v1/?recursive=true".freeze
+      GCE_METADATA_ADDR ||= "metadata.google.internal."
+      GCE_METADATA_URL ||= "/computeMetadata/v1/?recursive=true"
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)

data/lib/ohai/mixin/http_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/mixin/network_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Serdar Sutay (<serdar@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/mixin/os.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/mixin/scaleway_metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Jonathan Amiez (<jonathan.amiez@gmail.com>)
 # License:: Apache License, Version 2.0
@@ -20,8 +21,8 @@ module Ohai
   module Mixin
     module ScalewayMetadata
 
-      SCALEWAY_METADATA_ADDR ||= "169.254.42.42".freeze
-      SCALEWAY_METADATA_URL ||= "/conf?format=json".freeze
+      SCALEWAY_METADATA_ADDR ||= "169.254.42.42"
+      SCALEWAY_METADATA_URL ||= "/conf?format=json"
 
       # @return [Net::HTTP] net/http object without timeout set to 6
       def http_client

data/lib/ohai/mixin/seconds_to_human.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/mixin/shell_out.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Tim Smith (<tsmith@chef.io>)

data/lib/ohai/mixin/softlayer_metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Alexey Karpik <alexey.karpik@rightscale.com>
 # Author:: Peter Schroeter <peter.schroeter@rightscale.com>
@@ -22,7 +23,7 @@ require "uri" unless defined?(URI)
 
 # https://softlayer.github.io/reference/services/SoftLayer_Resource_Metadata/
 module ::Ohai::Mixin::SoftlayerMetadata
-  SOFTLAYER_API_QUERY_URL ||= "https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata".freeze
+  SOFTLAYER_API_QUERY_URL ||= "https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata"
 
   # fetch metadata items and build out hash of data
   #

data/lib/ohai/mixin/string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: James Gartrell (<jgartrel@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/mixin/train_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/mixin/which.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/plugin_config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/aix/kernel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Isa Farnik (<isa@chef.io>)

data/lib/ohai/plugins/aix/memory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Isa Farnik (<isa@chef.io>)

data/lib/ohai/plugins/aix/network.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
@@ -92,7 +93,7 @@ Ohai.plugin(:Network) do
             if lin =~ /broadcast\s(\S+)\s/
               iface[interface][:addresses][tmp_addr][:broadcast] = $1
             end
-          elsif lin =~ %r{inet6 ([a-f0-9\:]+)%?([\d]*)/?(\d*)?}
+          elsif lin =~ %r{inet6 ([a-f0-9\:]+)%?(\d*)/?(\d*)?}
             # TODO do we have more properties on inet6 in aix? broadcast
             iface[interface][:addresses] ||= Mash.new
             iface[interface][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }

data/lib/ohai/plugins/aix/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Isa Farnik (<isa@chef.io>)

data/lib/ohai/plugins/aix/uptime.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
@@ -40,9 +41,9 @@ Ohai.plugin(:Uptime) do
     when /^\d+-\d/
       (d, h, m, s) = so.split(/[-:]/)
     when /^\d+:\d+:\d/
-      (h, m, s) = so.split(/[:]/)
+      (h, m, s) = so.split(":")
     else
-      (m, s) = so.split(/[:]/)
+      (m, s) = so.split(":")
     end
     elapsed_seconds = ((d.to_i * 86400) + (h.to_i * 3600) + (m.to_i * 60) + s.to_i)
 

data/lib/ohai/plugins/azure.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

data/lib/ohai/plugins/c.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Doug MacEachern <dougm@vmware.com>
 # Copyright:: Copyright (c) 2010 VMware, Inc.

data/lib/ohai/plugins/chef.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tollef Fog Heen <tfheen@err.no>
 # Copyright:: Copyright (c) 2010 Tollef Fog Heen

data/lib/ohai/plugins/cloud.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Cary Penniman (<cary@rightscale.com>)
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/cpu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Bryan McLellan (btm@loftninjas.org)
@@ -35,11 +36,9 @@ Ohai.plugin(:CPU) do
       when /CPU:\s+(.+) \(([\d.]+).+\)/
         cpuinfo["model_name"] = $1
         cpuinfo["mhz"] = $2
-      when /Features=.+<(.+)>/
+      when /Features=.+<(.+)>/, /Features2=[a-f\dx]+<(.+)>/
         cpuinfo["flags"].concat($1.downcase.split(","))
         # Features2=0x80000001<SSE3,<b31>>
-      when /Features2=[a-f\dx]+<(.+)>/
-        cpuinfo["flags"].concat($1.downcase.split(","))
       else
         yield(cpuinfo, line)
       end

data/lib/ohai/plugins/darwin/hardware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Nate Walck (<nate.walck@gmail.com>)
 # Copyright:: Copyright (c) 2016-present Facebook, Inc.

data/lib/ohai/plugins/darwin/memory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Patrick Collins (<pat@burned.com>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -43,9 +44,7 @@ Ohai.plugin(:Memory) do
           megabyte_val = (pages * page_size) / 1024 / 1024.0
           total_consumed += megabyte_val
           case match
-          when "wired down"
-            active += megabyte_val.to_i
-          when "active"
+          when "wired down", "active"
             active += megabyte_val.to_i
           when "inactive"
             inactive += megabyte_val.to_i

data/lib/ohai/plugins/darwin/network.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<bb@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/darwin/platform.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/darwin/virtualization.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
 # Author:: Tim Smith (<tsmith@chef.io>)

data/lib/ohai/plugins/digital_ocean.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Dylan Page (<dpage@digitalocean.com>)
 # Author:: Stafford Brunk (<stafford.brunk@gmail.com>)

data/lib/ohai/plugins/dmi.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Kurt Yoder (ktyopscode@yoderhome.com)
 # Copyright:: Copyright (c) 2010 Kurt Yoder

data/lib/ohai/plugins/docker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/dragonflybsd/memory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

data/lib/ohai/plugins/dragonflybsd/network.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan