inspec-core 4.18.24 → 4.18.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 983039fedda07315582c5329b0041543af3b234cc66d8f5e09938f23540e4731
-  data.tar.gz: aa83556f643cc61866aab9800c8cdb481808c2058d04fe3e80701cec75e473ce
+  metadata.gz: e80bff1bace3e7cd09a4c8ee8d42dff17021c71537f6e857d65678060a8b7d96
+  data.tar.gz: f2d9eee362213bc05a5b410d2b9aba371c366e56355a6a7384b3900dd0f2383a
 SHA512:
-  metadata.gz: 7830977e9d97ee2654ca16727f99d94d28cf62f965fb813c17b04f98ef3f75cdec0f25e8b154b6d2a6ccf449b02b220a41e7cf7b4ed099b42382922b758557eb
-  data.tar.gz: '09032668f99b15d19532e790244325da380c9bf317308a3ae4e336a6a7d4731c297b039d6a3df8724dafc7b9d6002e1fc150dac25ba34c60072f91aa11e87817'
+  metadata.gz: 066e480ce7a22cafbfe5d52c2be91fc1258234c08c93a935308fd665afd5a87d793bc1dc59a9977aa5e93068cbed4715944769bb2d9356895efa6d6f6e0a67d5
+  data.tar.gz: 4b0057206189584b25f6ff83960c69129e77264bf6177baec5216353a497f58c2cab3748de0d5546ca15e8c3098ef88bcdc728602cfaa6f149fc5a862ec8fef6

data/etc/deprecations.json

@@ -116,6 +116,10 @@
     "wmi_non_hash_usage": {
       "action": "fail_control",
       "suffix": "This property was removed in InSpec 4.0."
+    },
+    "object_classes": {
+      "action": "warn",
+      "suffix": "These classes will be removed in InSpec 5.0."
     }
   }
 }

data/lib/inspec/cli.rb

@@ -122,8 +122,8 @@ class Inspec::InspecCLI < Inspec::BaseCLI
     else
       %w{location profile controls timestamp valid}.each do |item|
         prepared_string = format("%-12s %s",
-          "#{item.to_s.capitalize} :",
-          result[:summary][item.to_sym])
+                                 "#{item.to_s.capitalize} :",
+                                 result[:summary][item.to_sym])
         ui.plain_line(prepared_string)
       end
       puts

data/lib/inspec/config.rb

@@ -207,7 +207,8 @@ module Inspec
     end
 
     def _utc_find_credset_name(_credentials, transport_name)
-      return nil unless final_options[:target]
+      return unless final_options[:target]
+
       match = final_options[:target].match(%r{^#{transport_name}://(?<credset_name>[\w\-]+)$})
       match ? match[:credset_name] : nil
     end

data/lib/inspec/dependencies/requirement.rb

@@ -21,16 +21,20 @@ module Inspec
       }
 
       new(dep[:name],
-        dep[:version],
-        config,
-        opts.merge(dep))
+          dep[:version],
+          config,
+          opts.merge(dep))
     end
 
     def self.from_lock_entry(entry, config, opts = {})
+      resolved_source = entry[:resolved_source]
+        .merge(backend: config[:backend])
+        .merge(opts)
+
       req = new(entry[:name],
-        entry[:version_constraints],
-        config,
-        entry[:resolved_source].merge(backend: config[:backend]).merge(opts))
+                entry[:version_constraints],
+                config,
+                resolved_source)
 
       locked_deps = []
       Array(entry[:dependencies]).each do |dep_entry|

data/lib/inspec/describe_base.rb

@@ -1,5 +1,10 @@
+require "inspec/input_dsl_helpers"
+
 module Inspec
   class DescribeBase
+
+    include Inspec::InputDslHelpers
+
     def initialize(action)
       @action = action
       @checks = []
@@ -17,6 +22,14 @@ module Inspec
       @action.call("describe.one", @checks, nil)
     end
 
+    def input(input_name, options = {})
+      input_with_profile_id(__profile_id, input_name, options)
+    end
+
+    def input_object(name)
+      Inspec::InputRegistry.find_or_register_input(name, __profile_id)
+    end
+
     def method_missing(method_name, *arguments)
       Inspec::DSL.method_missing_resource(inspec, method_name, *arguments)
     end
@@ -24,5 +37,17 @@ module Inspec
     def describe(*args, &block)
       @checks.push(["describe", args, block])
     end
+
+    private
+
+    # While this is marked private, it gets consumed during an instance_eval,
+    # so it is fully visible. The double underscore is there to discourage
+    # use - this is a private API.
+    def __profile_id
+      # Excavate the profile ID. The action is a Method calling __add_check on
+      # a Rule whose profile ID we want
+      @action.receiver.instance_variable_get(:@__profile_id)
+    end
+
   end
 end

data/lib/inspec/file_provider.rb

@@ -123,6 +123,7 @@ module Inspec
     end
 
     def read(file)
+      # TODO: this is inefficient
       @contents[file] ||= read_from_zip(file)
     end
 
@@ -141,6 +142,10 @@ module Inspec
           next unless file == entry.name
 
           res = io.read
+          try = res.dup
+          try.force_encoding Encoding::UTF_8
+          res = try.encode(try.encoding, universal_newline: true) if try.valid_encoding?
+
           break
         end
       end
@@ -174,7 +179,8 @@ module Inspec
                               res = entry.read || ""
                               try = res.dup
                               try.force_encoding Encoding::UTF_8
-                              res = try if try.valid_encoding?
+                              res = try.encode(try.encoding, universal_newline: true) if
+                                try.valid_encoding?
                               res
                             end
         end

data/lib/inspec/input_dsl_helpers.rb

@@ -0,0 +1,26 @@
+
+require "inspec/input_registry"
+
+module Inspec
+  # A mixin to provide implementations for the input() DSL methods
+  module InputDslHelpers
+
+    # Find or create an input, explicitly named by a profile ID and
+    #  input name. Evaluate the input and return the value.
+    # @param [String] Profile ID
+    # @param [String] Input Name
+    # @param [Hash] Input options - see input docs on website
+    # @returns [Object] Input value
+    def input_with_profile_id(profile_id, input_name, options)
+      if options.empty?
+        # Simply an access, no event here
+        Inspec::InputRegistry.find_or_register_input(input_name, profile_id).value
+      else
+        options[:priority] = 20
+        options[:provider] = :inline_control_code
+        evt = Inspec::Input.infer_event(options)
+        Inspec::InputRegistry.find_or_register_input(input_name, profile_id, event: evt).value
+      end
+    end
+  end
+end

data/lib/inspec/input_registry.rb

@@ -208,8 +208,8 @@ module Inspec
         data = Inspec::SecretsBackend.resolve(path)
         if data.nil?
           raise Inspec::Exceptions::SecretsBackendNotFound,
-            "Cannot find parser for inputs file '#{path}'. " \
-            "Check to make sure file has the appropriate extension."
+                "Cannot find parser for inputs file '#{path}'. " \
+                "Check to make sure file has the appropriate extension."
         end
 
         next if data.inputs.nil?
@@ -230,14 +230,14 @@ module Inspec
     def validate_inputs_file_readability!(path)
       unless File.exist?(path)
         raise Inspec::Exceptions::InputsFileDoesNotExist,
-          "Cannot find input file '#{path}'. " \
-          "Check to make sure file exists."
+              "Cannot find input file '#{path}'. " \
+              "Check to make sure file exists."
       end
 
       unless File.readable?(path)
         raise Inspec::Exceptions::InputsFileNotReadable,
-          "Cannot read input file '#{path}'. " \
-          "Check to make sure file is readable."
+              "Cannot read input file '#{path}'. " \
+              "Check to make sure file is readable."
       end
 
       true

data/lib/inspec/metadata.rb

@@ -64,6 +64,7 @@ module Inspec
     end
 
     def supports_platform?(backend)
+      require "inspec/resources/platform" # break circularity in load
       backend.platform.supported?(params[:supports])
     end
 
@@ -156,9 +157,12 @@ module Inspec
         nil
       when nil then nil
       else
-        Inspec.deprecate(:supports_syntax,
+        Inspec.deprecate(
+          :supports_syntax,
           "Do not use deprecated `supports: #{x}` syntax. Instead use:\n"\
-          "supports:\n  - os-family: #{x}\n\n")
+            "supports:\n  - os-family: #{x}\n\n"
+        )
+
         { :'os-family' => x } # rubocop:disable Style/HashSyntax
       end
     end

data/lib/inspec/method_source.rb

@@ -14,7 +14,7 @@ module Inspec
       ::MethodSource.expression_at(src.lines, location[:line]).force_encoding("utf-8")
     rescue SyntaxError => e
       raise ::MethodSource::SourceNotFoundError,
-        "Could not parse source at #{location[:ref]}:#{location[:line]}: #{e.message}"
+            "Could not parse source at #{location[:ref]}:#{location[:line]}: #{e.message}"
     end
   end
 end

data/lib/inspec/objects/control.rb

@@ -1,3 +1,8 @@
+# This class is deprecated and will be removed in the next major release of InSpec.
+# Use the Inspec::Object classes from the inspec-objects rubygem instead.
+
+require "inspec/utils/deprecation"
+
 module Inspec
   class Control
     attr_accessor :id, :title, :descriptions, :impact, :tests, :tags, :refs, :only_if
@@ -6,6 +11,8 @@ module Inspec
       @tags = []
       @refs = []
       @descriptions = {}
+
+      Inspec.deprecate(:object_classes, "The Inspec::Control class is deprecated. Use the Inspec::Object::Control class from the inspec-objects Ruby library.")
     end
 
     def add_test(t)

data/lib/inspec/objects/describe.rb

@@ -1,3 +1,8 @@
+# This class is deprecated and will be removed in the next major release of InSpec.
+# Use the Inspec::Object classes from the inspec-objects rubygem instead.
+
+require "inspec/utils/deprecation"
+
 module Inspec
   class Describe
     # Internal helper to structure test objects.
@@ -53,6 +58,8 @@ module Inspec
       @qualifier = []
       @tests = []
       @variables = []
+
+      Inspec.deprecate(:object_classes, "The Inspec::Describe class is deprecated. Use the Inspec::Object::Describe class from the inspec-objects Ruby library.")
     end
 
     def add_test(its, matcher, expectation, opts = {})

data/lib/inspec/objects/each_loop.rb

@@ -1,3 +1,8 @@
+# This class is deprecated and will be removed in the next major release of InSpec.
+# Use the Inspec::Object classes from the inspec-objects rubygem instead.
+
+require "inspec/utils/deprecation"
+
 module Inspec
   class EachLoop < List
     attr_reader :variables
@@ -6,6 +11,8 @@ module Inspec
       super
       @tests = []
       @variables = []
+
+      Inspec.deprecate(:object_classes, "The Inspec::EachLoop class is deprecated. Use the Inspec::Object::EachLoop class from the inspec-objects Ruby library.")
     end
 
     def add_test(t = nil)

data/lib/inspec/objects/input.rb

@@ -1,3 +1,7 @@
+# This file is deprecated and will be removed in the next major release of InSpec.
+# The Inspec::Input class will remain but these methods will be removed.
+# Use the Inspec::Object::Input class from the inspec-objects rubygem instead.
+
 require "inspec/input"
 
 module Inspec

data/lib/inspec/objects/or_test.rb

@@ -1,9 +1,16 @@
+# This class is deprecated and will be removed in the next major release of InSpec.
+# Use the Inspec::Object classes from the inspec-objects rubygem instead.
+
+require "inspec/utils/deprecation"
+
 module Inspec
   class OrTest
     attr_reader :tests
     def initialize(tests)
       @tests = tests
       @negated = false
+
+      Inspec.deprecate(:object_classes, "The Inspec::OrTest class is deprecated. Use the Inspec::Object::OrTest class from the inspec-objects Ruby library.")
     end
 
     def skip

data/lib/inspec/objects/tag.rb

@@ -1,3 +1,8 @@
+# This class is deprecated and will be removed in the next major release of InSpec.
+# Use the Inspec::Object classes from the inspec-objects rubygem instead.
+
+require "inspec/utils/deprecation"
+
 module Inspec
   class Tag
     attr_accessor :key, :value
@@ -5,6 +10,8 @@ module Inspec
     def initialize(key, value)
       @key = key
       @value = value
+
+      Inspec.deprecate(:object_classes, "The Inspec::Tag class is deprecated. Use the Inspec::Object::Tag class from the inspec-objects Ruby library.")
     end
 
     def to_hash

data/lib/inspec/objects/test.rb

@@ -1,3 +1,8 @@
+# This class is deprecated and will be removed in the next major release of InSpec.
+# Use the Inspec::Object classes from the inspec-objects rubygem instead.
+
+require "inspec/utils/deprecation"
+
 module Inspec
   class Test
     attr_accessor :qualifier, :matcher, :expectation, :skip, :negated, :variables, :only_if
@@ -7,6 +12,8 @@ module Inspec
       @qualifier = []
       @negated = false
       @variables = []
+
+      Inspec.deprecate(:object_classes, "The Inspec::Test class is deprecated. Use the Inspec::Object::Test class from the inspec-objects Ruby library.")
     end
 
     def negate!
@@ -75,7 +82,7 @@ module Inspec
                 " " + expectation.inspect
               end
       format("%s%sdescribe %s do\n  %s { should%s %s%s }\nend",
-        only_if_clause, vars, res, itsy, naughty, matcher, xpect)
+             only_if_clause, vars, res, itsy, naughty, matcher, xpect)
     end
 
     def rb_skip

data/lib/inspec/objects/value.rb

@@ -1,3 +1,8 @@
+# This class is deprecated and will be removed in the next major release of InSpec.
+# Use the Inspec::Object classes from the inspec-objects rubygem instead.
+
+require "inspec/utils/deprecation"
+
 module Inspec
   class Value
     include ::Inspec::RubyHelper
@@ -9,6 +14,8 @@ module Inspec
     def initialize(qualifiers = [])
       @qualifier = qualifiers
       @variable = nil
+
+      Inspec.deprecate(:object_classes, "The Inspec::Value class is deprecated. Use the Inspec::Object::Value class from the inspec-objects Ruby library.")
     end
 
     def to_ruby

data/lib/inspec/plugin/v2/installer.rb

@@ -267,12 +267,17 @@ module Inspec::Plugin::V2
       # Make Set that encompasses just the gemfile that was provided
       plugin_local_source = Gem::Source::SpecificFile.new(opts[:gem_file])
 
-      plugin_dependency = Gem::Dependency.new(requested_plugin_name,
-        plugin_local_source.spec.version)
+      plugin_dependency = Gem::Dependency.new(
+        requested_plugin_name,
+        plugin_local_source.spec.version
+      )
 
       requested_local_gem_set = Gem::Resolver::InstallerSet.new(:both)
-      requested_local_gem_set.add_local(plugin_dependency.name,
-        plugin_local_source.spec, plugin_local_source)
+      requested_local_gem_set.add_local(
+        plugin_dependency.name,
+        plugin_local_source.spec,
+        plugin_local_source
+      )
 
       install_gem_to_plugins_dir(plugin_dependency, [requested_local_gem_set])
     end

data/lib/inspec/resource.rb

@@ -110,3 +110,5 @@ end
 
 # Many resources use FilterTable.
 require "inspec/utils/filter"
+# conflicts with global `gem` method so we need to pre-load this.
+require "inspec/resources/gem"

data/lib/inspec/resources/apt.rb

@@ -92,7 +92,7 @@ module Inspec::Resources
         # deb [trusted=yes] http://archive.ubuntu.com/ubuntu/ wily main restricted ...
 
         words = line.split
-        words.delete 1 if words[1] && words[1].start_with?("[")
+        words.delete_at 1 if words[1] && words[1].start_with?("[")
         type, url, distro, *components = words
         url = url.delete('"') if url
 

data/lib/inspec/resources/auditd.rb

@@ -30,7 +30,7 @@ module Inspec::Resources
     def initialize
       unless inspec.command("/sbin/auditctl").exist?
         raise Inspec::Exceptions::ResourceFailed,
-          "Command `/sbin/auditctl` does not exist"
+              "Command `/sbin/auditctl` does not exist"
       end
 
       auditctl_cmd = "/sbin/auditctl -l"
@@ -38,7 +38,7 @@ module Inspec::Resources
 
       if result.exit_status != 0
         raise Inspec::Exceptions::ResourceFailed,
-          "Command `#{auditctl_cmd}` failed with error: #{result.stderr}"
+              "Command `#{auditctl_cmd}` failed with error: #{result.stderr}"
       end
 
       @content = result.stdout
@@ -46,8 +46,8 @@ module Inspec::Resources
 
       if @content =~ /^LIST_RULES:/
         raise Inspec::Exceptions::ResourceFailed,
-          "The version of audit is outdated." \
-          "The `auditd` resource supports versions of audit >= 2.3."
+              "The version of audit is outdated." \
+              "The `auditd` resource supports versions of audit >= 2.3."
       end
       parse_content
     end

data/lib/inspec/resources/command.rb

@@ -37,7 +37,7 @@ module Inspec::Resources
           # Make sure command is replaced so sensitive output isn't shown
           @command = "ERROR"
           raise Inspec::Exceptions::ResourceFailed,
-            "The `redact_regex` option must be a regular expression"
+                "The `redact_regex` option must be a regular expression"
         end
         @redact_regex = options[:redact_regex]
       end

data/lib/inspec/resources/filesystem.rb

@@ -98,7 +98,7 @@ module Inspec::Resources
       cmd = inspec.command("df #{partition} -PT")
       if cmd.stdout.nil? || cmd.stdout.empty? || cmd.exit_status != 0
         raise Inspec::Exceptions::ResourceFailed,
-          "Unable to get available space for partition #{partition}"
+              "Unable to get available space for partition #{partition}"
       end
       value = cmd.stdout.split(/\n/)[1].strip.split(" ")
       {
@@ -125,8 +125,8 @@ module Inspec::Resources
         fs = JSON.parse(cmd.stdout)
       rescue JSON::ParserError => e
         raise Inspec::Exceptions::ResourceFailed,
-          "Failed to parse JSON from Powershell. " \
-          "Error: #{e}"
+              "Failed to parse JSON from Powershell. " \
+              "Error: #{e}"
       end
       {
         name: fs["DeviceID"],

data/lib/inspec/resources/gem.rb

@@ -2,7 +2,7 @@ require "inspec/resources/command"
 
 module Inspec::Resources
   class GemPackage < Inspec.resource(1)
-    name "gem"
+    name "gem" # TODO: rename to "rubygem" and provide alias
     supports platform: "unix"
     supports platform: "windows"
     desc "Use the gem InSpec audit resource to test if a global gem package is installed."
@@ -17,11 +17,12 @@ module Inspec::Resources
 
     def initialize(package_name, gem_binary = nil)
       @package_name = package_name
-      @gem_binary = case gem_binary
+      @gem_binary = case gem_binary # TODO: no. this is not right
                     when nil
                       "gem"
                     when :chef
                       if inspec.os.windows?
+                        # TODO: what about chef-dk or other installs?
                         'c:\opscode\chef\embedded\bin\gem.bat'
                       else
                         "/opt/chef/embedded/bin/gem"

data/lib/inspec/resources/http.rb

@@ -35,8 +35,8 @@ module Inspec::Resources
       # profiles.
       if opts.key?(:enable_remote_worker) && !inspec.local_transport?
         warn "Ignoring `enable_remote_worker` option, the `http` resource ",
-          "remote worker is enabled by default for remote targets and ",
-          "cannot be disabled"
+             "remote worker is enabled by default for remote targets and ",
+             "cannot be disabled"
       end
 
       # Run locally if InSpec is ran locally and remotely if ran remotely
@@ -164,7 +164,7 @@ module Inspec::Resources
         def initialize(inspec, http_method, url, opts)
           unless inspec.command("curl").exist?
             raise Inspec::Exceptions::ResourceSkipped,
-              "curl is not available on the target machine"
+                  "curl is not available on the target machine"
           end
 
           @ran_curl = false

data/lib/inspec/resources/npm.rb

@@ -27,12 +27,20 @@ module Inspec::Resources
       return @info if defined?(@info)
 
       if @location
-        npm = "cd #{Shellwords.escape @location} && npm"
+        command_separator = inspec.os.platform?("windows") ? ";" : "&&"
+        invocation = "cd #{Shellwords.escape @location} #{command_separator} npm"
       else
-        npm = "npm -g"
+        invocation = "npm -g"
       end
 
-      cmd = inspec.command("#{npm} ls --json #{@package_name}")
+      invocation = "#{invocation} ls --json #{@package_name}"
+
+      # If on unix, wrap in sh -c to protect against sudo
+      unless inspec.os.platform?("windows")
+        invocation = "sh -c '#{invocation}'"
+      end
+
+      cmd = inspec.command(invocation)
       @info = {
         name: @package_name,
         type: "npm",

data/lib/inspec/resources/oracledb_session.rb

@@ -58,8 +58,8 @@ module Inspec::Resources
       command = command_builder(format_options, sql)
       inspec_cmd = inspec.command(command)
 
-      DatabaseHelper::SQLQueryResult.new(inspec_cmd, send(parser,
-                                                          inspec_cmd.stdout))
+      DatabaseHelper::SQLQueryResult.new(inspec_cmd,
+                                         send(parser, inspec_cmd.stdout))
     end
 
     def to_s

data/lib/inspec/resources/package.rb

@@ -217,8 +217,7 @@ module Inspec::Resources
       }
     rescue JSON::ParserError => e
       raise Inspec::Exceptions::ResourceFailed,
-        "Failed to parse JSON from `brew` command. " \
-        "Error: #{e}"
+            "Failed to parse JSON from `brew` command. Error: #{e}"
     end
   end
 
@@ -307,8 +306,7 @@ module Inspec::Resources
         package = JSON.parse(cmd.stdout)
       rescue JSON::ParserError => e
         raise Inspec::Exceptions::ResourceFailed,
-          "Failed to parse JSON from PowerShell. " \
-          "Error: #{e}"
+              "Failed to parse JSON from PowerShell. Error: #{e}"
       end
 
       # What if we match multiple packages?  just pick the first one for now.

data/lib/inspec/resources/service.rb

@@ -304,10 +304,12 @@ module Inspec::Resources
 
       # LoadState values eg. loaded, not-found
       installed = params["LoadState"] == "loaded"
+      startname = params["User"]
 
       {
         name: params["Id"],
         description: params["Description"],
+        startname: startname,
         installed: installed,
         running: is_active?(service_name),
         enabled: is_enabled?(service_name),

data/lib/inspec/resources/sys_info.rb

@@ -45,7 +45,7 @@ module Inspec::Resources
     end
 
     def linux_hostname(opt = nil)
-      if !opt.nil?
+      if opt
         opt = case opt
               when "f", "long", "fqdn", "full"
                 " -f"
@@ -67,7 +67,7 @@ module Inspec::Resources
     end
 
     def mac_hostname(opt = nil)
-      if !opt.nil?
+      if opt
         opt = case opt
               when "f", "long", "fqdn", "full"
                 " -f"

data/lib/inspec/resources/users.rb

@@ -624,7 +624,9 @@ module Inspec::Resources
 
     def meta_info(username)
       res = identity(username)
+
       return if res.nil?
+
       {
         home: res[:home],
         shell: res[:shell],
@@ -635,7 +637,9 @@ module Inspec::Resources
 
     def credentials(username)
       res = identity(username)
+
       return if res.nil?
+
       {
         mindays: res[:mindays],
         maxdays: res[:maxdays],

data/lib/inspec/rspec_extensions.rb

@@ -1,6 +1,7 @@
 require "inspec/input_registry"
 require "inspec/plugin/v2"
 require "rspec/core/example_group"
+require "inspec/input_dsl_helpers"
 
 # Any additions to RSpec::Core::ExampleGroup (the RSpec class behind describe blocks) should go here.
 
@@ -82,18 +83,12 @@ module Inspec
 end
 
 class RSpec::Core::ExampleGroup
+  include Inspec::InputDslHelpers
+
   # This DSL method allows us to access the values of inputs within InSpec tests
   def input(input_name, options = {})
     profile_id = self.class.metadata[:profile_id]
-    if options.empty?
-      # Simply an access, no event here
-      Inspec::InputRegistry.find_or_register_input(input_name, profile_id).value
-    else
-      options[:priority] = 20
-      options[:provider] = :inline_control_code
-      evt = Inspec::Input.infer_event(options)
-      Inspec::InputRegistry.find_or_register_input(input_name, profile_id, event: evt).value
-    end
+    input_with_profile_id(profile_id, input_name, options)
   end
   define_example_method :input
 

data/lib/inspec/rule.rb

@@ -4,6 +4,7 @@ require "method_source"
 require "date"
 require "inspec/describe_base"
 require "inspec/expect"
+require "inspec/impact"
 require "inspec/resource"
 require "inspec/resources/os"
 require "inspec/input_registry"
@@ -204,7 +205,11 @@ module Inspec
 
     def self.set_skip_rule(rule, value, message = nil, type = :only_if)
       rule.instance_variable_set(:@__skip_rule,
-        { result: value, message: message, type: type })
+                                 {
+                                   result: value,
+                                   message: message,
+                                   type: type,
+                                 })
     end
 
     def self.merge_count(rule)

data/lib/inspec/runner.rb

@@ -190,10 +190,10 @@ module Inspec
     #
     def add_target(target, _opts = [])
       profile = Inspec::Profile.for_target(target,
-        vendor_cache: @cache,
-        backend: @backend,
-        controls: @controls,
-        runner_conf: @conf)
+                                           vendor_cache: @cache,
+                                           backend: @backend,
+                                           controls: @controls,
+                                           runner_conf: @conf)
       raise "Could not resolve #{target} to valid input." if profile.nil?
 
       @target_profiles << profile if supports_profile?(profile)

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "4.18.24".freeze
+  VERSION = "4.18.38".freeze
 end

data/lib/plugins/inspec-artifact/lib/inspec-artifact/base.rb

@@ -162,7 +162,7 @@ module InspecPlugins
         if verification_key.verify digest, signature, content
           content_block.yield(content)
         else
-          puts "Artifact is invalid"
+          raise "Artifact is invalid"
         end
       end
     end

data/lib/plugins/shared/core_plugin_test_helper.rb

@@ -12,6 +12,7 @@ require "tmpdir"
 require "pathname"
 require "forwardable"
 
+require "functional/helper"
 require "inspec/plugin/v2"
 
 # Configure Minitest to expose things like `let`
@@ -36,35 +37,32 @@ end
 #   end
 # end
 
+# TODO: remove me! There's no need!
 module CorePluginBaseHelper
-  libdir = File.expand_path "lib"
-
-  let(:repo_path) { File.expand_path(File.join(__FILE__, "..", "..", "..", "..")) }
-  let(:inspec_path) { File.join(repo_path, "inspec-bin", "bin", "inspec") }
-  let(:exec_inspec) { [Gem.ruby, "-I#{libdir}", inspec_path].join " " }
-  let(:core_mock_path) { File.join(repo_path, "test", "unit", "mock") }
-  let(:core_fixture_plugins_path) { File.join(core_mock_path, "plugins") }
-  let(:core_config_dir_path) { File.join(core_mock_path, "config_dirs") }
+  let(:mock_path) { File.join(repo_path, "test", "fixtures", "mock") }
+  let(:core_fixture_plugins_path) { File.join(mock_path, "plugins") }
+  let(:core_config_dir_path) { File.join(mock_path, "config_dirs") }
 
   let(:registry) { Inspec::Plugin::V2::Registry.instance }
 end
 
-require "functional/helper"
-
 module CorePluginFunctionalHelper
   include CorePluginBaseHelper
   include FunctionalHelper
 
+  # TODO: so much duplication! Remove everything we can!
   require "train"
   TRAIN_CONNECTION = Train.create("local", command_runner: :generic).connection
 
+  # TODO: remove me! it's in test/functional/helper.rb
   def run_inspec_process(command_line, opts = {})
     prefix = ""
     if opts.key?(:prefix)
       prefix = opts[:prefix]
     elsif opts.key?(:env)
-      prefix = opts[:env].to_a.map { |assignment| "#{assignment[0]}=#{assignment[1]}" }.join(" ")
+      prefix = assemble_env_prefix opts[:env]
     end
+
     TRAIN_CONNECTION.run_command("#{prefix} #{exec_inspec} #{command_line}")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-core
 version: !ruby/object:Gem::Version
-  version: 4.18.24
+  version: 4.18.38
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train-core
@@ -44,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: chef-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -432,6 +418,7 @@ files:
 - lib/inspec/globals.rb
 - lib/inspec/impact.rb
 - lib/inspec/input.rb
+- lib/inspec/input_dsl_helpers.rb
 - lib/inspec/input_registry.rb
 - lib/inspec/library_eval_context.rb
 - lib/inspec/log.rb