inspec 4.12.0 → 4.16.0

data/lib/inspec/profile.rb

@@ -116,9 +116,19 @@ module Inspec
       # we can create any inputs that were provided by various mechanisms.
       options[:runner_conf] ||= Inspec::Config.cached
 
+      # Catch legacy CLI input option usage
       if options[:runner_conf].key?(:attrs)
         Inspec.deprecate(:rename_attributes_to_inputs, "Use --input-file on the command line instead of --attrs.")
         options[:runner_conf][:input_file] = options[:runner_conf].delete(:attrs)
+      elsif options[:runner_conf].key?(:input_files)
+        # The kitchen-inspec docs say to use plural. Our CLI and internal expectations are singular.
+        options[:runner_conf][:input_file] = options[:runner_conf].delete(:input_files)
+      end
+
+      # Catch legacy kitchen-inspec input usage
+      if options[:runner_conf].key?(:attributes)
+        Inspec.deprecate(:rename_attributes_to_inputs, "Use :inputs in your kitchen.yml verifier config instead of :attributes.")
+        options[:runner_conf][:inputs] = options[:runner_conf].delete(:attributes)
       end
 
       Inspec::InputRegistry.bind_profile_inputs(
@@ -127,8 +137,8 @@ module Inspec
         # Remaining args are possible sources of inputs
         cli_input_files: options[:runner_conf][:input_file], # From CLI --input-file
         profile_metadata: metadata,
-        # TODO: deprecation checks here
-        runner_api: options[:runner_conf][:attributes] # This is the route the audit_cookbook and kitchen-inspec take
+        runner_api: options[:runner_conf][:inputs], # This is the route the audit_cookbook and kitchen-inspec take
+        cli_input_arg: options[:runner_conf][:input] # The --input name=value CLI option
       )
 
       @runner_context =

data/lib/inspec/resources.rb

@@ -84,6 +84,7 @@ require "inspec/resources/passwd"
 require "inspec/resources/pip"
 require "inspec/resources/platform"
 require "inspec/resources/port"
+require "inspec/resources/postfix_conf"
 require "inspec/resources/postgres"
 require "inspec/resources/postgres_conf"
 require "inspec/resources/postgres_hba_conf"

data/lib/inspec/resources/postfix_conf.rb

@@ -0,0 +1,31 @@
+require "inspec/resources/ini"
+require "inspec/utils/simpleconfig"
+
+module Inspec::Resources
+  class PostfixConf < IniConfig
+    name "postfix_conf"
+    supports platform: "linux"
+    desc "Use the postfix_conf Inspec audit resource to test the configuration of the Postfix Mail Transfer Agent"
+
+    # Allow user to specify a custom configuration path, use default Postfix configuration path if no custom path is provided
+    def initialize(*opts)
+      @params = {}
+      if opts.length == 1
+        @raw_content = load_raw_content(opts)
+      else
+        @raw_content = load_raw_content("/etc/postfix/main.cf")
+      end
+      @params = parse(@raw_content)
+    end
+
+    def parse(content)
+      SimpleConfig.new(content).params
+    end
+
+    private
+
+    def resource_base_name
+      "POSTFIX_CONF"
+    end
+  end
+end

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "4.12.0".freeze
+  VERSION = "4.16.0".freeze
 end

data/lib/plugins/inspec-plugin-manager-cli/lib/inspec-plugin-manager-cli/cli_command.rb

@@ -6,6 +6,14 @@ require "inspec/dist"
 module InspecPlugins
   module PluginManager
     class CliCommand < Inspec.plugin(2, :cli_command)
+      INSTALL_TYPE_LABELS = {
+        bundle: "core", # Calling this core, too - not much of a distinction
+        core: "core",
+        path: "path",
+        user_gem: "gem (user)",
+        system_gem: "gem (system)",
+      }.freeze
+
       include Inspec::Dist
 
       subcommand_desc "plugin SUBCOMMAND", "Manage #{PRODUCT_NAME} and Train plugins"
@@ -15,22 +23,36 @@ module InspecPlugins
       #==================================================================#
 
       desc "list [options]", "Lists user-installed #{PRODUCT_NAME} plugins."
-      option :all, desc: "Include plugins shipped with #{PRODUCT_NAME} as well.", type: :boolean, aliases: [:a]
+      option :all, desc: "List all types of plugins (default)", type: :boolean, default: true, aliases: [:a]
+      option :user, desc: "List user plugins, from ~/.inspec/gems", banner: "", type: :boolean, default: false, aliases: [:u]
+      option :system, desc: "List system plugins, those InSpec depends on", banner: "", type: :boolean, default: false, aliases: [:s]
+      option :core, desc: "List core plugins, those InSpec ships with", banner: "", type: :boolean, default: false, aliases: [:c]
+
       def list
         plugin_statuses = Inspec::Plugin::V2::Registry.instance.plugin_statuses
-        plugin_statuses.reject! { |s| %i{core bundle}.include?(s.installation_type) } unless options[:all]
+        options[:all] = false if options[:core] || options[:user] || options[:system]
+        plugin_statuses.select! do |status|
+          type = status.installation_type
+          options[:all] ||
+            (options[:core] && %i{core bundle}.include?(type)) ||
+            (options[:user] && %i{user_gem path}.include?(type)) ||
+            (options[:system] && :system_gem == type)
+        end
 
-        puts
-        ui.bold(format(" %-30s%-10s%-8s%-6s", "Plugin Name", "Version", "Via", "ApiVer"))
-        ui.line
-        plugin_statuses.sort_by(&:name).each do |status|
-          ui.plain(format(" %-30s%-10s%-8s%-6s", status.name,
-                          make_pretty_version(status),
-                          status.installation_type,
-                          status.api_generation.to_s))
+        unless plugin_statuses.empty?
+          ui.table do |t|
+            t.header = ["Plugin Name", "Version", "Via", "ApiVer"]
+            plugin_statuses.sort_by { |s| s.name.to_s }.each do |status|
+              t << [
+                status.name,
+                make_pretty_version(status),
+                make_pretty_install_type(status),
+                status.api_generation,
+              ]
+            end
+          end
         end
-        ui.line
-        ui.plain(" #{plugin_statuses.count} plugin(s) total")
+        ui.plain_line(" #{plugin_statuses.count} plugin(s) total")
         puts
       end
 
@@ -60,15 +82,15 @@ module InspecPlugins
         end
 
         puts
-        ui.bold(format(" %-30s%-50s", "Plugin Name", "Versions Available"))
+        ui.bold(format(" %-30s%-50s\n", "Plugin Name", "Versions Available"))
         ui.line
         search_results.keys.sort.each do |plugin_name|
           versions = options[:all] ? search_results[plugin_name] : [search_results[plugin_name].first]
           versions = "(" + versions.join(", ") + ")"
-          ui.plain(format(" %-30s%-50s", plugin_name, versions))
+          ui.plain_line(format(" %-30s%-50s", plugin_name, versions))
         end
         ui.line
-        ui.plain(" #{search_results.count} plugin(s) found")
+        ui.plain_line(" #{search_results.count} plugin(s) found")
         puts
 
         ui.exit Inspec::UI::EXIT_PLUGIN_ERROR if search_results.empty?
@@ -118,14 +140,14 @@ module InspecPlugins
         begin
           installer.update(plugin_name)
         rescue Inspec::Plugin::V2::UpdateError => ex
-          ui.plain("#{ui.red('Update error:')} #{ex.message} - update failed")
+          ui.plain_line("#{ui.red("Update error:", print: false)} #{ex.message} - update failed")
           ui.exit Inspec::UI::EXIT_USAGE_ERROR
         end
         post_update_versions = installer.list_installed_plugin_gems.select { |spec| spec.name == plugin_name }.map { |spec| spec.version.to_s }
         new_version = (post_update_versions - pre_update_versions).first
 
         ui.bold(plugin_name + " plugin, version #{old_version} -> " \
-                "#{new_version}, updated from rubygems.org")
+                "#{new_version}, updated from rubygems.org\n")
       end
 
       #--------------------------
@@ -144,7 +166,7 @@ module InspecPlugins
       def uninstall(plugin_name)
         status = Inspec::Plugin::V2::Registry.instance[plugin_name.to_sym]
         unless status
-          ui.plain("#{ui.red('No such plugin installed:')} #{plugin_name} is not " \
+          ui.plain_line("#{ui.red("No such plugin installed:", print: false)} #{plugin_name} is not " \
                  "installed - uninstall failed")
           ui.exit Inspec::UI::EXIT_USAGE_ERROR
         end
@@ -157,11 +179,12 @@ module InspecPlugins
 
         if status.installation_type == :path
           ui.bold(plugin_name + " path-based plugin install has been " \
-                  "uninstalled")
+                  "uninstalled\n")
         else
           ui.bold(plugin_name + " plugin, version #{old_version}, has " \
-                  "been uninstalled")
+                  "been uninstalled\n")
         end
+
         ui.exit Inspec::UI::EXIT_NORMAL
       end
 
@@ -174,7 +197,7 @@ module InspecPlugins
 
       def install_from_gemfile(gem_file)
         unless File.exist? gem_file
-          ui.red("No such plugin gem file #{gem_file} - installation failed.")
+          ui.red("No such plugin gem file #{gem_file} - installation failed.\n")
           ui.exit Inspec::UI::EXIT_USAGE_ERROR
         end
 
@@ -186,13 +209,13 @@ module InspecPlugins
         installer.install(plugin_name, gem_file: gem_file)
 
         ui.bold("#{plugin_name} plugin, version #{version}, installed from " \
-                "local .gem file")
+                "local .gem file\n")
         ui.exit Inspec::UI::EXIT_NORMAL
       end
 
       def install_from_path(path)
         unless File.exist? path
-          ui.red("No such source code path #{path} - installation failed.")
+          ui.red("No such source code path #{path} - installation failed.\n")
           ui.exit Inspec::UI::EXIT_USAGE_ERROR
         end
 
@@ -209,7 +232,7 @@ module InspecPlugins
         if registry.known_plugin?(plugin_name.to_sym)
           ui.red("Plugin already installed - #{plugin_name} - Use '#{EXEC_NAME} " \
                  "plugin list' to see previously installed plugin - " \
-                 "installation failed.")
+                 "installation failed.\n")
           ui.exit Inspec::UI::EXIT_PLUGIN_ERROR
         end
 
@@ -223,7 +246,7 @@ module InspecPlugins
         installer.install(plugin_name, path: entry_point)
 
         ui.bold("#{plugin_name} plugin installed via source path reference, " \
-                "resolved to entry point #{entry_point}")
+                "resolved to entry point #{entry_point}\n")
         ui.exit Inspec::UI::EXIT_NORMAL
       end
 
@@ -288,7 +311,7 @@ module InspecPlugins
         # Give up.
         ui.red("Unrecognizable plugin structure - #{parts[2]} - When " \
                "installing from a path, please provide the path of the " \
-               "entry point file - installation failed.")
+               "entry point file - installation failed.\n")
         ui.exit Inspec::UI::EXIT_USAGE_ERROR
       end
 
@@ -299,8 +322,8 @@ module InspecPlugins
         rescue LoadError => ex
           ui.red("Plugin contains errors - #{plugin_name} - Encountered " \
                  "errors while trying to test load the plugin entry point, " \
-                 "resolved to #{entry_point} - installation failed")
-          ui.plain ex.message
+                 "resolved to #{entry_point} - installation failed\n")
+          ui.plain_line ex.message
           ui.exit Inspec::UI::EXIT_USAGE_ERROR
         end
 
@@ -313,7 +336,7 @@ module InspecPlugins
             ui.red("Does not appear to be a plugin - #{plugin_name} - After " \
                    "probe-loading the supposed plugin, it did not register " \
                    "itself to Train. Ensure something inherits from " \
-                   "'Train.plugin(1)' - installation failed.")
+                   "'Train.plugin(1)' - installation failed.\n")
             ui.exit Inspec::UI::EXIT_USAGE_ERROR
           end
         else
@@ -321,7 +344,7 @@ module InspecPlugins
             ui.red("Does not appear to be a plugin - #{plugin_name} - After " \
                    "probe-loading the supposed plugin, it did not register " \
                    "itself to InSpec. Ensure something inherits from " \
-                   "'Inspec.plugin(2)' - installation failed.")
+                   "'Inspec.plugin(2)' - installation failed.\n")
             ui.exit Inspec::UI::EXIT_USAGE_ERROR
           end
         end
@@ -343,7 +366,7 @@ module InspecPlugins
         new_version = (post_installed_versions - pre_installed_versions).first
 
         ui.bold("#{plugin_name} plugin, version #{new_version}, installed " \
-                "from rubygems.org")
+                "from rubygems.org\n")
         ui.exit Inspec::UI::EXIT_NORMAL
       end
 
@@ -367,16 +390,16 @@ module InspecPlugins
         what_we_would_install_is_already_installed = pre_installed_versions.include?(requested_version)
         if what_we_would_install_is_already_installed && they_explicitly_asked_for_a_version
           ui.red("Plugin already installed at requested version - plugin " \
-                 "#{plugin_name} #{requested_version} - refusing to install.")
+                 "#{plugin_name} #{requested_version} - refusing to install.\n")
         elsif what_we_would_install_is_already_installed && !they_explicitly_asked_for_a_version
           ui.red("Plugin already installed at latest version - plugin " \
-                 "#{plugin_name} #{requested_version} - refusing to install.")
+                 "#{plugin_name} #{requested_version} - refusing to install.\n")
         else
           # There are existing versions installed, but none of them are what was requested
           ui.red("Update required - plugin #{plugin_name}, requested " \
                  "#{requested_version}, have " \
-                 "#{pre_installed_versions.join(', ')}; use `inspec " \
-                 "plugin update` - refusing to install.")
+                 "#{pre_installed_versions.join(", ")}; use `inspec " \
+                 "plugin update` - refusing to install.\n")
         end
 
         ui.exit Inspec::UI::EXIT_PLUGIN_ERROR
@@ -387,11 +410,11 @@ module InspecPlugins
         installer.install(plugin_name, version: options[:version])
       rescue Inspec::Plugin::V2::PluginExcludedError => ex
         ui.red("Plugin on Exclusion List - #{plugin_name} is listed as an " \
-               "incompatible gem - refusing to install.")
-        ui.plain("Rationale: #{ex.details.rationale}")
-        ui.plain("Exclusion list location: " +
+               "incompatible gem - refusing to install.\n")
+        ui.plain_line("Rationale: #{ex.details.rationale}")
+        ui.plain_line("Exclusion list location: " +
                  File.join(Inspec.src_root, "etc", "plugin_filters.json"))
-        ui.plain("If you disagree with this determination, please accept " \
+        ui.plain_line("If you disagree with this determination, please accept " \
                  "our apologies for the misunderstanding, and open an issue " \
                  "at https://github.com/inspec/inspec/issues/new")
         ui.exit Inspec::UI::EXIT_PLUGIN_ERROR
@@ -401,13 +424,13 @@ module InspecPlugins
         results = installer.search(plugin_name, exact: true)
         if results.empty?
           ui.red("No such plugin gem #{plugin_name} could be found on " \
-                 "rubygems.org - installation failed.")
+                 "rubygems.org - installation failed.\n")
         elsif options[:version] && !results[plugin_name].include?(options[:version])
           ui.red("No such version - #{plugin_name} exists, but no such " \
                  "version #{options[:version]} found on rubygems.org - " \
-                 "installation failed.")
+                 "installation failed.\n")
         else
-          ui.red("Unknown error occured - installation failed.")
+          ui.red("Unknown error occured - installation failed.\n")
         end
         ui.exit Inspec::UI::EXIT_USAGE_ERROR
       end
@@ -420,10 +443,10 @@ module InspecPlugins
           # Check for path install
           status = Inspec::Plugin::V2::Registry.instance[plugin_name.to_sym]
           if !status
-            ui.plain("#{ui.red('No such plugin installed:')} #{plugin_name} - update failed")
+            ui.plain_line("#{ui.red("No such plugin installed:", print: false)} #{plugin_name} - update failed")
             ui.exit Inspec::UI::EXIT_USAGE_ERROR
           elsif status.installation_type == :path
-            ui.plain("#{ui.red('Cannot update path-based install:')} " \
+            ui.plain_line("#{ui.red("Cannot update path-based install:", print: false)} " \
                    "#{plugin_name} is installed via path reference; " \
                    "use `inspec plugin uninstall` to remove - refusing to" \
                    "update")
@@ -436,7 +459,7 @@ module InspecPlugins
         latest_version = latest_version[plugin_name]&.last
 
         if pre_update_versions.include?(latest_version)
-          ui.plain("#{ui.red('Already installed at latest version:')} " \
+          ui.plain_line("#{ui.red("Already installed at latest version:", print: false)} " \
                    "#{plugin_name} is at #{latest_version}, which the " \
                    "latest - refusing to update")
           ui.exit Inspec::UI::EXIT_PLUGIN_ERROR
@@ -458,7 +481,7 @@ module InspecPlugins
         unless plugin_name =~ /^(inspec|train)-/
           ui.red("Invalid plugin name - #{plugin_name} - All inspec " \
                  "plugins must begin with either 'inspec-' or 'train-' " \
-                 "- #{action} failed.")
+                 "- #{action} failed.\n")
           ui.exit Inspec::UI::EXIT_USAGE_ERROR
         end
       end
@@ -467,17 +490,29 @@ module InspecPlugins
         case status.installation_type
         when :core, :bundle
           Inspec::VERSION
-        when :gem
-          # TODO: this is naive, and assumes the latest version is the one that will be used. Logged on #3317
-          # In fact, the logic to determine "what version would be used" belongs in the Loader.
-          Inspec::Plugin::V2::Loader.list_installed_plugin_gems
-            .select { |spec| spec.name == status.name.to_s }
-            .sort_by(&:version)
-            .last.version
+        when :user_gem, :system_gem
+          if status.version.nil?
+            "(unknown)"
+          elsif status.version =~ /^\d+\.\d+\.\d+$/
+            status.version
+          else
+            # Assume it is a version constraint string and try to resolve
+            # TODO: this is naive, and assumes the latest version is the one that will be used. Logged on #3317
+            # In fact, the logic to determine "what version would be used" belongs in the Loader.
+            plugin_name = status.name.to_s
+            Inspec::Plugin::V2::Loader.list_installed_plugin_gems
+              .select { |spec| spec.name == plugin_name }
+              .sort_by(&:version)
+              .last.version
+          end
         when :path
           "src"
         end
       end
+
+      def make_pretty_install_type(status)
+        INSTALL_TYPE_LABELS[status.installation_type]
+      end
     end
   end
 end

data/lib/plugins/inspec-plugin-manager-cli/test/functional/inspec-plugin_test.rb

@@ -15,7 +15,9 @@ module PluginManagerHelpers
   let(:list_after_run) do
     Proc.new do |run_result, tmp_dir|
       # After installing/uninstalling/whatevering, run list with config in the same dir, and capture it.
-      run_result.payload.list_result = run_inspec_process("plugin list", env: { INSPEC_CONFIG_DIR: tmp_dir })
+      run_result.payload.list_result = parse_plugin_list_lines(
+        run_inspec_process("plugin list", env: { INSPEC_CONFIG_DIR: tmp_dir }).stdout
+      )
     end
   end
 
@@ -39,6 +41,27 @@ module PluginManagerHelpers
     end
   end
 
+  def parse_plugin_list_lines(stdout)
+    plugins = []
+
+    stdout.force_encoding("UTF-8").lines.each do |line|
+      next if line.strip.empty?
+      next if line.include? "─────" # This is some unicode glyphiness
+      next if line.include? "Plugin Name"
+      next if line.include? "plugin(s) total"
+
+      parts = line.split(/│/u).map(&:strip!).compact
+      plugins << {
+        name: parts[0],
+        version: parts[1],
+        type: parts[2],
+        generation: parts[3],
+        raw: line,
+      }
+    end
+    plugins
+  end
+
   def teardown
     clear_empty_config_dir
   end
@@ -76,31 +99,41 @@ class PluginManagerCliList < Minitest::Test
   include CorePluginFunctionalHelper
   include PluginManagerHelpers
 
-  def test_list_when_no_user_plugins_installed
-    result = run_inspec_process_with_this_plugin("plugin list")
-
-    skip_windows!
-    assert_includes result.stdout, "0 plugin(s) total", "Empty list should include zero count"
-
-    assert_exit_code 0, result
-  end
+  # Listing all plugins is now default behavior
+  LIST_CASES = [
+    { arg: "-c", name: "inspec-plugin-manager-cli", type: "core" },
+    { arg: "-c", name: "inspec-supermarket", type: "core" },
+    { arg: "-s", name: "train-aws", type: "gem (system)" },
+  ].freeze
 
   def test_list_all_when_no_user_plugins_installed
     result = run_inspec_process_with_this_plugin("plugin list --all")
-
     skip_windows!
-    assert_includes result.stdout, "6 plugin(s) total", "--all list should find six"
-    assert_includes result.stdout, "inspec-plugin-manager-cli", "--all list should find inspec-plugin-manager-cli"
-    assert_includes result.stdout, "habitat", "--all list should find habitat"
+    assert_empty result.stderr
 
-    assert_exit_code 0, result
+    plugins_seen = parse_plugin_list_lines(result.stdout)
 
-    # TODO: split
-    result = run_inspec_process_with_this_plugin("plugin list -a")
+    # Look for a specific plugin of each type - core, bundle, and system
+    LIST_CASES.each do |test_case|
+      plugin_line = plugins_seen.detect { |plugin| plugin[:name] == test_case[:name] }
+      refute_nil plugin_line, "#{test_case[:name]} should be detected in plugin list --all output"
+      assert_equal test_case[:type], plugin_line[:type], "#{test_case[:name]} should be detected as a '#{test_case[:type]}' type in list --all "
+    end
+    assert_exit_code 0, result
+  end
 
-    assert_includes result.stdout, "6 plugin(s) total", "-a list should find six"
+  def test_list_selective_when_no_user_plugins_installed
+    LIST_CASES.each do |test_case|
+      result = run_inspec_process_with_this_plugin("plugin list #{test_case[:arg]}")
+      skip_windows!
 
-    assert_exit_code 0, result
+      assert_empty result.stderr
+      plugins_seen = parse_plugin_list_lines(result.stdout)
+      plugin_line = plugins_seen.detect { |plugin| plugin[:name] == test_case[:name] }
+      refute_nil plugin_line, "#{test_case[:name]} should be detected in plugin list #{test_case[:arg]} output"
+      assert_equal plugin_line[:type], test_case[:type], "#{test_case[:name]} should be detected as a '#{test_case[:type]}' type in list #{test_case[:arg]} "
+      assert_exit_code 0, result
+    end
   end
 
   def test_list_when_gem_and_path_plugins_installed
@@ -109,21 +142,26 @@ class PluginManagerCliList < Minitest::Test
       copy_in_core_config_dir("test-fixture-1-float", tmp_dir)
     end
 
-    result = run_inspec_process_with_this_plugin("plugin list", pre_run: pre_block)
-
+    result = run_inspec_process_with_this_plugin("plugin list --user ", pre_run: pre_block)
     skip_windows!
-    assert_includes result.stdout, "2 plugin(s) total", "gem+path should show two plugins"
 
-    # Plugin Name                   Version   Via     ApiVer
-    # -------------------------------------------------------
-    #  inspec-meaning-of-life        src       path    2
-    #  inspec-test-fixture           0.1.0     gem     2
-    # -------------------------------------------------------
+    assert_empty result.stderr
+    plugins_seen = parse_plugin_list_lines(result.stdout)
+    assert_equal 2, plugins_seen.count
+    # Plugin Name                   Version   Via         ApiVer
+    # ---------------------------------------------------------
+    #  inspec-meaning-of-life        src       path         2
+    #  inspec-test-fixture           0.1.0     gem (user)   2
+    # ---------------------------------------------------------
     #  2 plugin(s) total
-    gem_line = result.stdout.split("\n").grep(/gem/).first
-    assert_match(/\s*inspec-\S+\s+\d+\.\d+\.\d+\s+gem\s+2/, gem_line)
-    path_line = result.stdout.split("\n").grep(/path/).first
-    assert_match(/\s*inspec-\S+\s+src\s+path\s+2/, path_line)
+    meaning = plugins_seen.detect { |p| p[:name] == "inspec-meaning-of-life" }
+    refute_nil meaning
+    assert_equal "path", meaning[:type]
+
+    fixture = plugins_seen.detect { |p| p[:name] == "inspec-test-fixture" }
+    refute_nil fixture
+    assert_equal "gem (user)", fixture[:type]
+    assert_equal "0.1.0", fixture[:version]
 
     assert_exit_code 0, result
   end
@@ -134,21 +172,24 @@ class PluginManagerCliList < Minitest::Test
       copy_in_core_config_dir("train-test-fixture", tmp_dir)
     end
 
-    result = run_inspec_process_with_this_plugin("plugin list", pre_run: pre_block)
-
+    result = run_inspec_process_with_this_plugin("plugin list --user ", pre_run: pre_block)
     skip_windows!
+
+    assert_empty result.stderr
+    plugins_seen = parse_plugin_list_lines(result.stdout)
+    assert_equal 1, plugins_seen.count
     assert_includes result.stdout, "1 plugin(s) total", "list train should show one plugins"
 
-    # Plugin Name                   Version   Via     ApiVer
-    # -------------------------------------------------------
-    #  train-test-fixture            0.1.0    gem     train-1
-    # -------------------------------------------------------
+    # Plugin Name                   Version   Via        ApiVer
+    # -------------------------------------------------------------
+    #  train-test-fixture            0.1.0    gem (user)  train-1
+    # -------------------------------------------------------------
     #  1 plugin(s) total
-    train_line = result.stdout.split("\n").grep(/train/).first
-    assert_includes(train_line, "train-test-fixture")
-    assert_includes(train_line, "0.1.0")
-    assert_includes(train_line, "gem")
-    assert_includes(train_line, "train-1")
+    train_plugin = plugins_seen.detect { |p| p[:name] == "train-test-fixture" }
+    refute_nil train_plugin
+    assert_equal "gem (user)", train_plugin[:type]
+    assert_equal "train-1", train_plugin[:generation]
+    assert_equal "0.1.0", train_plugin[:version]
 
     assert_exit_code 0, result
   end
@@ -333,23 +374,21 @@ class PluginManagerCliInstall < Minitest::Test
       # Check UX messaging
       success_message = install_result.stdout.split("\n").grep(/installed/).last
       skip_windows!
+      assert_empty install_result.stderr
       refute_nil success_message, "Should find a success message at the end"
       assert_includes success_message, fixture_info[:plugin_name]
       assert_includes success_message, "plugin installed via source path reference"
 
       # Check round-trip UX via list
-      list_result = install_result.payload.list_result
-      itf_line = list_result.stdout.split("\n").grep(Regexp.new(fixture_info[:plugin_name])).first
-      refute_nil itf_line, "plugin name should now appear in the output of inspec list"
-      assert_match(/\s*(inspec|train)-test-fixture\s+src\s+path\s+/, itf_line, "list output should show that it is a path installation")
+      itf_plugin = install_result.payload.list_result.detect { |p| p[:name] == fixture_info[:plugin_name] }
+      refute_nil itf_plugin, "plugin name should now appear in the output of inspec list"
+      assert_equal "path", itf_plugin[:type], "list output should show that it is a path installation"
 
       # Check plugin statefile. Extra important in this case, since all should resolve to the same entry point.
       plugin_data = install_result.payload.plugin_data
       entry = plugin_data["plugins"].detect { |e| e["name"] == fixture_info[:plugin_name] }
       assert_equal fixture_info[:resolved_path], entry["installation_path"], "Regardless of input, the entry point should be correct."
 
-      assert_empty install_result.stderr
-
       assert_exit_code 0, install_result
     end
   end
@@ -357,9 +396,9 @@ class PluginManagerCliInstall < Minitest::Test
   def test_fail_install_from_nonexistant_path
     bad_path = File.join(project_fixtures_path, "none", "such", "inspec-test-fixture-nonesuch.rb")
     install_result = run_inspec_process_with_this_plugin("plugin install #{bad_path}")
-
-    error_message = install_result.stdout.split("\n").last
     skip_windows!
+
+    error_message = install_result.stdout
     assert_includes error_message, "No such source code path"
     assert_includes error_message, "inspec-test-fixture-nonesuch.rb"
     assert_includes error_message, "installation failed"
@@ -372,9 +411,9 @@ class PluginManagerCliInstall < Minitest::Test
   def test_fail_install_from_path_with_wrong_name
     bad_path = File.join(project_fixtures_path, "plugins", "wrong-name", "lib", "wrong-name.rb")
     install_result = run_inspec_process_with_this_plugin("plugin install #{bad_path}")
-
-    error_message = install_result.stdout.split("\n").last
     skip_windows!
+
+    error_message = install_result.stdout
     assert_includes error_message, "Invalid plugin name"
     assert_includes error_message, "wrong-name"
     assert_includes error_message, "All inspec plugins must begin with either 'inspec-' or 'train-'"
@@ -388,9 +427,9 @@ class PluginManagerCliInstall < Minitest::Test
   def test_fail_install_from_path_when_it_is_not_a_plugin
     bad_path = File.join(project_fixtures_path, "plugins", "inspec-egg-white-omelette", "lib", "inspec-egg-white-omelette.rb")
     install_result = run_inspec_process_with_this_plugin("plugin install #{bad_path}")
-
-    error_message = install_result.stdout.split("\n").last
     skip_windows!
+
+    error_message = install_result.stdout
     assert_includes error_message, "Does not appear to be a plugin"
     assert_includes error_message, "inspec-egg-white-omelette"
     assert_includes error_message, "After probe-loading the supposed plugin, it did not register"
@@ -413,9 +452,9 @@ class PluginManagerCliInstall < Minitest::Test
     end
 
     install_result = run_inspec_process_with_this_plugin("plugin install #{plugin_path}", pre_run: pre_block)
-
-    error_message = install_result.stdout.split("\n").last
     skip_windows!
+
+    error_message = install_result.stdout
     assert_includes error_message, "Plugin already installed"
     assert_includes error_message, "inspec-test-fixture"
     assert_includes error_message, "Use 'inspec plugin list' to see previously installed plugin"
@@ -429,9 +468,9 @@ class PluginManagerCliInstall < Minitest::Test
   def test_fail_install_from_path_when_the_dir_structure_is_wrong
     bad_path = File.join(project_fixtures_path, "plugins", "inspec-wrong-structure")
     install_result = run_inspec_process_with_this_plugin("plugin install #{bad_path}")
-
-    error_message = install_result.stdout.split("\n").last
     skip_windows!
+
+    error_message = install_result.stdout
     assert_includes error_message, "Unrecognizable plugin structure"
     assert_includes error_message, "inspec-wrong-structure"
     assert_includes error_message, " When installing from a path, please provide the path of the entry point file"
@@ -445,21 +484,18 @@ class PluginManagerCliInstall < Minitest::Test
   def test_install_from_gemfile
     fixture_gemfile_path = File.join(core_fixture_plugins_path, "inspec-test-fixture", "pkg", "inspec-test-fixture-0.1.0.gem")
     install_result = run_inspec_process_with_this_plugin("plugin install #{fixture_gemfile_path}", post_run: list_after_run)
+    skip_windows!
 
     success_message = install_result.stdout.split("\n").grep(/installed/).last
-    skip_windows!
     refute_nil success_message, "Should find a success message at the end"
-    assert_includes success_message, "inspec-test-fixture"
-    assert_includes success_message, "0.1.0"
     assert_includes success_message, "installed from local .gem file"
 
-    list_result = install_result.payload.list_result
-    itf_line = list_result.stdout.split("\n").grep(/inspec-test-fixture/).first
-    refute_nil itf_line, "inspec-test-fixture should now appear in the output of inspec list"
-    assert_match(/\s*inspec-test-fixture\s+0.1.0\s+gem\s+/, itf_line, "list output should show that it is a gem installation with version")
+    itf_plugin = install_result.payload.list_result.detect { |p| p[:name] == "inspec-test-fixture" }
+    refute_nil itf_plugin, "plugin name should now appear in the output of inspec list"
+    assert_equal "gem (user)", itf_plugin[:type]
+    assert_equal "0.1.0", itf_plugin[:version]
 
     assert_empty install_result.stderr
-
     assert_exit_code 0, install_result
   end
 
@@ -477,21 +513,20 @@ class PluginManagerCliInstall < Minitest::Test
 
   def test_install_from_rubygems_latest
     install_result = run_inspec_process_with_this_plugin("plugin install inspec-test-fixture", post_run: list_after_run)
+    skip_windows!
 
     success_message = install_result.stdout.split("\n").grep(/installed/).last
-    skip_windows!
     refute_nil success_message, "Should find a success message at the end"
     assert_includes success_message, "inspec-test-fixture"
     assert_includes success_message, "0.2.0"
     assert_includes success_message, "installed from rubygems.org"
 
-    list_result = install_result.payload.list_result
-    itf_line = list_result.stdout.split("\n").grep(/inspec-test-fixture/).first
-    refute_nil itf_line, "inspec-test-fixture should now appear in the output of inspec list"
-    assert_match(/\s*inspec-test-fixture\s+0.2.0\s+gem\s+/, itf_line, "list output should show that it is a gem installation with version")
+    itf_plugin = install_result.payload.list_result.detect { |p| p[:name] == "inspec-test-fixture" }
+    refute_nil itf_plugin, "plugin name should now appear in the output of inspec list"
+    assert_equal "gem (user)", itf_plugin[:type]
+    assert_equal "0.2.0", itf_plugin[:version]
 
     assert_empty install_result.stderr
-
     assert_exit_code 0, install_result
   end
 
@@ -516,10 +551,10 @@ class PluginManagerCliInstall < Minitest::Test
     assert_includes success_message, "0.1.0"
     assert_includes success_message, "installed from rubygems.org"
 
-    list_result = install_result.payload.list_result
-    itf_line = list_result.stdout.split("\n").grep(/inspec-test-fixture/).first
-    refute_nil itf_line, "inspec-test-fixture should now appear in the output of inspec list"
-    assert_match(/\s*inspec-test-fixture\s+0.1.0\s+gem\s+/, itf_line, "list output should show that it is a gem installation with version")
+    itf_plugin = install_result.payload.list_result.detect { |p| p[:name] == "inspec-test-fixture" }
+    refute_nil itf_plugin, "plugin name should now appear in the output of inspec list"
+    assert_equal "gem (user)", itf_plugin[:type]
+    assert_equal "0.1.0", itf_plugin[:version]
 
     assert_empty install_result.stderr
 
@@ -600,21 +635,20 @@ class PluginManagerCliInstall < Minitest::Test
 
   def test_install_from_rubygems_latest_with_train_plugin
     install_result = run_inspec_process_with_this_plugin("plugin install train-test-fixture", post_run: list_after_run)
+    skip_windows!
 
     success_message = install_result.stdout.split("\n").grep(/installed/).last
-    skip_windows!
     refute_nil success_message, "Should find a success message at the end"
     assert_includes success_message, "train-test-fixture"
     assert_includes success_message, "0.1.0"
     assert_includes success_message, "installed from rubygems.org"
 
-    list_result = install_result.payload.list_result
-    itf_line = list_result.stdout.split("\n").grep(/train-test-fixture/).first
-    refute_nil itf_line, "train-test-fixture should now appear in the output of inspec list"
-    assert_match(/\s*train-test-fixture\s+0.1.0\s+gem\s+/, itf_line, "list output should show that it is a gem installation with version")
+    ttf_plugin = install_result.payload.list_result.detect { |p| p[:name] == "train-test-fixture" }
+    refute_nil ttf_plugin, "plugin name should now appear in the output of inspec list"
+    assert_equal "gem (user)", ttf_plugin[:type]
+    assert_equal "0.1.0", ttf_plugin[:version]
 
     assert_empty install_result.stderr
-
     assert_exit_code 0, install_result
   end
 
@@ -649,8 +683,8 @@ class PluginManagerCliInstall < Minitest::Test
     skip "this test requires bundler to pass" unless defined? ::Bundler
 
     install_result = run_inspec_process_with_this_plugin("plugin install inspec-test-fixture -v 0.1.1 --log-level debug")
-
     skip_windows!
+
     assert_includes install_result.stdout, "DEBUG"
 
     assert_includes install_result.stderr, "can't activate rake"
@@ -684,13 +718,12 @@ class PluginManagerCliUpdate < Minitest::Test
     assert_includes success_message, "0.2.0"
     assert_includes success_message, "updated from rubygems.org"
 
-    list_result = update_result.payload.list_result
-    itf_line = list_result.stdout.split("\n").grep(/inspec-test-fixture/).first
-    refute_nil itf_line, "inspec-test-fixture should appear in the output of inspec list"
-    assert_match(/\s*inspec-test-fixture\s+0.2.0\s+gem\s+/, itf_line, "list output should show that it is a gem installation with version 0.2.0")
+    itf_plugin = update_result.payload.list_result.detect { |p| p[:name] == "inspec-test-fixture" }
+    refute_nil itf_plugin, "plugin name should now appear in the output of inspec list"
+    assert_equal "gem (user)", itf_plugin[:type]
+    assert_equal "0.2.0", itf_plugin[:version]
 
     assert_empty update_result.stderr
-
     assert_exit_code 0, update_result
   end
 
@@ -769,12 +802,10 @@ class PluginManagerCliUninstall < Minitest::Test
     assert_includes success_message, "0.1.0"
     assert_includes success_message, "has been uninstalled"
 
-    list_result = uninstall_result.payload.list_result
-    itf_line = list_result.stdout.split("\n").grep(/inspec-test-fixture/).first
-    assert_nil itf_line, "inspec-test-fixture should not appear in the output of inspec list"
+    itf_plugins = uninstall_result.payload.list_result.select { |p| p[:name] == "inspec-test-fixture" }
+    assert_empty itf_plugins, "inspec-test-fixture should not appear in the output of inspec list"
 
     assert_empty uninstall_result.stderr
-
     assert_exit_code 0, uninstall_result
   end
 
@@ -784,22 +815,19 @@ class PluginManagerCliUninstall < Minitest::Test
       # This fixture includes a path install for inspec-meaning-of-life
       copy_in_core_config_dir("test-fixture-1-float", tmp_dir)
     end
-
     uninstall_result = run_inspec_process_with_this_plugin("plugin uninstall inspec-meaning-of-life", pre_run: pre_block, post_run: list_after_run)
+    skip_windows!
 
     success_message = uninstall_result.stdout.split("\n").grep(/uninstalled/).last
-    skip_windows!
     refute_nil success_message, "Should find a success message at the end"
     assert_includes success_message, "inspec-meaning-of-life"
     assert_includes success_message, "path-based plugin install"
     assert_includes success_message, "has been uninstalled"
 
-    list_result = uninstall_result.payload.list_result
-    itf_line = list_result.stdout.split("\n").grep(/inspec-meaning-of-life/).first
-    assert_nil itf_line, "inspec-meaning-of-life should not appear in the output of inspec list"
+    itf_plugins = uninstall_result.payload.list_result.select { |p| p[:name] == "inspec-meaning-of-life" }
+    assert_empty itf_plugins, "inspec-meaning-of-life should not appear in the output of inspec list"
 
     assert_empty uninstall_result.stderr
-
     assert_exit_code 0, uninstall_result
   end