inspec 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37da5ceb61c6c34673a723fb6b80b19d0147f921c496923f4343ff19fd3def8f
-  data.tar.gz: 89eb7fc258ed7f4bc0bf1c3470fca66e9a43bd8c80539b2f788f61b7dfef3c58
+  metadata.gz: c5793aac36f079d0b7bebd85d779db9373acf3254ca6bd0a3a292dd3cc50f8e9
+  data.tar.gz: c06c31588e65bf81bf3f6deab5468bfc00b12b05bae58e605810252da7868872
 SHA512:
-  metadata.gz: c43503aa37e7e56987ea560f2eb14abc2cf16d4cd27724b7d331a0e8bf0671d982fb495a354afefad727a2047f7219b93052a525a9a36fc031caeaa923df8c66
-  data.tar.gz: 0ab645bc7b3312564d93d470f1e4b965a17aca0000e72580df13acab1a58fb322b2a0fee550e946ce19b6121a9ede659bfad367bc9411dafa8b223df0d62e4ad
+  metadata.gz: b7f4d4e85ab232e31fbc993701ba14e0d3b04ebde60ca128a4819550b95cbfada4af0b4d9ac4dd78bf393dcede4bc1c9b185087c9ddaabd27a02488995dcc75f
+  data.tar.gz: dad455607c78e2245e1dc0e2be47b21050cc479de74a4f826f9e03c375c5eeea456727b1dcb83f3bf10fe17403f28802bda56a694cb8465af72593c14ef62399

data/inspec.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency 'train', '~> 1.5', '>= 1.7.0'
+  spec.add_dependency 'train', '~> 1.5', '= 1.7.1' # 1.7.2 has a regression introduced by train #394
   spec.add_dependency 'thor', '~> 0.20'
   spec.add_dependency 'json', '>= 1.8', '< 3.0'
   spec.add_dependency 'method_source', '~> 0.8'

data/lib/inspec/cli.rb

@@ -32,6 +32,12 @@ class Inspec::InspecCLI < Inspec::BaseCLI
   class_option :interactive, type: :boolean,
     desc: 'Allow or disable user interaction'
 
+  class_option :disable_core_plugins, type: :string, banner: '', # Actually a boolean, but this suppresses the creation of a --no-disable...
+    desc: 'Disable loading all plugins that are shipped in the lib/plugins directory of InSpec. Useful in development.'
+
+  class_option :disable_user_plugins, type: :string, banner: '',
+    desc: 'Disable loading all plugins that the user installed.'
+
   desc 'json PATH', 'read all tests in PATH and generate a JSON summary'
   option :output, aliases: :o, type: :string,
     desc: 'Save the created profile to a path'
@@ -378,8 +384,10 @@ begin
     end
   end
 
-  # Load v2 plugins
-  v2_loader = Inspec::Plugin::V2::Loader.new
+  # Load v2 plugins.  Manually check for plugin disablement.
+  omit_core = ARGV.delete('--disable-core-plugins')
+  omit_user = ARGV.delete('--disable-user-plugins')
+  v2_loader = Inspec::Plugin::V2::Loader.new(omit_core_plugins: omit_core, omit_user_plugins: omit_user)
   v2_loader.load_all
   v2_loader.exit_on_load_error
   v2_loader.activate_mentioned_cli_plugins

data/lib/inspec/dsl.rb

@@ -3,6 +3,7 @@
 # author: Dominik Richter
 # author: Christoph Hartmann
 require 'inspec/log'
+require 'inspec/plugin/v2'
 
 module Inspec::DSL
   def require_controls(id, &block)
@@ -55,18 +56,18 @@ module Inspec::DSL
     profile_id = opts[:profile_id]
     dep_entry = dependencies.list[profile_id]
 
-    # do not load any controls if the profile is not supported
-    return unless dep_entry.profile.supports_platform?
-
     if dep_entry.nil?
       raise <<~EOF
-        Cannot load #{profile_id} since it is not listed as a dependency of #{bind_context.profile_name}.
+        Cannot load '#{profile_id}' since it is not listed as a dependency of #{bind_context.profile_name}.
 
         Dependencies available from this context are:
             #{dependencies.list.keys.join("\n    ")}
       EOF
     end
 
+    # Do not load any controls if the profile is not supported
+    return unless dep_entry.profile.supports_platform?
+
     context = dep_entry.profile.runner_context
     # if we don't want all the rules, then just make 1 pass to get all rule_IDs
     # that we want to keep from the original

data/lib/inspec/objects/attribute.rb

@@ -93,7 +93,11 @@ module Inspec
     def to_ruby
       res = ["#{ruby_var_identifier} = attribute('#{@name}',{"]
       res.push "  title: '#{title}'," unless title.to_s.empty?
-      res.push "  default: #{default.inspect}," unless default.to_s.empty?
+      res.push "  value: #{value.inspect}," unless value.to_s.empty?
+      # to_ruby may generate code that is to be used by older versions of inspec.
+      # Anything older than 3.4 will not recognize the value: option, so
+      # send the default: option as well. See #3759
+      res.push "  default: #{value.inspect}," unless value.to_s.empty?
       res.push "  description: '#{description}'," unless description.to_s.empty?
       res.push '})'
       res.join("\n")

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

@@ -14,8 +14,10 @@ module Inspec::Plugin::V2
     def initialize(options = {})
       @options = options
       @registry = Inspec::Plugin::V2::Registry.instance
-      @conf_file = Inspec::Plugin::V2::ConfigFile.new
-      read_conf_file_into_registry
+      unless options[:omit_user_plugins]
+        @conf_file = Inspec::Plugin::V2::ConfigFile.new
+        read_conf_file_into_registry
+      end
 
       # Old-style (v0, v1) co-distributed plugins were called 'bundles'
       # and were located in lib/bundles
@@ -89,13 +91,9 @@ module Inspec::Plugin::V2
         # all following ||= ops.
         activate_me = false
 
-        # If the user invoked `inspec help`, activate all CLI plugins, so they can
-        # display their usage message.
-        activate_me ||= cli_args.first == 'help'
-
-        # Likewise, if they invoked simply `inspec`, they are confused, and need
-        # usage info.
-        activate_me ||= cli_args.empty?
+        # If the user invoked `inspec help`, `inspec --help`, or only `inspec`
+        # then activate all CLI plugins so they can display their usage message.
+        activate_me ||= ['help', '--help', nil].include?(cli_args.first)
 
         # If there is anything in the CLI args with the same name, activate it.
         # This is the expected usual activation for individual plugins.

data/lib/inspec/plugin/v2/plugin_types/cli.rb

@@ -1,8 +1,13 @@
 require 'inspec/base_cli'
 
+# The InSpec load order has this file being loaded before `inspec/base_cli` can
+# finish being loaded. So, we must define Inspec::BaseCLI here first to avoid
+# a NameError below.
+class Inspec::BaseCLI < Thor; end
+
 module Inspec::Plugin::V2::PluginType
   class CliCommand < Inspec::BaseCLI
-    # initalize log options for plugins
+    # initialize log options for plugins
     def initialize(args, options, config)
       super(args, options, config)
       class_options = config.fetch(:class_options, nil)

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '3.4.1'
+  VERSION = '3.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -17,9 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement