kitchen-inspec 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b30d9e5c6b9fd88003e8b4c3e63243f612f15c2f444ff093f78816fd6703e95
-  data.tar.gz: a7742bc13d653d3fc15c471a735c20156677984921a04b63b1548f49ac0e247f
+  metadata.gz: fd8f48692455036fcb4a096239db49ea77cc35a40dde906080951d4df283775d
+  data.tar.gz: 3876f0417b27d9c7a34e44a9127937b404af9249b25b530d0ff94a0abf85ee4e
 SHA512:
-  metadata.gz: a71750f6211666c89734f3068299418a675b37ea16e842b0159ccb61f13a245e5965c32ffda33b86ad7620a4597c400705a19e4c1628774b26bd81fb75db81f0
-  data.tar.gz: 95b8cad3c60739fbe3a8316f1a1cc2979b6be69bc7115d4b8d1ad8d8f9f7313cb1dd2108c3b30e8e7013d619f4a1ae64567466b3dfbdba34d7f792b75b19c7c6
+  metadata.gz: a8d485c2c565ad7c5867e11f8b749cc924d2319d0e9f44e767d8a230805c1b9064fa6ac3a9c245218927f03f5115a361c0bfa70649725374056be33f558befa2
+  data.tar.gz: 1b3c751144281043f25495e2c38d43a31d189eafecfb84a6b0ea1f7ffc9abc3b70c54ca9d90af6cb5d900157daa25ee4e62057340d7960ae21b82f978a921e57

data/lib/kitchen/verifier/inspec.rb

@@ -69,9 +69,8 @@ module Kitchen
         opts = runner_options(instance.transport, state, instance.platform.name, instance.suite.name)
         logger.debug "Options #{opts.inspect}"
 
-        # add attributes
-        opts[:attrs] = config[:attrs]
-        opts[:attributes] = Hashie.stringify_keys config[:attributes] unless config[:attributes].nil?
+        # add inputs
+        setup_inputs(opts, config)
 
         # setup logger
         ::Inspec::Log.init(STDERR)
@@ -100,6 +99,32 @@ module Kitchen
 
       private
 
+      def setup_inputs(opts, config)
+        inspec_version = Gem::Version.new(::Inspec::VERSION)
+
+        # Handle input files
+        if config[:attrs]
+          logger.warn("kitchen-inspec: please use 'input-files' instead of 'attrs'")
+          config[:input_files] = config[:attrs]
+        end
+        if config[:input_files]
+          # Note that inspec expects the singular inflection, input_file
+          files_key = inspec_version >= Gem::Version.new("3.10") ? :input_file : :attrs
+          opts[files_key] = config[:input_files]
+        end
+
+        # Handle YAML => Hash inputs
+        if config[:attributes]
+          logger.warn("kitchen-inspec: please use 'inputs' instead of 'attributes'")
+          config[:inputs] = config[:attributes]
+        end
+        if config[:inputs]
+          # Version here is dependent on https://github.com/inspec/inspec/issues/3856
+          inputs_key = inspec_version >= Gem::Version.new("4.10") ? :inputs : :attributes
+          opts[inputs_key] = Hashie.stringify_keys config[:inputs]
+        end
+      end
+
       # (see Base#load_needed_dependencies!)
       def load_needed_dependencies!
         require "inspec"

data/lib/kitchen/verifier/inspec_version.rb

@@ -20,6 +20,6 @@
 module Kitchen
   module Verifier
     # Version string for InSpec Kitchen verifier
-    INSPEC_VERSION = "1.1.0".freeze
+    INSPEC_VERSION = "1.2.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Verifier for InSpec