inspec 0.33.0 → 0.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42f6886e62266384a0c80c87121f10fd132465b7
-  data.tar.gz: 438402a4b269d0cd6a686eac3dc1a1b549d0333a
+  metadata.gz: e9b2ba9958d13778fe972ca9961229db0c99ed68
+  data.tar.gz: e84133108b846956beedaff95f964227395e3889
 SHA512:
-  metadata.gz: 0008350a540830d34d52e9ab650b82db771936613204b6c885a615b5398d5ce2f74ca7bf4500084d3b824ab71b8eb6d6b24a3e9d13f7e45daa933b6d84c55d6c
-  data.tar.gz: b333ca0a11b1ab87b357ac3e1294141f779cf1bc02e18a695d6002b52c1437e8b497cb3ccaa23e78600542d378b952ea01f4375c7122afc7f6e29d67bc2c1162
+  metadata.gz: 11ac1cd70c2a131ae8f1642e562429c488e844351482e484820b033802d5250036e6fb3a6492bcbbddc0916f6a080773e9bdaaad486b3af851dbb050b578716a
+  data.tar.gz: a54263c5bc62a0f17e234ac3c4ebb8505245407620917d2c4463c8828da7169f3ea2dddc9d6d8757d11fbe0281f9928e81473f6d657cea75c7e89b376b769cc6

data/CHANGELOG.md

@@ -1,7 +1,21 @@
 # Change Log
 
-## [0.33.0](https://github.com/chef/inspec/tree/0.33.0) (2016-09-05)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.32.0...0.33.0)
+## [0.33.1](https://github.com/chef/inspec/tree/0.33.1) (2016-09-07)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.33.0...0.33.1)
+
+**Closed issues:**
+
+- Research: determine mechanism for recording + playing back inspec [\#955](https://github.com/chef/inspec/issues/955)
+- Create content for interactive inspec online demo [\#954](https://github.com/chef/inspec/issues/954)
+
+**Merged pull requests:**
+
+- Pass attributes from command line into profile context [\#1026](https://github.com/chef/inspec/pull/1026) ([stevendanna](https://github.com/stevendanna))
+- Remove SourceReader::Inspec\#prepare\_load\_path [\#1023](https://github.com/chef/inspec/pull/1023) ([stevendanna](https://github.com/stevendanna))
+- add demo yml contents [\#1022](https://github.com/chef/inspec/pull/1022) ([arlimus](https://github.com/arlimus))
+
+## [v0.33.0](https://github.com/chef/inspec/tree/v0.33.0) (2016-09-05)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.32.0...v0.33.0)
 
 **Implemented enhancements:**
 

data/lib/inspec/profile.rb

@@ -45,8 +45,8 @@ module Inspec
     def_delegator :@source_reader, :metadata
 
     # rubocop:disable Metrics/AbcSize
-    def initialize(source_reader, options = nil)
-      @options = options || {}
+    def initialize(source_reader, options = {})
+      @options = options
       @target = @options.delete(:target)
       @logger = @options[:logger] || Logger.new(nil)
       @source_reader = source_reader
@@ -57,7 +57,7 @@ module Inspec
       @profile_id = @options[:id]
       @backend = @options[:backend] || Inspec::Backend.create(options)
       Metadata.finalize(@source_reader.metadata, @profile_id)
-      @runner_context = @options[:profile_context] || Inspec::ProfileContext.for_profile(self, @backend)
+      @runner_context = @options[:profile_context] || Inspec::ProfileContext.for_profile(self, @backend, @options[:attributes])
     end
 
     def name

data/lib/inspec/profile_context.rb

@@ -12,8 +12,9 @@ require 'inspec/objects/attribute'
 
 module Inspec
   class ProfileContext # rubocop:disable Metrics/ClassLength
-    def self.for_profile(profile, backend)
-      new(profile.name, backend, { 'profile' => profile })
+    def self.for_profile(profile, backend, attributes)
+      new(profile.name, backend, { 'profile' => profile,
+                                   'attributes' => attributes })
     end
 
     attr_reader :attributes, :rules, :profile_id, :resource_registry

data/lib/inspec/runner.rb

@@ -126,13 +126,16 @@ module Inspec
     # @eturns [Inspec::ProfileContext]
     #
     def add_target(target, _opts = [])
-      profile = Inspec::Profile.for_target(target, backend: @backend, controls: @controls)
+      profile = Inspec::Profile.for_target(target,
+                                           backend: @backend,
+                                           controls: @controls,
+                                           attributes: @conf[:attributes])
       fail "Could not resolve #{target} to valid input." if profile.nil?
       @target_profiles << profile if supports_profile?(profile)
     end
 
     #
-    # This is used by inspec-shell and inspec-detect.  This should
+    # This is used by inspec-shell and inspec-detect. This should
     # probably be cleaned up a bit.
     #
     # @params [Hash] Options

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '0.33.0'.freeze
+  VERSION = '0.33.1'.freeze
 end

data/lib/source_readers/inspec.rb

@@ -34,7 +34,6 @@ module SourceReaders
 
       @tests = load_tests
       @libraries = load_libs
-      prepare_load_paths
     end
 
     private
@@ -52,27 +51,5 @@ module SourceReaders
       end
       Hash[tests.map { |x| [x, @target.read(x)] }]
     end
-
-    # Ensure each test directory exists on the $LOAD_PATH. This
-    # will ensure traditional RSpec-isms like `require 'spec_helper'`
-    # continue to work. The method outlined here is only meant to be temporary!
-    def prepare_load_paths
-      t = @target
-      t = @target.parent unless @target.parent.nil?
-      unless t.is_a?(Fetchers::Local)
-        return # no need to mess with load-paths if this is not on disk
-      end
-
-      rel_dirs = (@libraries.keys + @tests.keys)
-                 .map { |x| File.dirname(x) }.uniq
-
-      abs_dirs = rel_dirs.map { |x| @target.abs_path(x) }
-                         .find_all { |x| File.directory?(x) }
-                         .map { |x| File.expand_path(x) }
-
-      abs_dirs.each do |dir|
-        $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.33.1
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train