inspec 2.3.24 → 2.3.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce8fa792af59dc9067f95e3b4370d1dcf9d0bb35c7a2a907a127402f214abcc
-  data.tar.gz: 0b8057aa2502bb82b4602fb218849c8535405b35ea714efdc161d0429b86f577
+  metadata.gz: 8742ade52e04413d98857dbe243589448629c3db92d285cb943b8af4b70e6e88
+  data.tar.gz: f04e1dac3d71463472bfbf68069838b0bbd02527412f3a184dd9f2b8d52f8975
 SHA512:
-  metadata.gz: 5f9be64fca10e8f52df2ffd20b173d86ce4787259f5d9d9eb3e03f95f73b0421be3430fcbdc22cd8f341cf7f0b276ddf21f62aa28697bbd29b2c9178806f89a2
-  data.tar.gz: 3f97cd48187588aabe5cefb02afe149b3d7bf547c82109ad58d8951224ff9e46473055de3e5e215247997ab6bf671f380fb271e09f8c633fccada5c38d27dbd3
+  metadata.gz: 51d424a89a76c6cef322ff7f58747d1e7e75495bb160510436f0a02baa28f257ece67e844a4129de29cef11a2882b19248475215e9c4ac72974708728115748b
+  data.tar.gz: 891b0c14bfc29becb71add1adc968f0d23c6e397da0cd105ed7fe8550001c10987f3b1962732b61c83b09af006a8519406285371fe207d143142e7c674dd5afa

data/CHANGELOG.md

@@ -1,20 +1,29 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 2.3.24 -->
-## [v2.3.24](https://github.com/inspec/inspec/tree/v2.3.24) (2018-10-12)
+<!-- latest_release 2.3.28 -->
+## [v2.3.28](https://github.com/inspec/inspec/tree/v2.3.28) (2019-02-08)
 
-#### Bug Fixes
-- Fix plugin install issues in different ruby envs [#3505](https://github.com/inspec/inspec/pull/3505) ([jquick](https://github.com/jquick))
+#### Merged Pull Requests
+- Remove bundler pin from 2.x series [#3795](https://github.com/inspec/inspec/pull/3795) ([clintoncwolfe](https://github.com/clintoncwolfe))
 <!-- latest_release -->
 
-<!-- release_rollup since=2.3.23 -->
-### Changes since 2.3.23 release
+<!-- release_rollup since=2.3.24 -->
+### Changes since 2.3.24 release
 
-#### Bug Fixes
-- Fix plugin install issues in different ruby envs [#3505](https://github.com/inspec/inspec/pull/3505) ([jquick](https://github.com/jquick)) <!-- 2.3.24 -->
+#### Merged Pull Requests
+- Remove bundler pin from 2.x series [#3795](https://github.com/inspec/inspec/pull/3795) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 2.3.28 -->
+- Update copyright for 2.x branch [#3794](https://github.com/inspec/inspec/pull/3794) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 2.3.27 -->
+- Update the text on the generic default attribute [#3508](https://github.com/inspec/inspec/pull/3508) ([jquick](https://github.com/jquick)) <!-- 2.3.26 -->
+- Change `Inspec ` to `InSpec ` where appropriate [#3494](https://github.com/inspec/inspec/pull/3494) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.3.25 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v2.3.24](https://github.com/inspec/inspec/tree/v2.3.24) (2018-10-12)
+
+#### Bug Fixes
+- Fix plugin install issues in different ruby envs [#3505](https://github.com/inspec/inspec/pull/3505) ([jquick](https://github.com/jquick))
+<!-- latest_stable_release -->
+
 ## [v2.3.23](https://github.com/inspec/inspec/tree/v2.3.23) (2018-10-12)
 
 #### Enhancements
@@ -35,7 +44,6 @@
 - docs: Add version to multiple descriptions doc [#3477](https://github.com/inspec/inspec/pull/3477) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 - Set a static node GUID for travis runs [#3497](https://github.com/inspec/inspec/pull/3497) ([jquick](https://github.com/jquick))
 - Fix plugin issues on omni builds [#3499](https://github.com/inspec/inspec/pull/3499) ([jquick](https://github.com/jquick))
-<!-- latest_stable_release -->
 
 ## [v2.3.10](https://github.com/inspec/inspec/tree/v2.3.10) (2018-10-04)
 

data/Gemfile

@@ -11,7 +11,6 @@ gem 'ffi', '>= 1.9.14'
 gem 'aws-sdk', '~> 2'
 
 group :test do
-  gem 'bundler', '~> 1.5'
   gem 'minitest', '~> 5.5'
   gem 'rake', '>= 10'
   gem 'rubocop', '= 0.49.1'

data/README.md

@@ -439,7 +439,7 @@ Please see [TESTING_AGAINST_AZURE.md](./test/integration/aws/TESTING_AGAINST_AZU
 | **Author:**    | Dominik Richter (<drichter@chef.io>)      |
 | **Author:**    | Christoph Hartmann (<chartmann@chef.io>)  |
 | **Copyright:** | Copyright (c) 2015 Vulcano Security GmbH. |
-| **Copyright:** | Copyright (c) 2017 Chef Software Inc.     |
+| **Copyright:** | Copyright (c) 2019 Chef Software Inc.     |
 | **License:**   | Apache License, Version 2.0               |
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/inspec.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency 'train', '~> 1.5'
+  spec.add_dependency 'train', '~> 1.5', '= 1.7.1'
   spec.add_dependency 'thor', '~> 0.20'
   spec.add_dependency 'json', '>= 1.8', '< 3.0'
   spec.add_dependency 'method_source', '~> 0.8'

data/lib/bundles/inspec-supermarket/cli.rb

@@ -69,6 +69,6 @@ module Supermarket
     end
   end
 
-  # register the subcommand to Inspec CLI registry
+  # register the subcommand to InSpec CLI registry
   Inspec::Plugins::CLI.add_subcommand(SupermarketCLI, 'supermarket', 'supermarket SUBCOMMAND ...', 'Supermarket commands', {})
 end

data/lib/inspec/cli.rb

@@ -305,7 +305,7 @@ begin
   ctl = Inspec::PluginCtl.new
   ctl.list.each { |x| ctl.load(x) }
 
-  # load v1 CLI plugins before the Inspec CLI has been started
+  # load v1 CLI plugins before the InSpec CLI has been started
   Inspec::Plugins::CLI.subcommands.each { |_subcommand, params|
     Inspec::InspecCLI.register(
       params[:klass],

data/lib/inspec/objects/attribute.rb

@@ -17,20 +17,26 @@ module Inspec
     DEFAULT_ATTRIBUTE = Class.new do
       def initialize(name)
         @name = name
-      end
 
-      def method_missing(*_)
+        # output warn message if we are in a exec call
         Inspec::Log.warn(
-          "Returning DEFAULT_ATTRIBUTE for '#{@name}'. "\
+          "Attribute '#{@name}' does not have a value. "\
           "Use --attrs to provide a value for '#{@name}' or specify a default  "\
           "value with `attribute('#{@name}', default: 'somedefault', ...)`.",
-        )
+        ) if Inspec::BaseCLI.inspec_cli_command == :exec
+      end
+
+      def method_missing(*_)
         self
       end
 
       def respond_to_missing?(_, _)
         true
       end
+
+      def to_s
+        "Attribute '#{@name}' does not have a value. Skipping test."
+      end
     end
 
     def initialize(name, options = {})

data/lib/inspec/secrets/yaml.rb

@@ -24,7 +24,7 @@ module Secrets
         @attributes = nil
       end
     rescue => e
-      raise "Error reading Inspec attributes: #{e}"
+      raise "Error reading InSpec attributes: #{e}"
     end
   end
 end

data/lib/inspec/version.rb

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

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

@@ -87,7 +87,7 @@ module InspecPlugins
           p = Pathname.new(path_to_profile)
           p = p.join('inspec.yml')
           if not p.exist?
-            raise "#{path_to_profile} doesn't appear to be a valid Inspec profile"
+            raise "#{path_to_profile} doesn't appear to be a valid InSpec profile"
           end
           yaml = YAML.load_file(p.to_s)
           yaml = yaml.to_hash
@@ -101,7 +101,7 @@ module InspecPlugins
           end
         rescue => e
           # rewrap it and pass it up to the CLI
-          raise "Error reading Inspec profile metadata: #{e}"
+          raise "Error reading InSpec profile metadata: #{e}"
         end
 
         yaml

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

@@ -12,7 +12,7 @@ require_relative 'base'
 #
 #
 # .IAF file format
-#   .iaf = "Inspec Artifact File", easy to rename if you'd like something more appropriate.
+#   .iaf = "InSpec Artifact File", easy to rename if you'd like something more appropriate.
 #   The iaf file wraps a binary artifact with some metadata. The first implementation
 #   looks like this:
 #
@@ -62,8 +62,8 @@ require_relative 'base'
 #   private keys. We should establish a common key directory (similar to /hab/cache/keys
 #   or ~/.hab/cache/keys in Habitat).
 #
-# Extracting artifacts outside of Inspec
-#   As in Habitat, the artifact format for Inspec allows the use of common
+# Extracting artifacts outside of InSpec
+#   As in Habitat, the artifact format for InSpec allows the use of common
 #   Unix tools to read the header and body of an artifact.
 # To extract the header from a .iaf:
 #        sed '/^$/q' foo.iaf

data/lib/plugins/inspec-compliance/lib/inspec-compliance/cli.rb

@@ -260,7 +260,7 @@ module InspecPlugins
       end
     end
 
-    # register the subcommand to Inspec CLI registry
+    # register the subcommand to InSpec CLI registry
     # Inspec::Plugins::CLI.add_subcommand(InspecPlugins::ComplianceCLI, 'compliance', 'compliance SUBCOMMAND ...', 'Chef InspecPlugins::Compliance commands', {})
   end
 end

data/lib/resources/aws/aws_iam_user.rb

@@ -97,7 +97,7 @@ class AwsIamUser < Inspec.resource(1)
     mfa_info = backend.list_mfa_devices(user_name: username)
     @has_mfa_enabled = !mfa_info.mfa_devices.empty?
 
-    # TODO: consider returning Inspec AwsIamAccessKey objects
+    # TODO: consider returning InSpec AwsIamAccessKey objects
     @access_keys = backend.list_access_keys(user_name: username).access_key_metadata
     # If the above call fails, we get nil here; but we promise access_keys will be an array.
     @access_keys ||= []

data/lib/resources/azure/azure_generic_resource.rb

@@ -8,7 +8,7 @@ module Inspec::Resources
     name 'azure_generic_resource'
 
     desc '
-      Inspec Resource to interrogate any Resource type in Azure
+      InSpec Resource to interrogate any Resource type in Azure
     '
 
     supports platform: 'azure'

data/lib/resources/azure/azure_resource_group.rb

@@ -7,7 +7,7 @@ module Inspec::Resources
     name 'azure_resource_group'
 
     desc '
-      Inspec Resource to get metadata about a specific Resource Group
+      InSpec Resource to get metadata about a specific Resource Group
     '
 
     supports platform: 'azure'

data/lib/resources/azure/azure_virtual_machine.rb

@@ -7,7 +7,7 @@ module Inspec::Resources
     name 'azure_virtual_machine'
 
     desc '
-      Inspec Resource to test Azure Virtual Machines
+      InSpec Resource to test Azure Virtual Machines
     '
 
     supports platform: 'azure'
@@ -122,7 +122,7 @@ module Inspec::Resources
     #
     # This allows the use of
     #   it { should have_password_authentication }
-    # within the Inspec profile
+    # within the InSpec profile
     #
     # @return boolean
     def has_password_authentication?
@@ -146,7 +146,7 @@ module Inspec::Resources
     #
     # This allows the use of
     #    it { should have_custom_data }
-    # within the Inspec Profile
+    # within the InSpec Profile
     #
     # @return boolean
     def has_custom_data?
@@ -168,7 +168,7 @@ module Inspec::Resources
     #
     # This allows the use of
     #    it { should have_ssh_keys }
-    # within the Inspec Profile
+    # within the InSpec Profile
     #
     # @return boolean
     def has_ssh_keys?

data/lib/resources/azure/azure_virtual_machine_data_disk.rb

@@ -8,7 +8,7 @@ module Inspec::Resources
     name 'azure_virtual_machine_data_disk'
 
     desc '
-      Inspec Resource to ensure that the data disks attached to a machine are correct
+      InSpec Resource to ensure that the data disks attached to a machine are correct
     '
 
     supports platform: 'azure'

data/lib/resources/chocolatey_package.rb

@@ -6,7 +6,7 @@ module Inspec::Resources
   class ChocoPkg < Inspec.resource(1)
     name 'chocolatey_package'
     supports platform: 'windows'
-    desc 'Use the chocolatey_package Inspec audit resource to test if the named package and/or package version is installed on the system.'
+    desc 'Use the chocolatey_package InSpec audit resource to test if the named package and/or package version is installed on the system.'
     example <<-EOH
       describe chocolatey_package('git') do
         it { should be_installed }

metadata

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