kitchen-inspec 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c205981fa067930db6f32fa9038b3cbd22306b
-  data.tar.gz: eff8057266d33846f3be2b81aaf896c794097626
+  metadata.gz: 53592f31d694833c8ec54b52da1b9edcedc434fb
+  data.tar.gz: 0a45afd98cb39ea8d8fcd0e76c9821417ed1baa4
 SHA512:
-  metadata.gz: 498a7161543996869d7b7d986c208de90897db6d92ceb4df1432507299d8520505a2df6251fde3e8fad08335da3da1cf22754707c114b7a21c506a91eb0cb47c
-  data.tar.gz: 25f501ab3f3c5cf0a25b53256d3a4b85275c3cd641f516fba60b13e2dfbefae16cf8d0d5e4a5d2822c8ffa18edac8bfa81092d1b5c0ac2b890a30ff25ee4099a
+  metadata.gz: 2938df465da317ef4e510ff121e93dd2e51e128bcdb521c5ec5e9b4bf99307edb0bc45057bd3a32d7e2e622d288d4a31c386e8ba758e9a73bebddc51bd873bb2
+  data.tar.gz: af817b0781737a49dc941a7561e0580934bcef98d3db2670c936ee55e189bb5d6e3cd6d6464f7a42d4fc4062ca275d4cdb58c1e4886e292f7cf59afb208dee52

data/.kitchen.yml

@@ -21,12 +21,11 @@ suites:
   - name: default
     run_list:
       - recipe[os_prepare]
-    attributes:
   - name: profile
     run_list:
       - recipe[os_prepare]
-    attributes:
   - name: contains_inspec
     run_list:
       - recipe[os_prepare]
-    attributes:
+    inspec_tests:
+      - https://github.com/nathenharvey/tmp_compliance_profile

data/CHANGELOG.md

@@ -1,7 +1,20 @@
 # Change Log
 
-## [0.12.2](https://github.com/chef/kitchen-inspec/tree/0.12.2) (2016-02-22)
-[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.12.1...0.12.2)
+## [0.12.3](https://github.com/chef/kitchen-inspec/tree/0.12.3) (2016-03-01)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.12.2...0.12.3)
+
+**Implemented enhancements:**
+
+- fix gem build license warning [\#59](https://github.com/chef/kitchen-inspec/pull/59) ([chris-rock](https://github.com/chris-rock))
+- Add support for remote profiles [\#51](https://github.com/chef/kitchen-inspec/pull/51) ([chris-rock](https://github.com/chris-rock))
+
+**Merged pull requests:**
+
+- add test-kitchen 1.6 as dependency [\#60](https://github.com/chef/kitchen-inspec/pull/60) ([chris-rock](https://github.com/chris-rock))
+- Bump berks requirement to latest [\#58](https://github.com/chef/kitchen-inspec/pull/58) ([jkeiser](https://github.com/jkeiser))
+
+## [v0.12.2](https://github.com/chef/kitchen-inspec/tree/v0.12.2) (2016-02-22)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.12.1...v0.12.2)
 
 **Fixed bugs:**
 

data/Gemfile

@@ -14,7 +14,6 @@ group :test do
   gem 'rubocop', '~> 0.32'
   gem 'concurrent-ruby', '~> 0.9'
   gem 'codeclimate-test-reporter', :require => nil
-  gem 'test-kitchen', git: 'https://github.com/test-kitchen/test-kitchen.git', branch: 'master'
 end
 
 # pin dependency for Ruby 1.9.3 since bundler is not
@@ -24,11 +23,11 @@ if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
 end
 
 group :integration do
-  gem 'berkshelf'
+  gem 'berkshelf', '>= 4.2.3'
   gem 'kitchen-dokken'
 end
 
 group :tools do
   gem 'pry', '~> 0.10'
-  gem 'github_changelog_generator', '~> 1'
+  gem 'github_changelog_generator', '1.11.3'
 end

data/kitchen-inspec.gemspec

@@ -7,7 +7,7 @@ require 'English'
 Gem::Specification.new do |spec|
   spec.name          = 'kitchen-inspec'
   spec.version       = Kitchen::Verifier::INSPEC_VERSION
-  spec.license       = 'Apache 2.0'
+  spec.license       = 'Apache-2.0'
   spec.authors       = ['Fletcher Nichol']
   spec.email         = ['fnichol@chef.io']
 
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   spec.add_dependency 'inspec', '~> 0.14.1'
+  spec.add_dependency 'test-kitchen', '~> 1.6'
   spec.add_development_dependency 'countloc', '~> 0.4'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/kitchen/verifier/inspec.rb

@@ -26,6 +26,31 @@ require 'uri'
 require 'pathname'
 
 module Kitchen
+  # monkey patch test-kitchen to get the suite information within this verifier,
+  # since test-kitchen does not allow a proper hook
+  class DataMunger
+    # save reference to olf method
+    alias_method :original_verifier_data_for, :verifier_data_for
+
+    def verifier_data_for(suite, platform)
+      # filter current suite and extract `inspec_tests` and move it to verifier
+      data.fetch(:suites, []).select { |f| f[:name] == suite  }.each do |suite_data|
+        move_data_to!(:verifier, suite_data, :inspec_tests)
+      end
+
+      # run original behaviour
+      original_verifier_data_for(suite, platform)
+    end
+
+    # TODO: remove, once https://github.com/test-kitchen/test-kitchen/pull/955 is merged
+    def move_data_to!(to, root, key)
+      return unless root.key?(key)
+      pdata = root.fetch(to, {})
+      pdata = { name: pdata } if pdata.is_a?(String)
+      root[to] = pdata.rmerge(key => root.delete(key)) if !root.fetch(key, nil).nil?
+    end
+  end
+
   module Verifier
     # InSpec verifier for Kitchen.
     #
@@ -34,9 +59,11 @@ module Kitchen
       kitchen_verifier_api_version 1
       plugin_version Kitchen::Verifier::INSPEC_VERSION
 
+      default_config :inspec_tests, []
+
       # (see Base#call)
       def call(state)
-        tests = local_suite_files
+        tests = collect_tests
 
         opts = runner_options(instance.transport, state)
         runner = ::Inspec::Runner.new(opts)
@@ -63,7 +90,7 @@ module Kitchen
       # - test/integration
       # - test/integration/inspec (prefered if used with other test environments)
       #
-      # @return [Array<String>] array of suite files
+      # @return [Array<String>] array of suite directories
       # @api private
       def local_suite_files
         base = File.join(config[:test_base_path], config[:suite_name])
@@ -83,6 +110,14 @@ module Kitchen
         [base]
       end
 
+      # Returns an array of test profiles
+      # @return [Array<String>] array of suite directories or remote urls
+      # @api private
+      def collect_tests
+        # get local tests and get run list of profiles
+        (local_suite_files + config[:inspec_tests]).compact
+      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.12.2'
+    INSPEC_VERSION = '0.12.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.1
+- !ruby/object:Gem::Dependency
+  name: test-kitchen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +148,7 @@ files:
 - lib/kitchen/verifier/inspec_version.rb
 homepage: http://github.com/chef/kitchen-inspec
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []