ohai 18.0.26 → 18.1.0

data/lib/ohai/util/ip_helper.rb

@@ -1,56 +1,56 @@
-# frozen_string_literal: true
-#
-# Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
-# 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.
-
-module Ohai
-  module Util
-    module IpHelper
-      require "ipaddress" unless defined?(IPAddress)
-
-      # Corresponding to RFC 4192 + RFC 4193
-      IPV6_LINK_LOCAL_UNICAST_BLOCK = IPAddress("fe80::/10") unless defined?(IPV6_LINK_LOCAL_UNICAST_BLOCK)
-      IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress("fc00::/7") unless defined?(IPV6_PRIVATE_ADDRESS_BLOCK)
-
-      def private_address?(addr)
-        ip = IPAddress(addr)
-
-        if ip.respond_to? :private?
-          ip.private?
-        else
-          IPV6_LINK_LOCAL_UNICAST_BLOCK.include?(ip) || IPV6_PRIVATE_ADDRESS_BLOCK.include?(ip)
-        end
-      end
-      alias unique_local_address? private_address?
-
-      def public_address?(addr)
-        !private_address?(addr)
-      end
-
-      # The ipaddress gem doesn't implement loopback?
-      # for IPv4 addresses
-      # https://github.com/bluemonk/ipaddress/issues/25
-      def loopback?(addr)
-        ip = IPAddress(addr)
-
-        if ip.respond_to? :loopback?
-          ip.loopback?
-        else
-          IPAddress("127.0.0.0/8").include? ip
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
+# 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.
+
+module Ohai
+  module Util
+    module IpHelper
+      require "ipaddress" unless defined?(IPAddress)
+
+      # Corresponding to RFC 4192 + RFC 4193
+      IPV6_LINK_LOCAL_UNICAST_BLOCK = IPAddress("fe80::/10") unless defined?(IPV6_LINK_LOCAL_UNICAST_BLOCK)
+      IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress("fc00::/7") unless defined?(IPV6_PRIVATE_ADDRESS_BLOCK)
+
+      def private_address?(addr)
+        ip = IPAddress(addr)
+
+        if ip.respond_to? :private?
+          ip.private?
+        else
+          IPV6_LINK_LOCAL_UNICAST_BLOCK.include?(ip) || IPV6_PRIVATE_ADDRESS_BLOCK.include?(ip)
+        end
+      end
+      alias unique_local_address? private_address?
+
+      def public_address?(addr)
+        !private_address?(addr)
+      end
+
+      # The ipaddress gem doesn't implement loopback?
+      # for IPv4 addresses
+      # https://github.com/bluemonk/ipaddress/issues/25
+      def loopback?(addr)
+        ip = IPAddress(addr)
+
+        if ip.respond_to? :loopback?
+          ip.loopback?
+        else
+          IPAddress("127.0.0.0/8").include? ip
+        end
+      end
+    end
+  end
+end

data/lib/ohai/util/win32.rb

@@ -1,47 +1,47 @@
-# frozen_string_literal: true
-# Author:: Adam Edwards (<adamed@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.
-
-module Ohai
-  module Util
-    module Win32
-      if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
-
-        require "ffi" unless defined?(FFI)
-
-        extend FFI::Library
-
-        ffi_lib "advapi32"
-
-        attach_function :lookup_account_sid,
-          :LookupAccountSidA, %i{pointer pointer pointer pointer pointer pointer pointer}, :long
-
-        attach_function :convert_string_sid_to_sid,
-          :ConvertStringSidToSidA, %i{pointer pointer}, :long
-
-        ffi_lib "kernel32"
-
-        attach_function :local_free,
-          :LocalFree, [ :pointer ], :long
-
-        attach_function :get_last_error,
-          :GetLastError, [], :long
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+# Author:: Adam Edwards (<adamed@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.
+
+module Ohai
+  module Util
+    module Win32
+      if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
+
+        require "ffi" unless defined?(FFI)
+
+        extend FFI::Library
+
+        ffi_lib "advapi32"
+
+        attach_function :lookup_account_sid,
+          :LookupAccountSidA, %i{pointer pointer pointer pointer pointer pointer pointer}, :long
+
+        attach_function :convert_string_sid_to_sid,
+          :ConvertStringSidToSidA, %i{pointer pointer}, :long
+
+        ffi_lib "kernel32"
+
+        attach_function :local_free,
+          :LocalFree, [ :pointer ], :long
+
+        attach_function :get_last_error,
+          :GetLastError, [], :long
+      end
+    end
+  end
+end

data/lib/ohai/version.rb

@@ -1,23 +1,23 @@
-# 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.
-#
-
-module Ohai
-  OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "18.0.26"
-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.
+#
+
+module Ohai
+  OHAI_ROOT = File.expand_path(__dir__)
+  VERSION = "18.1.0"
+end

data/lib/ohai.rb

@@ -1,23 +1,23 @@
-# 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.
-#
-
-require_relative "ohai/version"
-require_relative "ohai/config"
-require_relative "ohai/system"
-require_relative "ohai/exception"
+# 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.
+#
+
+require_relative "ohai/version"
+require_relative "ohai/config"
+require_relative "ohai/system"
+require_relative "ohai/exception"

data/ohai.gemspec

@@ -1,35 +1,35 @@
-# frozen_string_literal: true
-$:.unshift File.expand_path("lib", __dir__)
-require "ohai/version"
-
-Gem::Specification.new do |s|
-  s.name = "ohai"
-  s.version = Ohai::VERSION
-  s.summary = "Ohai profiles your system and emits JSON"
-  s.description = s.summary
-  s.license = "Apache-2.0"
-  s.author = "Adam Jacob"
-  s.email = "adam@chef.io"
-  s.homepage = "https://github.com/chef/ohai/"
-
-  s.required_ruby_version = ">= 2.7"
-
-  s.add_dependency "chef-config", ">= 14.12", "< 19"
-  s.add_dependency "chef-utils", ">= 16.0", "< 19"
-  s.add_dependency "ffi", "~> 1.9"
-  s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "ipaddress"
-  s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options
-  s.add_dependency "mixlib-config", ">= 2.0", "< 4.0"
-  s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
-  s.add_dependency "mixlib-shellout", "~> 3.2", ">= 3.2.5"
-  s.add_dependency "plist", "~> 3.1"
-  s.add_dependency "train-core"
-  s.add_dependency "wmi-lite", "~> 1.0"
-
-  s.bindir = "bin"
-  s.executables = %w{ohai}
-
-  s.require_path = "lib"
-  s.files = %w{LICENSE Gemfile} + Dir.glob("*.gemspec") + Dir.glob("lib/**/*")
-end
+# frozen_string_literal: true
+$:.unshift File.expand_path("lib", __dir__)
+require "ohai/version"
+
+Gem::Specification.new do |s|
+  s.name = "ohai"
+  s.version = Ohai::VERSION
+  s.summary = "Ohai profiles your system and emits JSON"
+  s.description = s.summary
+  s.license = "Apache-2.0"
+  s.author = "Adam Jacob"
+  s.email = "adam@chef.io"
+  s.homepage = "https://github.com/chef/ohai/"
+
+  s.required_ruby_version = ">= 2.7"
+
+  s.add_dependency "chef-config", ">= 14.12", "< 19"
+  s.add_dependency "chef-utils", ">= 16.0", "< 19"
+  s.add_dependency "ffi", "~> 1.9"
+  s.add_dependency "ffi-yajl", "~> 2.2"
+  s.add_dependency "ipaddress"
+  s.add_dependency "mixlib-cli", ">= 1.7.0" # 1.7+ needed to support passing multiple options
+  s.add_dependency "mixlib-config", ">= 2.0", "< 4.0"
+  s.add_dependency "mixlib-log", ">= 2.0.1", "< 4.0"
+  s.add_dependency "mixlib-shellout", "~> 3.2", ">= 3.2.5"
+  s.add_dependency "plist", "~> 3.1"
+  s.add_dependency "train-core"
+  s.add_dependency "wmi-lite", "~> 1.0"
+
+  s.bindir = "bin"
+  s.executables = %w{ohai}
+
+  s.require_path = "lib"
+  s.files = %w{LICENSE Gemfile} + Dir.glob("*.gemspec") + Dir.glob("lib/**/*")
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 18.0.26
+  version: 18.1.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -241,6 +241,7 @@ files:
 - lib/ohai/mixin/gce_metadata.rb
 - lib/ohai/mixin/http_helper.rb
 - lib/ohai/mixin/network_helper.rb
+- lib/ohai/mixin/oci_metadata.rb
 - lib/ohai/mixin/os.rb
 - lib/ohai/mixin/scaleway_metadata.rb
 - lib/ohai/mixin/seconds_to_human.rb
@@ -324,6 +325,7 @@ files:
 - lib/ohai/plugins/netbsd/platform.rb
 - lib/ohai/plugins/network.rb
 - lib/ohai/plugins/nodejs.rb
+- lib/ohai/plugins/oci.rb
 - lib/ohai/plugins/ohai.rb
 - lib/ohai/plugins/ohai_time.rb
 - lib/ohai/plugins/openbsd/memory.rb
@@ -398,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON