inspec-core 4.3.2 → 4.6.3

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

@@ -4,7 +4,7 @@ module InspecPlugins
       plugin_name :'inspec-plugin-manager-cli'
 
       cli_command :plugin do
-        require_relative 'cli'
+        require_relative "cli"
         InspecPlugins::PluginManager::CliCommand
       end
     end

data/lib/plugins/shared/core_plugin_test_helper.rb

@@ -1,23 +1,22 @@
-
-# Load test harness - MiniTest
-require 'minitest/autorun'
-require 'minitest/unit'
-require 'minitest/pride'
-require 'minitest/spec'
+# Load test harness - Minitest
+require "minitest/autorun"
+require "minitest/pride"
 
 # Data formats commonly used in testing
-require 'json'
-require 'ostruct'
+require "json"
+require "ostruct"
 
 # Utilities often needed
-require 'fileutils'
-require 'tmpdir'
-require 'pathname'
-require 'forwardable'
+require "fileutils"
+require "tmpdir"
+require "pathname"
+require "forwardable"
+
+require "inspec/plugin/v2"
 
-# Configure MiniTest to expose things like `let`
+# Configure Minitest to expose things like `let`
 class Module
-  include Minitest::Spec::DSL
+  include Minitest::Spec::DSL # TODO: NO! remove this!
 end
 
 module Inspec
@@ -38,29 +37,35 @@ module Inspec
 end
 
 module CorePluginBaseHelper
-  let(:repo_path) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..')) }
-  let(:inspec_bin_path) { File.join(repo_path, 'inspec-bin', 'bin', 'inspec') }
-  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') }
+  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(:registry) { Inspec::Plugin::V2::Registry.instance }
 end
 
+require "functional/helper"
+
 module CorePluginFunctionalHelper
   include CorePluginBaseHelper
+  include FunctionalHelper
 
-  require 'train'
-  TRAIN_CONNECTION = Train.create('local', command_runner: :generic).connection
+  require "train"
+  TRAIN_CONNECTION = Train.create("local", command_runner: :generic).connection
 
   def run_inspec_process(command_line, opts = {})
-    prefix = ''
+    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 = opts[:env].to_a.map { |assignment| "#{assignment[0]}=#{assignment[1]}" }.join(" ")
     end
-    Inspec::FuncTestRunResult.new(TRAIN_CONNECTION.run_command("#{prefix} #{inspec_bin_path} #{command_line}"))
+    Inspec::FuncTestRunResult.new(TRAIN_CONNECTION.run_command("#{prefix} #{exec_inspec} #{command_line}"))
   end
 
   # This helper does some fancy footwork to make InSpec think a plugin
@@ -79,7 +84,7 @@ module CorePluginFunctionalHelper
 
     # If it looks like it is a core plugin under test, don't add it to the plugin file
     # since the loader will auto-load it anyway
-    if plugin_path.include?('lib/plugins/inspec-')
+    if plugin_path.include?("lib/plugins/inspec-")
       plugin_file_data = __make_empty_plugin_file_data_structure
     else
       plugin_file_data = __make_plugin_file_data_structure_with_path(plugin_path)
@@ -87,11 +92,11 @@ module CorePluginFunctionalHelper
 
     Dir.mktmpdir do |tmp_dir|
       opts[:pre_run]&.call(plugin_file_data, tmp_dir)
-      plugin_file_path = File.join(tmp_dir, 'plugins.json')
+      plugin_file_path = File.join(tmp_dir, "plugins.json")
       # HACK: If the block cleared the hash, take that to mean it will provide a plugins.json file of its own.
       File.write(plugin_file_path, JSON.generate(plugin_file_data)) unless plugin_file_data.empty?
       opts[:env] ||= {}
-      opts[:env]['INSPEC_CONFIG_DIR'] = tmp_dir
+      opts[:env]["INSPEC_CONFIG_DIR"] = tmp_dir
       run_result = run_inspec_process(command_line, opts)
 
       # Read the resulting plugins.json into memory, if any
@@ -111,27 +116,27 @@ module CorePluginFunctionalHelper
     # We want:
     # /Users/cwolfe/sandbox/inspec-resource-lister/lib/inspec-resource-lister.rb
     cursor = caller_path
-    until cursor.basename.to_s == 'test' && cursor.parent.basename.to_s =~ /^(inspec|train)-/
+    until cursor.basename.to_s == "test" && cursor.parent.basename.to_s =~ /^(inspec|train)-/
       cursor = cursor.parent
       break if cursor.nil?
     end
-    raise 'Could not comprehend plugin project directory structure' if cursor.nil?
+    raise "Could not comprehend plugin project directory structure" if cursor.nil?
 
     project_dir = cursor.parent
     plugin_name = project_dir.basename
-    entry_point = File.join(project_dir.to_s, 'lib', plugin_name.to_s + '.rb')
-    raise 'Could not find plugin entry point' unless File.exist?(entry_point)
+    entry_point = File.join(project_dir.to_s, "lib", plugin_name.to_s + ".rb")
+    raise "Could not find plugin entry point" unless File.exist?(entry_point)
     entry_point
   end
 
   def __make_plugin_file_data_structure_with_path(path)
     # TODO: dry this up, refs #3350
-    plugin_name = File.basename(path, '.rb')
+    plugin_name = File.basename(path, ".rb")
     data = __make_empty_plugin_file_data_structure
-    data['plugins'] << {
-      'name' => plugin_name,
-      'installation_type' => 'path',
-      'installation_path' => path,
+    data["plugins"] << {
+      "name" => plugin_name,
+      "installation_type" => "path",
+      "installation_path" => path,
     }
     data
   end
@@ -139,8 +144,8 @@ module CorePluginFunctionalHelper
   def __make_empty_plugin_file_data_structure
     # TODO: dry this up, refs #3350
     {
-      'plugins_config_version' => '1.0.0',
-      'plugins' => [],
+      "plugins_config_version" => "1.0.0",
+      "plugins" => [],
     }
   end
 end

data/lib/source_readers/flat.rb

@@ -1,21 +1,17 @@
-# encoding: utf-8
-# author: Dominik Richter
-# author: Christoph Hartmann
-
-require 'inspec/fetcher'
-require 'inspec/metadata'
+require "inspec/fetcher"
+require "inspec/metadata"
 
 module SourceReaders
   class Flat < Inspec.source_reader(1)
-    name 'flat'
+    name "flat"
     priority 5
 
     def self.resolve(target)
       # TODO: eventually remove the metadata.rb exception here
       # when we have fully phased out metadata.rb in 1.0
-      files = target.files.find_all { |x|
-        x.end_with?('.rb') && !x.include?('/') && x != 'metadata.rb'
-      }
+      files = target.files.find_all do |x|
+        x.end_with?(".rb") && !x.include?("/") && x != "metadata.rb"
+      end
       return nil if files.empty?
       new(target, files)
     end

data/lib/source_readers/inspec.rb

@@ -1,17 +1,13 @@
-# encoding: utf-8
-# author: Dominik Richter
-# author: Christoph Hartmann
-
-require 'inspec/fetcher'
-require 'inspec/metadata'
+require "inspec/fetcher"
+require "inspec/metadata"
 
 module SourceReaders
   class InspecReader < Inspec.source_reader(1)
-    name 'inspec'
+    name "inspec"
     priority 10
 
     def self.resolve(target)
-      return new(target, 'inspec.yml') if target.files.include?('inspec.yml')
+      return new(target, "inspec.yml") if target.files.include?("inspec.yml")
       nil
     end
 
@@ -35,7 +31,7 @@ module SourceReaders
       Inspec::Metadata.from_ref(
         metadata_source,
         @target.read(metadata_source),
-        nil,
+        nil
       )
     rescue Psych::SyntaxError => e
       raise "Unable to parse inspec.yml: line #{e.line}, #{e.problem} #{e.context}"
@@ -45,21 +41,21 @@ module SourceReaders
 
     def load_tests
       tests = @target.files.find_all do |path|
-        path.start_with?('controls') && path.end_with?('.rb')
+        path.start_with?("controls") && path.end_with?(".rb")
       end
       Hash[tests.map { |x| [x, @target.read(x)] }.delete_if { |_file, contents| contents.nil? }]
     end
 
     def load_libs
       tests = @target.files.find_all do |path|
-        path.start_with?('libraries') && path.end_with?('.rb')
+        path.start_with?("libraries") && path.end_with?(".rb")
       end
       Hash[tests.map { |x| [x, @target.read(x)] }.delete_if { |_file, contents| contents.nil? }]
     end
 
     def load_data_files
       files = @target.files.find_all do |path|
-        path.start_with?('files' + File::SEPARATOR)
+        path.start_with?("files" + File::SEPARATOR)
       end
       Hash[files.map { |x| [x, @target.read(x)] }.delete_if { |_file, contents| contents.nil? }]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-core
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.6.3
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train-core
@@ -59,25 +59,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.20'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +396,7 @@ files:
 - lib/inspec/dependencies/requirement.rb
 - lib/inspec/dependencies/resolver.rb
 - lib/inspec/describe.rb
+- lib/inspec/dist.rb
 - lib/inspec/dsl.rb
 - lib/inspec/dsl_shared.rb
 - lib/inspec/env_printer.rb
@@ -449,6 +444,7 @@ files:
 - lib/inspec/plugin/v2/plugin_base.rb
 - lib/inspec/plugin/v2/plugin_types/cli.rb
 - lib/inspec/plugin/v2/plugin_types/dsl.rb
+- lib/inspec/plugin/v2/plugin_types/input.rb
 - lib/inspec/plugin/v2/plugin_types/mock.rb
 - lib/inspec/plugin/v2/registry.rb
 - lib/inspec/plugin/v2/status.rb
@@ -467,6 +463,110 @@ files:
 - lib/inspec/reporters/yaml.rb
 - lib/inspec/require_loader.rb
 - lib/inspec/resource.rb
+- lib/inspec/resources.rb
+- lib/inspec/resources/aide_conf.rb
+- lib/inspec/resources/apache.rb
+- lib/inspec/resources/apache_conf.rb
+- lib/inspec/resources/apt.rb
+- lib/inspec/resources/audit_policy.rb
+- lib/inspec/resources/auditd.rb
+- lib/inspec/resources/auditd_conf.rb
+- lib/inspec/resources/bash.rb
+- lib/inspec/resources/bond.rb
+- lib/inspec/resources/bridge.rb
+- lib/inspec/resources/chocolatey_package.rb
+- lib/inspec/resources/command.rb
+- lib/inspec/resources/cpan.rb
+- lib/inspec/resources/cran.rb
+- lib/inspec/resources/crontab.rb
+- lib/inspec/resources/csv.rb
+- lib/inspec/resources/dh_params.rb
+- lib/inspec/resources/directory.rb
+- lib/inspec/resources/docker.rb
+- lib/inspec/resources/docker_container.rb
+- lib/inspec/resources/docker_image.rb
+- lib/inspec/resources/docker_object.rb
+- lib/inspec/resources/docker_plugin.rb
+- lib/inspec/resources/docker_service.rb
+- lib/inspec/resources/elasticsearch.rb
+- lib/inspec/resources/etc_fstab.rb
+- lib/inspec/resources/etc_group.rb
+- lib/inspec/resources/etc_hosts.rb
+- lib/inspec/resources/etc_hosts_allow_deny.rb
+- lib/inspec/resources/file.rb
+- lib/inspec/resources/filesystem.rb
+- lib/inspec/resources/firewalld.rb
+- lib/inspec/resources/gem.rb
+- lib/inspec/resources/groups.rb
+- lib/inspec/resources/grub_conf.rb
+- lib/inspec/resources/host.rb
+- lib/inspec/resources/http.rb
+- lib/inspec/resources/iis_app.rb
+- lib/inspec/resources/iis_app_pool.rb
+- lib/inspec/resources/iis_site.rb
+- lib/inspec/resources/inetd_conf.rb
+- lib/inspec/resources/ini.rb
+- lib/inspec/resources/interface.rb
+- lib/inspec/resources/iptables.rb
+- lib/inspec/resources/json.rb
+- lib/inspec/resources/kernel_module.rb
+- lib/inspec/resources/kernel_parameter.rb
+- lib/inspec/resources/key_rsa.rb
+- lib/inspec/resources/ksh.rb
+- lib/inspec/resources/limits_conf.rb
+- lib/inspec/resources/login_defs.rb
+- lib/inspec/resources/mount.rb
+- lib/inspec/resources/mssql_session.rb
+- lib/inspec/resources/mysql.rb
+- lib/inspec/resources/mysql_conf.rb
+- lib/inspec/resources/mysql_session.rb
+- lib/inspec/resources/nginx.rb
+- lib/inspec/resources/nginx_conf.rb
+- lib/inspec/resources/npm.rb
+- lib/inspec/resources/ntp_conf.rb
+- lib/inspec/resources/oneget.rb
+- lib/inspec/resources/oracledb_session.rb
+- lib/inspec/resources/os.rb
+- lib/inspec/resources/os_env.rb
+- lib/inspec/resources/package.rb
+- lib/inspec/resources/packages.rb
+- lib/inspec/resources/parse_config.rb
+- lib/inspec/resources/passwd.rb
+- lib/inspec/resources/pip.rb
+- lib/inspec/resources/platform.rb
+- lib/inspec/resources/port.rb
+- lib/inspec/resources/postgres.rb
+- lib/inspec/resources/postgres_conf.rb
+- lib/inspec/resources/postgres_hba_conf.rb
+- lib/inspec/resources/postgres_ident_conf.rb
+- lib/inspec/resources/postgres_session.rb
+- lib/inspec/resources/powershell.rb
+- lib/inspec/resources/processes.rb
+- lib/inspec/resources/rabbitmq_config.rb
+- lib/inspec/resources/registry_key.rb
+- lib/inspec/resources/script.rb
+- lib/inspec/resources/security_identifier.rb
+- lib/inspec/resources/security_policy.rb
+- lib/inspec/resources/service.rb
+- lib/inspec/resources/shadow.rb
+- lib/inspec/resources/ssh_config.rb
+- lib/inspec/resources/ssl.rb
+- lib/inspec/resources/sys_info.rb
+- lib/inspec/resources/toml.rb
+- lib/inspec/resources/users.rb
+- lib/inspec/resources/vbscript.rb
+- lib/inspec/resources/virtualization.rb
+- lib/inspec/resources/windows_feature.rb
+- lib/inspec/resources/windows_hotfix.rb
+- lib/inspec/resources/windows_task.rb
+- lib/inspec/resources/wmi.rb
+- lib/inspec/resources/x509_certificate.rb
+- lib/inspec/resources/xinetd_conf.rb
+- lib/inspec/resources/xml.rb
+- lib/inspec/resources/yaml.rb
+- lib/inspec/resources/yum.rb
+- lib/inspec/resources/zfs_dataset.rb
+- lib/inspec/resources/zfs_pool.rb
 - lib/inspec/rspec_extensions.rb
 - lib/inspec/rule.rb
 - lib/inspec/runner.rb
@@ -480,6 +580,32 @@ files:
 - lib/inspec/shell_detector.rb
 - lib/inspec/source_reader.rb
 - lib/inspec/ui.rb
+- lib/inspec/ui_table_helper.rb
+- lib/inspec/utils/command_wrapper.rb
+- lib/inspec/utils/convert.rb
+- lib/inspec/utils/database_helpers.rb
+- lib/inspec/utils/deprecation.rb
+- lib/inspec/utils/deprecation/config_file.rb
+- lib/inspec/utils/deprecation/deprecator.rb
+- lib/inspec/utils/deprecation/errors.rb
+- lib/inspec/utils/deprecation/global_method.rb
+- lib/inspec/utils/enumerable_delegation.rb
+- lib/inspec/utils/erlang_parser.rb
+- lib/inspec/utils/file_reader.rb
+- lib/inspec/utils/filter.rb
+- lib/inspec/utils/filter_array.rb
+- lib/inspec/utils/find_files.rb
+- lib/inspec/utils/hash.rb
+- lib/inspec/utils/json_log.rb
+- lib/inspec/utils/latest_version.rb
+- lib/inspec/utils/modulator.rb
+- lib/inspec/utils/nginx_parser.rb
+- lib/inspec/utils/object_traversal.rb
+- lib/inspec/utils/parser.rb
+- lib/inspec/utils/pkey_reader.rb
+- lib/inspec/utils/simpleconfig.rb
+- lib/inspec/utils/spdx.rb
+- lib/inspec/utils/spdx.txt
 - lib/inspec/utils/telemetry.rb
 - lib/inspec/utils/telemetry/collector.rb
 - lib/inspec/utils/telemetry/data_series.rb
@@ -535,135 +661,8 @@ files:
 - lib/plugins/inspec-plugin-manager-cli/lib/inspec-plugin-manager-cli/plugin.rb
 - lib/plugins/shared/core_plugin_test_helper.rb
 - lib/plugins/things-for-train-integration.rb
-- lib/resources/aide_conf.rb
-- lib/resources/apache.rb
-- lib/resources/apache_conf.rb
-- lib/resources/apt.rb
-- lib/resources/audit_policy.rb
-- lib/resources/auditd.rb
-- lib/resources/auditd_conf.rb
-- lib/resources/bash.rb
-- lib/resources/bond.rb
-- lib/resources/bridge.rb
-- lib/resources/chocolatey_package.rb
-- lib/resources/command.rb
-- lib/resources/cpan.rb
-- lib/resources/cran.rb
-- lib/resources/crontab.rb
-- lib/resources/csv.rb
-- lib/resources/dh_params.rb
-- lib/resources/directory.rb
-- lib/resources/docker.rb
-- lib/resources/docker_container.rb
-- lib/resources/docker_image.rb
-- lib/resources/docker_object.rb
-- lib/resources/docker_plugin.rb
-- lib/resources/docker_service.rb
-- lib/resources/elasticsearch.rb
-- lib/resources/etc_fstab.rb
-- lib/resources/etc_group.rb
-- lib/resources/etc_hosts.rb
-- lib/resources/etc_hosts_allow_deny.rb
-- lib/resources/file.rb
-- lib/resources/filesystem.rb
-- lib/resources/firewalld.rb
-- lib/resources/gem.rb
-- lib/resources/groups.rb
-- lib/resources/grub_conf.rb
-- lib/resources/host.rb
-- lib/resources/http.rb
-- lib/resources/iis_app.rb
-- lib/resources/iis_app_pool.rb
-- lib/resources/iis_site.rb
-- lib/resources/inetd_conf.rb
-- lib/resources/ini.rb
-- lib/resources/interface.rb
-- lib/resources/iptables.rb
-- lib/resources/json.rb
-- lib/resources/kernel_module.rb
-- lib/resources/kernel_parameter.rb
-- lib/resources/key_rsa.rb
-- lib/resources/ksh.rb
-- lib/resources/limits_conf.rb
-- lib/resources/login_def.rb
-- lib/resources/mount.rb
-- lib/resources/mssql_session.rb
-- lib/resources/mysql.rb
-- lib/resources/mysql_conf.rb
-- lib/resources/mysql_session.rb
-- lib/resources/nginx.rb
-- lib/resources/nginx_conf.rb
-- lib/resources/npm.rb
-- lib/resources/ntp_conf.rb
-- lib/resources/oneget.rb
-- lib/resources/oracledb_session.rb
-- lib/resources/os.rb
-- lib/resources/os_env.rb
-- lib/resources/package.rb
-- lib/resources/packages.rb
-- lib/resources/parse_config.rb
-- lib/resources/passwd.rb
-- lib/resources/pip.rb
-- lib/resources/platform.rb
-- lib/resources/port.rb
-- lib/resources/postgres.rb
-- lib/resources/postgres_conf.rb
-- lib/resources/postgres_hba_conf.rb
-- lib/resources/postgres_ident_conf.rb
-- lib/resources/postgres_session.rb
-- lib/resources/powershell.rb
-- lib/resources/processes.rb
-- lib/resources/rabbitmq_conf.rb
-- lib/resources/registry_key.rb
-- lib/resources/security_identifier.rb
-- lib/resources/security_policy.rb
-- lib/resources/service.rb
-- lib/resources/shadow.rb
-- lib/resources/ssh_conf.rb
-- lib/resources/ssl.rb
-- lib/resources/sys_info.rb
-- lib/resources/toml.rb
-- lib/resources/users.rb
-- lib/resources/vbscript.rb
-- lib/resources/virtualization.rb
-- lib/resources/windows_feature.rb
-- lib/resources/windows_hotfix.rb
-- lib/resources/windows_task.rb
-- lib/resources/wmi.rb
-- lib/resources/x509_certificate.rb
-- lib/resources/xinetd.rb
-- lib/resources/xml.rb
-- lib/resources/yaml.rb
-- lib/resources/yum.rb
-- lib/resources/zfs_dataset.rb
-- lib/resources/zfs_pool.rb
 - lib/source_readers/flat.rb
 - lib/source_readers/inspec.rb
-- lib/utils/command_wrapper.rb
-- lib/utils/convert.rb
-- lib/utils/database_helpers.rb
-- lib/utils/deprecation.rb
-- lib/utils/deprecation/config_file.rb
-- lib/utils/deprecation/deprecator.rb
-- lib/utils/deprecation/errors.rb
-- lib/utils/deprecation/global_method.rb
-- lib/utils/enumerable_delegation.rb
-- lib/utils/erlang_parser.rb
-- lib/utils/file_reader.rb
-- lib/utils/filter.rb
-- lib/utils/filter_array.rb
-- lib/utils/find_files.rb
-- lib/utils/hash.rb
-- lib/utils/json_log.rb
-- lib/utils/latest_version.rb
-- lib/utils/modulator.rb
-- lib/utils/nginx_parser.rb
-- lib/utils/object_traversal.rb
-- lib/utils/parser.rb
-- lib/utils/pkey_reader.rb
-- lib/utils/simpleconfig.rb
-- lib/utils/spdx.rb
-- lib/utils/spdx.txt
 homepage: https://github.com/chef/inspec
 licenses:
 - Apache-2.0