kitchen-inspec 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a619b7d5d2d21a4c32c8026e588ef03b18169c4d
-  data.tar.gz: 516f722745cfc2241414da7dd1629e8bca0dd37e
+  metadata.gz: 1550e107066496cc82de6a4c8fed0c30ad25e609
+  data.tar.gz: 27d3125555dfb9218339585fc28c8bdec9d02433
 SHA512:
-  metadata.gz: 520b7ad767440007ec69bcb2a5747cce9f3eed92c4055e02421a7a244282fd73a2b893d39ddc2f9ce62838330bba0f9eba22e79fe6c7925776c719cfcf907505
-  data.tar.gz: 14a60170117d83334a0b75f8da463aa6fdc054531de21386ce9a1f200151acaacc4e603d1ef42c773245ee718f0e8381ae0f419c6d842ab61fe423e7784fc07c
+  metadata.gz: f82e8302a41797b5af2c7760099329d377e2285942129e844840230ec78ca7981a79c66ce9d458f91c665e67955471daaef43896b3de86ee22a7e2bcbb504ce2
+  data.tar.gz: 754da22a5f8feb494d2b7329054d622c6c34fd9e04f0c449331054d76633f916b35dcbbd3e27c9bbca4f32258a4c0433d6cd5320782552457371bae1886749fc

data/.kitchen.yml

@@ -30,3 +30,20 @@ suites:
     verifier:
       inspec_tests:
         - https://github.com/nathenharvey/tmp_compliance_profile
+  - name: supermarket
+    run_list:
+      - recipe[apt]
+      - recipe[ssh-hardening]
+    verifier:
+      inspec_tests:
+        - supermarket://hardening/ssh-hardening
+  # before you are able to use the compliance plugin, you need to run
+  # insecure is only required if you use self-signed certificates
+  # $ inspec compliance login https://compliance.test --user admin --insecure --token ''
+  - name: compliance
+    run_list:
+      - recipe[apt]
+      - recipe[ssh-hardening]
+    verifier:
+      inspec_tests:
+        - compliance://base/ssh

data/.travis.yml

@@ -1,27 +1,30 @@
----
 sudo: required
 language: ruby
 cache: bundler
-
-# necessary for docker to work
 dist: trusty
 services:
-  - docker
-
-bundler_args: --without integration guard tools
-
+- docker
+bundler_args: "--without integration guard tools"
 before_install:
-  - gem install bundler
-  - gem --version
-
+- gem install bundler
+- gem --version
 matrix:
   include:
-    - rvm: 1.9.3
-    - rvm: 2.0
-    - rvm: 2.1
-    - rvm: ruby-head
-    - rvm: 2.2
-      bundler_args: --without guard tools
-      script: bundle exec rake test:integration
+  - rvm: 1.9.3
+  - rvm: 2.0
+  - rvm: 2.1
+  - rvm: ruby-head
+  - rvm: 2.2
+    bundler_args: "--without guard tools"
+    script: bundle exec rake test:integration OS='default profile contains_inspec'
+  - rvm: 2.2
+    bundler_args: "--without guard tools"
+    script: bundle exec rake test:integration OS='supermarket'
   allow_failures:
-    - rvm: ruby-head
+  - rvm: ruby-head
+deploy:
+  provider: rubygems
+  on:
+    tags: true
+  api_key:
+    secure: lfOpkVSc5+O6mSc1JXEBRuJtNrQm2WxDyClovsV1tfKb54doutDD4fOoogQFUwu3Yq9kujer8KuqZaxzRd/DwQGkTFBGt3KgMEpCUZlRLCD1v81/xnc61DU37PeZMbfdQt0OeioTcyNoBrmjCggu3nmb4dIMZgRMi69qR/OGejz1FVun1d5PmdJ8jckU/wzwttISkHzkAaY55NBEZc8oLA7ekUo+1gnKM4+0YskP6lKg7Wf3r//neTvd0qXG9iHdc1laHnSEevrMrzzcsN4oWn+MXiT7cWB1Xh/MUc4wFCy1CJnw9rmX2YT20994avApJJRu3WVZ+gt0cxVPy7sux1qCG3KcMI0ei6jJuy8akRraYwFt4/CWAZXh41SNMGkvZEQU9J/3sxhCUeS5bGm6IYYWNczFPEgWRXAGOXgFflLE6+NaCT3KtCG3G994aPCFiiz5cc/n9nrsncLsXmL+4MlF+foA2UkT44/VwQTJK1UIBKqXscghR1FzD0It/Y3Gqe+fcKb2Wq77v3dC4IBmWncXDk3LjT36+T4C0hctsaaSjopSc7CyI4HE3MkwqPqJ8PPjlz36/d+42MkNFHE6dd2wPMtWVSfC1AsNf9k79GCSU+f3lYgZK1mjvR3Hx1MZGEfgvJHpZH2S4eOqiV+c9C+PPNUXRaYRyapIa+H4qow=

data/Berksfile

@@ -2,4 +2,7 @@
 
 source 'https://supermarket.chef.io'
 
+cookbook 'apt'
+cookbook 'yum'
 cookbook 'os_prepare', path: './test/cookbooks/os_prepare'
+cookbook 'ssh-hardening', git: 'https://github.com/dev-sec/chef-ssh-hardening.git'

data/CHANGELOG.md

@@ -1,10 +1,33 @@
 # Change Log
 
-## [0.12.5](https://github.com/chef/kitchen-inspec/tree/0.12.5) (2016-03-17)
-[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.12.4...0.12.5)
+## [0.13.0](https://github.com/chef/kitchen-inspec/tree/0.13.0) (2016-05-10)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.12.5...0.13.0)
+
+**Implemented enhancements:**
+
+- Supermarket and Compliance support [\#84](https://github.com/chef/kitchen-inspec/pull/84) ([chris-rock](https://github.com/chris-rock))
+- add more debug messages [\#82](https://github.com/chef/kitchen-inspec/pull/82) ([chris-rock](https://github.com/chris-rock))
+
+**Fixed bugs:**
+
+- Cannot run supermarket and compliance profiles [\#80](https://github.com/chef/kitchen-inspec/issues/80)
+
+**Merged pull requests:**
+
+- release via travis to rubygems on tags [\#79](https://github.com/chef/kitchen-inspec/pull/79) ([arlimus](https://github.com/arlimus))
+- fix lint [\#77](https://github.com/chef/kitchen-inspec/pull/77) ([chris-rock](https://github.com/chris-rock))
+- fix lint [\#76](https://github.com/chef/kitchen-inspec/pull/76) ([chris-rock](https://github.com/chris-rock))
+- Add support for profiles\_path [\#75](https://github.com/chef/kitchen-inspec/pull/75) ([brettlangdon](https://github.com/brettlangdon))
+- Add complete profile example to readme [\#73](https://github.com/chef/kitchen-inspec/pull/73) ([alexpop](https://github.com/alexpop))
+- Use only the keys provided by Kitchen [\#72](https://github.com/chef/kitchen-inspec/pull/72) ([ehartmann](https://github.com/ehartmann))
+- Support color flag [\#71](https://github.com/chef/kitchen-inspec/pull/71) ([jbussdieker](https://github.com/jbussdieker))
+
+## [v0.12.5](https://github.com/chef/kitchen-inspec/tree/v0.12.5) (2016-03-17)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.12.4...v0.12.5)
 
 **Merged pull requests:**
 
+- 0.12.5 [\#69](https://github.com/chef/kitchen-inspec/pull/69) ([arlimus](https://github.com/arlimus))
 - allow for slightly newer versions of inspec [\#68](https://github.com/chef/kitchen-inspec/pull/68) ([arlimus](https://github.com/arlimus))
 
 ## [v0.12.4](https://github.com/chef/kitchen-inspec/tree/v0.12.4) (2016-03-15)

data/README.md

@@ -49,6 +49,28 @@ By default `kitchen-inspec` expects test to be in `test/integration/%suite%` dir
             └── web_spec.rb
 ```
 
+### Directory Structure with complete profile
+
+A complete profile is used here, including a custom inspec resource named `gordon_config`:
+
+```
+.
+├── Berksfile
+├── Gemfile
+├── README.md
+├── metadata.rb
+├── recipes
+│   ├── default.rb
+│   └── nginx.rb
+└── test
+    └── integration
+        └── default
+            ├── controls
+            │   └── gordon.rb
+            ├── inspec.yml
+            └── libraries
+                └── gordon_config.rb
+```
 
 ### Combination with other testing frameworks
 

data/Rakefile

@@ -122,7 +122,7 @@ end
 namespace :test do
   task :integration do
     concurrency = ENV['CONCURRENCY'] || 1
-    path = File.join(File.dirname(__FILE__), 'test', 'integration')
-    sh('sh', '-c', "bundle exec kitchen test -c #{concurrency}")
+    os = ENV['OS'] || ''
+    sh('sh', '-c', "bundle exec kitchen test -c #{concurrency} #{os}")
   end
 end

data/kitchen-inspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_dependency 'inspec', '>=0.14.1', '<1.0.0'
+  spec.add_dependency 'inspec', '>=0.20.0', '<1.0.0'
   spec.add_dependency 'test-kitchen', '~> 1.6'
   spec.add_development_dependency 'countloc', '~> 0.4'
   spec.add_development_dependency 'bundler', '~> 1.10'

data/lib/kitchen/verifier/inspec.rb

@@ -30,7 +30,7 @@ module Kitchen
     # InSpec verifier for Kitchen.
     #
     # @author Fletcher Nichol <fnichol@chef.io>
-    class Inspec < Kitchen::Verifier::Base
+    class Inspec < Kitchen::Verifier::Base # rubocop:disable Metrics/ClassLength
       kitchen_verifier_api_version 1
       plugin_version Kitchen::Verifier::INSPEC_VERSION
 
@@ -38,12 +38,15 @@ module Kitchen
 
       # (see Base#call)
       def call(state)
-        tests = collect_tests
+        logger.debug('Initialize InSpec')
         opts = runner_options(instance.transport, state)
         runner = ::Inspec::Runner.new(opts)
+
+        # add each profile to runner
+        tests = collect_tests
         tests.each { |target| runner.add_target(target, opts) }
 
-        debug("Running specs from: #{tests.inspect}")
+        logger.debug("Running tests from: #{tests.inspect}")
         exit_code = runner.run
         return if exit_code == 0
         fail ActionFailed, "Inspec Runner returns #{exit_code}"
@@ -54,6 +57,17 @@ module Kitchen
       # (see Base#load_needed_dependencies!)
       def load_needed_dependencies!
         require 'inspec'
+        # TODO: this should be easier. I would expect to load a single class here
+        # load supermarket plugin, this is part of the inspec gem
+        require 'bundles/inspec-supermarket/api'
+        require 'bundles/inspec-supermarket/target'
+
+        # load the compliance plugin
+        require 'bundles/inspec-compliance/configuration'
+        require 'bundles/inspec-compliance/support'
+        require 'bundles/inspec-compliance/http'
+        require 'bundles/inspec-compliance/api'
+        require 'bundles/inspec-compliance/target'
       end
 
       # Returns an Array of test suite filenames for the related suite currently
@@ -80,7 +94,7 @@ module Kitchen
         }
 
         base = File.join(base, 'inspec') if legacy_mode
-        logger.info("Search `#{base}` for tests")
+        logger.info("Use `#{base}` for testing")
 
         # only return the directory if it exists
         Pathname.new(base).exist? ? [base] : []
@@ -98,7 +112,7 @@ module Kitchen
       #
       # @return [Hash] a configuration hash of string-based keys
       # @api private
-      def runner_options(transport, state = {})
+      def runner_options(transport, state = {}) # rubocop:disable Metrics/AbcSize
         transport_data = transport.diagnose.merge(state)
         if transport.is_a?(Kitchen::Transport::Ssh)
           runner_options_for_ssh(transport_data)
@@ -110,8 +124,11 @@ module Kitchen
         else
           fail Kitchen::UserError, "Verifier #{name} does not support the #{transport.name} Transport"
         end.tap do |runner_options|
+          # 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['profiles_path'] = config[:profiles_path] unless config[:profiles_path].nil?
         end
       end
 
@@ -137,6 +154,7 @@ module Kitchen
           'max_wait_until_ready' => kitchen[:max_wait_until_ready],
           'compression' => kitchen[:compression],
           'compression_level' => kitchen[:compression_level],
+          'keys_only' => true,
         }
         opts['key_files'] = kitchen[:keys] unless kitchen[:keys].nil?
         opts['password'] = kitchen[:password] unless kitchen[:password].nil?

data/lib/kitchen/verifier/inspec_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.20.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Verifier for InSpec