kitchen-inspec 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63e838bc0d2ff3a02dc378832b89ca238ef16c75
-  data.tar.gz: 931d2ff55d6d41bb3f0145d2c0d776046005007f
+  metadata.gz: 225b906544c971b3981d028d49e555946aff73b7
+  data.tar.gz: 2fd9bff33af879f659d95c0b35e43628a3537b37
 SHA512:
-  metadata.gz: 60abb7285e5826d23e811dee7997477199ada4ee2a6fc33d6b6701659fc2483887c5f8cb872c75d570479ede90a4c87354fb70e8a50eeda0ba86b3efb9919fea
-  data.tar.gz: 9debf27c7213f623f4a0008c22073442932ed8d21aae7c89c07043ffbc77fbb8ea78c0057a1a29d3d8410c8514b0e0119ba1cc98a6b3f8242a477ea30382ba1c
+  metadata.gz: a42c520d180f2eee16bddf5e7ec7ef21cbd845866dca619cab37aeda0626de30eb220a23ca8d48129e33eda34f93a4d3cd2075f318042bc745bc6ef86670efbc
+  data.tar.gz: fdede7e9a33c9cc8e3ad4f581f2eaf794760cbf53b7e629b630de2645cd57f817182cdb16be194e025650733295a9b363d393750a62470107741829bab2af871

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [0.16.1](https://github.com/chef/kitchen-inspec/tree/0.16.1) (2016-11-11)
-[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.16.0...0.16.1)
+## [0.17.0](https://github.com/chef/kitchen-inspec/tree/0.17.0) (2016-12-08)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.16.1...0.17.0)
+
+**Implemented enhancements:**
+
+- Support multiple outputs based on platform/test suite variables \(issue 121\) [\#122](https://github.com/chef/kitchen-inspec/pull/122) ([jcastillocano](https://github.com/jcastillocano))
+
+**Merged pull requests:**
+
+- Tweak logging for clarity [\#123](https://github.com/chef/kitchen-inspec/pull/123) ([tduffield](https://github.com/tduffield))
+
+## [v0.16.1](https://github.com/chef/kitchen-inspec/tree/v0.16.1) (2016-11-11)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.16.0...v0.16.1)
 
 **Implemented enhancements:**
 

data/README.md

@@ -55,6 +55,19 @@ verifier:
   port: 22
 ```
 
+If you want to customize the output file per platform or test suite
+you can use template format for your output variable. Current flags
+supported:
+ * _%{platform}_
+ * _%{suite}_
+
+```yaml
+verifier:
+  name: inspec
+  format: junit
+  output: path/to/results/%{platform}_%{suite}_inspec.xml
+```
+
 ### Directory Structure
 
 By default `kitchen-inspec` expects test to be in `test/integration/%suite%` directory structure (we use Chef as provisioner here):

data/lib/kitchen/verifier/inspec.rb

@@ -66,20 +66,31 @@ module Kitchen
         logger.debug("Initialize InSpec")
 
         # gather connection options
-        opts = runner_options(instance.transport, state)
+        opts = runner_options(instance.transport, state, instance.platform.name, instance.suite.name)
 
         # add attributes
         opts[:attrs] = config[:attrs]
         opts[:attributes] = Hashie.stringify_keys config[:attributes] unless config[:attributes].nil?
 
+        # setup logger
+        ::Inspec::Log.init(STDERR)
+        ::Inspec::Log.level = Kitchen::Util.from_logger_level(logger.level)
+
         # initialize runner
         runner = ::Inspec::Runner.new(opts)
 
         # add each profile to runner
         tests = collect_tests
-        tests.each { |target| runner.add_target(target, opts) }
+        profile_ctx = nil
+        tests.each do |target|
+          profile_ctx = runner.add_target(target, opts)
+        end
+
+        profile_ctx ||= []
+        profile_ctx.each do |profile|
+          logger.info("Loaded #{profile.name} ")
+        end
 
-        logger.debug("Running tests from: #{tests.inspect}")
         exit_code = runner.run
         return if exit_code == 0
         raise ActionFailed, "Inspec Runner returns #{exit_code}"
@@ -127,7 +138,6 @@ module Kitchen
         end
 
         base = File.join(base, "inspec") if legacy_mode
-        logger.info("Using `#{base}` for testing")
 
         # only return the directory if it exists
         Pathname.new(base).exist? ? [{ :path => base }] : []
@@ -159,7 +169,7 @@ module Kitchen
       #
       # @return [Hash] a configuration hash of string-based keys
       # @api private
-      def runner_options(transport, state = {}) # rubocop:disable Metrics/AbcSize
+      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)
@@ -174,7 +184,7 @@ module Kitchen
           # default color to true to match InSpec behavior
           runner_options["color"] = (config[:color].nil? ? true : config[:color])
           runner_options["format"] = config[:format] unless config[:format].nil?
-          runner_options["output"] = config[:output] unless config[:output].nil?
+          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?
         end
       end

data/lib/kitchen/verifier/inspec_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec