inspec-core 5.22.40 → 5.22.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95805ac2a4faab83d1826792a5d838caa5f1808fcc884e061cf3f7070ab6ef2
-  data.tar.gz: 984dfca55efec04f1e9b98ddfebf5be636b96a91c7fe7dc97f9ffb9789c60af3
+  metadata.gz: bf0d707c247850a684a024680d641da787207608e7601e617023b29c299d1d2f
+  data.tar.gz: 684b3be8f6b45f7ffa770670f3eb9e281253c3e2c46f47c8d0e50e2d2090d564
 SHA512:
-  metadata.gz: fb6e20f346e0e5ab27878931b1396c10a633b99767472774299d92fce3ae2ccf01399cb100e5ae4566456039a3d814ac4148670da65b41563e72139d29551ed7
-  data.tar.gz: 0c9c665c3afb6d90121bf40ac00736a900955e0ea5955af58f7e56378d18eecfd7560f40e2cce049afd7156ecb495c77b1c58765c0e69f82bfd03e976c2f367f
+  metadata.gz: 701450c7309e4d2d637b631f2e409f4d16dea4468771ce5c3a1aa9bf1a3fd75b9c25defde7d19ed21c005e8511134ea624cde373f99d448e79c90385a73da61f
+  data.tar.gz: 3afa092af7a5c77918ec4a6cf7d1904b649cb67e988025e9abbc8011cd13fd5124942b540efdcdafbcb83549a3f5627e85e7dc10e349097a2988803936aac58d

data/Gemfile

@@ -27,25 +27,20 @@ group :omnibus do
 end
 
 group :test do
-  gem "chefstyle", "~> 2.2.2"
-  gem "concurrent-ruby", "~> 1.0"
-  gem "json_schemer", ">= 0.2.1", "< 2.0.1"
+  gem "chefstyle"
+  gem "concurrent-ruby"
+  gem "json_schemer"
   gem "m"
   gem "minitest-sprint", "~> 1.0"
   gem "minitest", "5.15.0"
-  gem "mocha", "~> 2.1"
-  gem "nokogiri", "~> 1.9"
+  gem "mocha"
+  gem "nokogiri"
   gem "pry-byebug"
-  gem "pry", "~> 0.10"
-  gem "rake", ">= 10"
-  gem "simplecov", "~> 0.21"
+  gem "pry"
+  gem "rake"
+  gem "simplecov"
   gem "simplecov_json_formatter"
-  gem "webmock", "~> 3.0"
-
-  if Gem.ruby_version >= Gem::Version.new("3.0.0")
-    # html-proofer has a dep on io-event, which is ruby-3 only
-    gem "html-proofer", "~> 3.19.4", platforms: :ruby # do not attempt to run proofer on windows. Pinned to 3.19.4 as test is breaking in updated versions.
-  end
+  gem "webmock"
 end
 
 group :deploy do

data/inspec-core.gemspec

@@ -47,5 +47,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "semverse",                 "~> 3.0"
   spec.add_dependency "multipart-post",           "~> 2.0"
 
+  # cookstyle support for inspec check
+  # This was initially included in 'inspec.gemspec' to keep 'chef-client' lightweight.
+  # However, it has been moved to 'inspec-core.gemspec' due to a dependency on the 'ast' gem,
+  # which was causing a LoadError ('cannot load such file -- ast') for users/applications using 'inspec-core'.
+  spec.add_dependency "cookstyle"
+
   spec.add_dependency "train-core", "~> 3.10"
 end

data/lib/inspec/fetcher/url.rb

@@ -93,7 +93,7 @@ module Inspec::Fetcher
                            end
 
       if transformed_target
-        Inspec::Log.warn("URL target #{target} transformed to #{transformed_target}. Consider using the git fetcher")
+        Inspec::Log.debug("URL target #{target} transformed to #{transformed_target}. Consider using the git fetcher")
         transformed_target
       else
         target
@@ -133,12 +133,14 @@ module Inspec::Fetcher
     class << self
       def default_ref(match_data, repo_url)
         remote_url = "#{repo_url}/#{match_data[:user]}/#{match_data[:repo]}.git"
-        command_string = "git remote show #{remote_url}"
+        command_string = "git ls-remote #{remote_url} HEAD"
         cmd = shellout(command_string)
         unless cmd.exitstatus == 0
           raise(Inspec::FetcherFailure, "Profile git dependency failed with default reference - #{remote_url} - error running '#{command_string}': #{cmd.stderr}")
         else
-          ref = cmd.stdout.lines.detect { |l| l.include? "HEAD branch:" }&.split(":")&.last&.strip
+          # cmd.stdout of "git ls-remote #{remote_url} HEAD" looks like this:
+          # "457d14843ab7c1c3740169eb47cf129a6f417964\tHEAD\n"
+          ref = cmd.stdout.split("\t").first
           unless ref
             raise(Inspec::FetcherFailure, "Profile git dependency failed with default reference - #{remote_url} - error running '#{command_string}': NULL reference")
           end

data/lib/inspec/resources/virtualization.rb

@@ -223,7 +223,7 @@ module Inspec::Resources
       elsif cgroup_content =~ %r{^\d+:[^:]+:/(kubepods)/.+$}
         @virtualization_data[:system] = $1
         @virtualization_data[:role] = "guest"
-      elsif /container=podman/.match?(file_read("/proc/1/environ"))
+      elsif /container=podman/.match?(inspec.file("/proc/1/environ").content)
         @virtualization_data[:system] = "podman"
         @virtualization_data[:role] = "guest"
       elsif lxc_version_exists? && cgroup_content =~ %r{\d:[^:]+:/$}

data/lib/inspec/utils/profile_ast_helpers.rb

@@ -3,8 +3,7 @@ require "rubocop-ast"
 module Inspec
   class Profile
     class AstHelper
-      class CollectorBase
-        include Parser::AST::Processor::Mixin
+      class CollectorBase < Parser::AST::Processor
         include RuboCop::AST::Traversal
 
         attr_reader :memo

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "5.22.40".freeze
+  VERSION = "5.22.50".freeze
 end

data/lib/matchers/matchers.rb

@@ -299,9 +299,9 @@ RSpec::Matchers.define :cmp do |first_expected| # rubocop:disable Metrics/BlockL
     end
   end
 
-  def format_actual(actual)
+  def format_actual(actual, negate = false)
     actual = "0%o" % actual if octal?(@expected) && !actual.nil?
-    "\n%s\n     got: %s\n\n(compared using `cmp` matcher)\n" % [format_expectation(false), actual]
+    "\n%s\n     got: %s\n\n(compared using `cmp` matcher)\n" % [format_expectation(negate), actual]
   end
 
   def format_expectation(negate)
@@ -316,7 +316,7 @@ RSpec::Matchers.define :cmp do |first_expected| # rubocop:disable Metrics/BlockL
   end
 
   failure_message_when_negated do |actual|
-    format_actual actual
+    format_actual actual, true
   end
 
   description do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-core
 version: !ruby/object:Gem::Version
-  version: 5.22.40
+  version: 5.22.50
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-telemetry
@@ -364,6 +364,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: cookstyle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -854,7 +868,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing. Core library.