kitchen-inspec 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4409f93d481870ed56e067dc98fb5ba7fb886995
-  data.tar.gz: f32dbf2432c3c1a35e153c26a63bc181a035cab0
+  metadata.gz: 623f1ada1f944ebc91986e21066ed4b149b2e48f
+  data.tar.gz: d8cd56302ec6f135ef1bbb021485d30c78259a21
 SHA512:
-  metadata.gz: 65fad24222f5078f57f4be256f9d7902dd50c1c05dfc568d1899a28d4428d4cf3f9df28d159836929186c8ff97670c4a220d250a60c295aa069a4cb3fb6d3158
-  data.tar.gz: bcc61a1c6cd3d43537d83317c4940dc8f49fc426255f233bc1465b5ebe4fafb0ccbe476eed2aeeff06cd50f9bab51d4c2dad78747a6026918326f4802c3497b1
+  metadata.gz: 4aabb56344883286595083eca39115912ecbdb71f44f2a35b74258fd8299a1d5dcded95f9e08c98d4234b56aa564a71e7fd8b4904857ad8d9d6dcc7a25bcd6e2
+  data.tar.gz: cc3e9207c51bec6b5fb01ec1bfaa1f7282d3da592017ae4fc7c33d4851654f7216b08ef8a9d3b36d690836ce15fdac0d49179ebb6f7a4a4ad5661b20fb2d7e96

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [0.10.0](https://github.com/chef/kitchen-inspec/tree/0.10.0) (2016-01-07)
-[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.9.6...0.10.0)
+## [0.10.1](https://github.com/chef/kitchen-inspec/tree/0.10.1) (2016-01-15)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.10.0...0.10.1)
+
+**Closed issues:**
+
+- Inspec does not gracefully allow transports other than winrm and ssh. [\#31](https://github.com/chef/kitchen-inspec/issues/31)
+- Specify inspec output formats in .kitchen.yml [\#26](https://github.com/chef/kitchen-inspec/issues/26)
+
+**Merged pull requests:**
+
+- Allow transports which are subclasses of the core ones. [\#32](https://github.com/chef/kitchen-inspec/pull/32) ([coderanger](https://github.com/coderanger))
+
+## [v0.10.0](https://github.com/chef/kitchen-inspec/tree/v0.10.0) (2016-01-07)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.9.6...v0.10.0)
 
 **Fixed bugs:**
 
@@ -10,6 +22,7 @@
 
 **Merged pull requests:**
 
+- Preparing the 0.10.0 release [\#29](https://github.com/chef/kitchen-inspec/pull/29) ([tyler-ball](https://github.com/tyler-ball))
 - Make test-kitchen a dev dependency [\#28](https://github.com/chef/kitchen-inspec/pull/28) ([jaym](https://github.com/jaym))
 - Specify inspec output format from kitchen.yml [\#27](https://github.com/chef/kitchen-inspec/pull/27) ([cheesesashimi](https://github.com/cheesesashimi))
 - remove gem push restriction [\#24](https://github.com/chef/kitchen-inspec/pull/24) ([arlimus](https://github.com/arlimus))
@@ -36,6 +49,7 @@
 
 **Merged pull requests:**
 
+- 0.9.6 [\#23](https://github.com/chef/kitchen-inspec/pull/23) ([arlimus](https://github.com/arlimus))
 - fix readme [\#22](https://github.com/chef/kitchen-inspec/pull/22) ([srenatus](https://github.com/srenatus))
 
 ## [v0.9.0](https://github.com/chef/kitchen-inspec/tree/v0.9.0) (2015-11-03)
@@ -53,4 +67,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/kitchen/verifier/inspec.rb

@@ -17,6 +17,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'kitchen/transport/ssh'
+require 'kitchen/transport/winrm'
 require 'kitchen/verifier/inspec_version'
 require 'kitchen/verifier/base'
 
@@ -33,25 +35,9 @@ module Kitchen
 
       # (see Base#call)
       def call(state)
-        transport_data = instance.transport.diagnose.merge(state)
-
-        runner_options = case (name = instance.transport.name.downcase)
-                         when 'ssh'
-                           runner_options_for_ssh(transport_data)
-                         when 'winrm'
-                           runner_options_for_winrm(transport_data)
-                         else
-                           fail(
-                             Kitchen::UserError,
-                             "Verifier #{name}",
-                             " does not support the #{name} Transport",
-                           )
-                         end
-        runner_options['format'] = config[:format] unless config[:format].nil?
-
         tests = helper_files + local_suite_files
 
-        runner = ::Inspec::Runner.new(runner_options)
+        runner = ::Inspec::Runner.new(runner_options(instance.transport, state))
         runner.add_tests(tests)
         debug("Running specs from: #{tests.inspect}")
         exit_code = runner.run
@@ -100,6 +86,23 @@ module Kitchen
         end
       end
 
+      # Returns a configuration Hash that can be passed to a `Inspec::Runner`.
+      #
+      # @return [Hash] a configuration hash of string-based keys
+      # @api private
+      def runner_options(transport, state = {})
+        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)
+        else
+          fail Kitchen::UserError, "Verifier #{name} does not support the #{transport.name} Transport"
+        end.tap do |runner_options|
+          runner_options['format'] = config[:format] unless config[:format].nil?
+        end
+      end
+
       # Returns a configuration Hash that can be passed to a `Inspec::Runner`.
       #
       # @return [Hash] a configuration hash of string-based keys

data/lib/kitchen/verifier/inspec_version.rb

@@ -20,6 +20,6 @@
 module Kitchen
   module Verifier
     # Version string for InSpec Kitchen verifier
-    INSPEC_VERSION = '0.10.0'
+    INSPEC_VERSION = '0.10.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Verifier for InSpec