kitchen-inspec 0.20.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0c032ee0d1acb500d020ff5332d26a024bef61
-  data.tar.gz: 9e240db356a6ded9798433b7b6b2cd3342745f22
+  metadata.gz: ad4914a1c6ff1f6606cdfc231cc8bfa58b640359
+  data.tar.gz: c8df553a805f8115da1113b7fe4abd568006d166
 SHA512:
-  metadata.gz: 27c2083f8c25a9843eff37d0ea4f004f891ec627111ff38d3eb035b57198c1bfcb7bfda6dd03d92958d1e50ac32d93915d3897dc595a7dda58144f97d5a22626
-  data.tar.gz: aacb00d20dfdabbf94de7189d1ca4de5f66f80ddabed405f5b821144eddeac8586856aa035886e91d0717d734bd4f81442fcbcc5d37752a5bd7f2cff041dea50
+  metadata.gz: 4585ccf793c05ce905b399641cebace6a53adf1022b87f421a0575dba4094c1f9ec0b51cee7e67d3ab0c7792f132b80c1f2a43d79d216abeddedc9a17635fea4
+  data.tar.gz: 1afccb9494a0faf1c25c76423fd69110d7d21073205f84f77d0d574f2899f6a778460911e27a3d502ecc9711ea148e75ad9fd2b43baa8c4824db0e55e7310255

data/.travis.yml

@@ -9,29 +9,31 @@ services:
   - docker
 bundler_args: "--without integration guard tools"
 before_install:
-  - gem install bundler
+  - gem update --system
   - gem --version
+  - rvm @global do gem uninstall bundler -a -x
+  - rvm @global do gem install bundler
+  - bundle --version
 matrix:
   include:
-  - rvm: 2.1.9
-  - rvm: 2.2.5
-  - rvm: 2.3.1
+  - rvm: 2.3.6
+  - rvm: 2.4.3
     bundler_args: "--without guard tools"
     script: bundle exec rake $SUITE
     env: SUITE="test:integration" OS='default profile contains_inspec'
-  - rvm: 2.3.1
+  - rvm: 2.4.3
     bundler_args: "--without guard tools"
     script: bundle exec rake $SUITE
     env: SUITE="test:integration" OS='backwards'
-  - rvm: 2.3.1
+  - rvm: 2.4.3
     bundler_args: "--without guard tools"
     script: bundle exec rake $SUITE
     env: SUITE="test:integration" OS='duplicates'
-  - rvm: 2.3.1
+  - rvm: 2.4.3
     bundler_args: "--without guard tools"
     script: bundle exec rake $SUITE
     env: SUITE="test:integration" OS='supermarket'
-  - rvm: 2.3.1
+  - rvm: 2.4.3
     bundler_args: "--without guard tools"
     script: bundle exec rake $SUITE
     env: SUITE="test:integration" OS='attributes-inline attributes-file'

data/CHANGELOG.md

@@ -1,7 +1,30 @@
 # Change Log
 
-## [0.20.0](https://github.com/chef/kitchen-inspec/tree/0.20.0) (2017-11-13)
-[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.19.0...0.20.0)
+## [0.22.0](https://github.com/chef/kitchen-inspec/tree/0.22.0) (2018-01-17)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.20.0...0.22.0)
+
+**Implemented enhancements:**
+
+- Support use of SSH agent without requiring a key path to be set [\#142](https://github.com/chef/kitchen-inspec/issues/142)
+
+**Fixed bugs:**
+
+- Can't use Branch for verifier [\#157](https://github.com/chef/kitchen-inspec/issues/157)
+
+**Closed issues:**
+
+- Expose --backend-cache command-line option [\#154](https://github.com/chef/kitchen-inspec/issues/154)
+- kitchen-inspec fails to configure HTTPS winrm for inspec [\#152](https://github.com/chef/kitchen-inspec/issues/152)
+
+**Merged pull requests:**
+
+- git fetcher: support branch/tag/ref [\#158](https://github.com/chef/kitchen-inspec/pull/158) ([adamleff](https://github.com/adamleff))
+- Add the InSpec backend\_cache option [\#155](https://github.com/chef/kitchen-inspec/pull/155) ([jquick](https://github.com/jquick))
+- correctly configure HTTPS WinRM [\#153](https://github.com/chef/kitchen-inspec/pull/153) ([joekhoobyar](https://github.com/joekhoobyar))
+- Allow extending which transports are supported by kitchen-inspec [\#149](https://github.com/chef/kitchen-inspec/pull/149) ([coderanger](https://github.com/coderanger))
+
+## [v0.20.0](https://github.com/chef/kitchen-inspec/tree/v0.20.0) (2017-11-13)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.19.0...v0.20.0)
 
 **Implemented enhancements:**
 
@@ -39,6 +62,7 @@
 
 **Merged pull requests:**
 
+- Release 0.20.0 [\#151](https://github.com/chef/kitchen-inspec/pull/151) ([adamleff](https://github.com/adamleff))
 - Add a CODEOWNERS file [\#144](https://github.com/chef/kitchen-inspec/pull/144) ([adamleff](https://github.com/adamleff))
 - Adding a maintainers file [\#143](https://github.com/chef/kitchen-inspec/pull/143) ([adamleff](https://github.com/adamleff))
 - Eliminate duplicate profiles being added to runner [\#141](https://github.com/chef/kitchen-inspec/pull/141) ([adamleff](https://github.com/adamleff))

data/lib/kitchen/verifier/inspec.rb

@@ -67,6 +67,7 @@ module Kitchen
 
         # gather connection options
         opts = runner_options(instance.transport, state, instance.platform.name, instance.suite.name)
+        logger.debug "Options #{opts.inspect}"
 
         # add attributes
         opts[:attrs] = config[:attrs]
@@ -156,7 +157,9 @@ module Kitchen
             # foiled by extra stuff. However, if the only entry is a "name" key, then
             # leave it alone so it can default to resolving to the Supermarket.
             unless test_item.keys == [:name]
-              test_item.delete_if { |k, v| ![:path, :url, :git, :compliance].include?(k) }
+              type_keys = [:path, :url, :git, :compliance]
+              git_keys = [:branch, :tag, :ref]
+              test_item.delete_if { |k, v| !(type_keys + git_keys).include?(k) }
             end
           elsif File.exist?(test_item)
             # if the entry is a path to something on disk, rewrite as a Hash entry with a path key.
@@ -187,13 +190,8 @@ module Kitchen
       # @api private
       def runner_options(transport, state = {}, platform = nil, suite = nil) # rubocop:disable Metrics/AbcSize
         transport_data = transport.diagnose.merge(state)
-        if transport.is_a?(Kitchen::Transport::Ssh)
-          runner_options_for_ssh(transport_data)
-        elsif transport.is_a?(Kitchen::Transport::Winrm)
-          runner_options_for_winrm(transport_data)
-        # optional transport which is not in core test-kitchen
-        elsif defined?(Kitchen::Transport::Dokken) && transport.is_a?(Kitchen::Transport::Dokken)
-          runner_options_for_docker(transport_data)
+        if respond_to?("runner_options_for_#{transport.name.downcase}", true)
+          send("runner_options_for_#{transport.name.downcase}", transport_data)
         else
           raise Kitchen::UserError, "Verifier #{name} does not support the #{transport.name} Transport"
         end.tap do |runner_options|
@@ -203,6 +201,16 @@ module Kitchen
           runner_options["output"] = config[:output] % { platform: platform, suite: suite } unless config[:output].nil?
           runner_options["profiles_path"] = config[:profiles_path] unless config[:profiles_path].nil?
           runner_options[:controls] = config[:controls]
+
+          # check to make sure we have a valid version for caching
+          if config[:backend_cache]
+            backend_cache_msg = "backend_cache requires InSpec version >= 1.47.0"
+            logger.warn backend_cache_msg if Gem::Version.new(::Inspec::VERSION) < Gem::Version.new("1.47.0")
+            runner_options[:backend_cache] = config[:backend_cache]
+          else
+            # default to false until we default to true in inspec
+            runner_options[:backend_cache] = false
+          end
         end
       end
 
@@ -245,6 +253,8 @@ module Kitchen
         opts = {
           "backend" => "winrm",
           "logger" => logger,
+          "ssl" => URI(kitchen[:endpoint]).scheme == "https",
+          "self_signed" => kitchen[:no_ssl_peer_verification],
           "host" => config[:host] || URI(kitchen[:endpoint]).hostname,
           "port" => config[:port] || URI(kitchen[:endpoint]).port,
           "user" => kitchen[:user],
@@ -260,7 +270,7 @@ module Kitchen
       #
       # @return [Hash] a configuration hash of string-based keys
       # @api private
-      def runner_options_for_docker(config_data)
+      def runner_options_for_dokken(config_data)
         kitchen = instance.transport.send(:connection_options, config_data).dup
         #
         # Note: kitchen-dokken uses two containers the

data/lib/kitchen/verifier/inspec_version.rb

@@ -20,6 +20,6 @@
 module Kitchen
   module Verifier
     # Version string for InSpec Kitchen verifier
-    INSPEC_VERSION = "0.20.0"
+    INSPEC_VERSION = "0.22.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec