inspec 2.2.50 → 2.2.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a37b35268f58619b53379d49c9abecf4cd2173ed4f8d007718d98f7438da7d
-  data.tar.gz: 176561770b98d46ffc5f69ec38ebd0eef169ef9ad770ec921fa1ad16a45d6a92
+  metadata.gz: 977bb363360a10af70b26468798171a51e8ac00f4934dc62fe4efba59fdc9e5a
+  data.tar.gz: 7915d80127ade0039e184c1b5b6dc56c07ffb87fcbab2da6ef4f7a34d7ec87df
 SHA512:
-  metadata.gz: 61c08ae2ca27909e61c788616caf71f9c079d12f10fdd773cdef79cabd5d70b73b569519bac3981e1b68cf478b9cf7215fe773cd15d98063210c53b323e36ae2
-  data.tar.gz: 6b54b6a415680bec602497fecc81905bdf0a5ad8b31831014d03a8433b1b48c359f56b3e38c0bac9eaf3c71f5e9a9695f88bd545c6f1390ade4c7157d3f97e91
+  metadata.gz: add341eb8d92cb1f8ec093ff0bdb7bc22f4f63639e76defba94b1d8e4c823cf4948c845e4a1405b1778210fcd83d1108d7c8d91bc8aeba41d9409b4c79690a9f
+  data.tar.gz: 380330555e16c43839401811df31ebb4477a03a2718e89675302317ef61ed9958f4551fb37f79575ae11aa7ec9b732fb9404233a7166a39d0f49f36a8b45a376

data/CHANGELOG.md

@@ -1,32 +1,43 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 2.2.50 -->
-## [v2.2.50](https://github.com/inspec/inspec/tree/v2.2.50) (2018-07-26)
+<!-- latest_release 2.2.54 -->
+## [v2.2.54](https://github.com/inspec/inspec/tree/v2.2.54) (2018-08-02)
 
 #### Enhancements
-- Since /proc/xen is an empty dir in Amazon Linux, inspec falsely detects docker instances as platform=&#39;xen&#39; [#3243](https://github.com/inspec/inspec/pull/3243) ([woneill](https://github.com/woneill))
+- Escaping package names for windows packages [#3259](https://github.com/inspec/inspec/pull/3259) ([frezbo](https://github.com/frezbo))
 <!-- latest_release -->
 
-<!-- release_rollup since=2.2.41 -->
-### Changes since 2.2.41 release
-
-#### New Features
-- windows_feature resource: Add DISM support [#3224](https://github.com/inspec/inspec/pull/3224) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.2.47 -->
+<!-- release_rollup since=2.2.50 -->
+### Changes since 2.2.50 release
 
 #### Enhancements
-- Since /proc/xen is an empty dir in Amazon Linux, inspec falsely detects docker instances as platform=&#39;xen&#39; [#3243](https://github.com/inspec/inspec/pull/3243) ([woneill](https://github.com/woneill)) <!-- 2.2.50 -->
-- alpine resource: Fix small style issues [#3238](https://github.com/inspec/inspec/pull/3238) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.2.45 -->
-- Add extra fault checking to git fetcher [#3239](https://github.com/inspec/inspec/pull/3239) ([james-stocks](https://github.com/james-stocks)) <!-- 2.2.44 -->
+- Escaping package names for windows packages [#3259](https://github.com/inspec/inspec/pull/3259) ([frezbo](https://github.com/frezbo)) <!-- 2.2.54 -->
+- Populate report code for merged controls [#3264](https://github.com/inspec/inspec/pull/3264) ([jquick](https://github.com/jquick)) <!-- 2.2.53 -->
+- Bump the chef client version for tests. [#3260](https://github.com/inspec/inspec/pull/3260) ([jquick](https://github.com/jquick)) <!-- 2.2.52 -->
 
 #### Merged Pull Requests
-- Fix for profile version not being included in the compliance upload c… [#3252](https://github.com/inspec/inspec/pull/3252) ([devoptimist](https://github.com/devoptimist)) <!-- 2.2.49 -->
-- Satisfy RuboCop by adding `x` bit to `bin/inspec` [#3249](https://github.com/inspec/inspec/pull/3249) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.2.48 -->
-- cli: Downcase supermarket tool name to match URL [#3242](https://github.com/inspec/inspec/pull/3242) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.2.46 -->
-- Fix the unit tests ssl issue [#3251](https://github.com/inspec/inspec/pull/3251) ([jquick](https://github.com/jquick)) <!-- 2.2.43 -->
-- update README.md to fix travis and appveyor&#39;s badges. [#3244](https://github.com/inspec/inspec/pull/3244) ([takahashim](https://github.com/takahashim)) <!-- 2.2.42 -->
+- Ability to render contrib resource pack docs on main website [#3184](https://github.com/inspec/inspec/pull/3184) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 2.2.51 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v2.2.50](https://github.com/inspec/inspec/tree/v2.2.50) (2018-07-26)
+
+#### New Features
+- windows_feature resource: Add DISM support [#3224](https://github.com/inspec/inspec/pull/3224) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+
+#### Enhancements
+- Add extra fault checking to git fetcher [#3239](https://github.com/inspec/inspec/pull/3239) ([james-stocks](https://github.com/james-stocks))
+- alpine resource: Fix small style issues [#3238](https://github.com/inspec/inspec/pull/3238) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Since /proc/xen is an empty dir in Amazon Linux, inspec falsely detects docker instances as platform=&#39;xen&#39; [#3243](https://github.com/inspec/inspec/pull/3243) ([woneill](https://github.com/woneill))
+
+#### Merged Pull Requests
+- update README.md to fix travis and appveyor&#39;s badges. [#3244](https://github.com/inspec/inspec/pull/3244) ([takahashim](https://github.com/takahashim))
+- Fix the unit tests ssl issue [#3251](https://github.com/inspec/inspec/pull/3251) ([jquick](https://github.com/jquick))
+- cli: Downcase supermarket tool name to match URL [#3242](https://github.com/inspec/inspec/pull/3242) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Satisfy RuboCop by adding `x` bit to `bin/inspec` [#3249](https://github.com/inspec/inspec/pull/3249) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Fix for profile version not being included in the compliance upload c… [#3252](https://github.com/inspec/inspec/pull/3252) ([devoptimist](https://github.com/devoptimist))
+<!-- latest_stable_release -->
+
 ## [v2.2.41](https://github.com/inspec/inspec/tree/v2.2.41) (2018-07-20)
 
 #### New Features
@@ -40,7 +51,6 @@
 #### Merged Pull Requests
 - docs: Fix formatting/style on InSpec DSL page [#3201](https://github.com/inspec/inspec/pull/3201) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 - Update hab package to use psql client [#3234](https://github.com/inspec/inspec/pull/3234) ([jquick](https://github.com/jquick))
-<!-- latest_stable_release -->
 
 ## [v2.2.35](https://github.com/inspec/inspec/tree/v2.2.35) (2018-07-12)
 

data/Gemfile

@@ -40,6 +40,7 @@ group :tools do
   gem 'pry', '~> 0.10'
   gem 'rb-readline'
   gem 'license_finder'
+  gem 'git', '~> 1.4'
 end
 
 # gems for Maintainers.md generation

data/Rakefile

@@ -27,6 +27,13 @@ rescue LoadError
   puts 'docs tasks are unavailable because the ruby-progressbar gem is not available.'
 end
 
+begin
+  require 'git'
+  require_relative 'tasks/contrib'
+rescue LoadError
+  puts 'contrib tasks are unavailable because the git gem is not available.'
+end
+
 # Rubocop
 begin
   require 'rubocop/rake_task'

data/lib/inspec/profile.rb

@@ -531,6 +531,17 @@ module Inspec
         source_location: location,
       }
 
+      # try and grab code text from merge locations
+      if controls[id][:code].empty? && Inspec::Rule.merge_count(rule) > 0
+        Inspec::Rule.merge_changes(rule).each do |merge_location|
+          code = Inspec::MethodSource.code_at(merge_location, source_reader)
+          if !code.empty?
+            controls[id][:code] = code
+            break
+          end
+        end
+      end
+
       groups[file] ||= {
         title: rule.instance_variable_get(:@__group_title),
         controls: [],

data/lib/inspec/rule.rb

@@ -44,6 +44,7 @@ module Inspec
       @__checks = []
       @__skip_rule = nil
       @__merge_count = 0
+      @__merge_changes = []
       @__skip_only_if_eval = opts[:skip_only_if_eval]
 
       # evaluate the given definition
@@ -181,6 +182,10 @@ module Inspec
       rule.instance_variable_get(:@__merge_count)
     end
 
+    def self.merge_changes(rule)
+      rule.instance_variable_get(:@__merge_changes)
+    end
+
     def self.prepare_checks(rule)
       msg = skip_status(rule)
       return checks(rule) unless msg
@@ -211,12 +216,6 @@ module Inspec
       dst.tag(src.tag)       unless src.tag.nil?
       dst.ref(src.ref)       unless src.ref.nil?
 
-      # use the most recent source location
-      dst.instance_variable_set(
-        :@__source_location,
-        src.instance_variable_get(:@__source_location),
-      )
-
       # merge indirect fields
       # checks defined in the source will completely eliminate
       # all checks that were defined in the destination
@@ -224,8 +223,13 @@ module Inspec
       dst.instance_variable_set(:@__checks, sc) unless sc.empty?
       sr = skip_status(src)
       set_skip_rule(dst, sr) unless sr.nil?
-      # increment merge count
+
+      # Save merge history
       dst.instance_variable_set(:@__merge_count, merge_count(dst) + 1)
+      dst.instance_variable_set(
+        :@__merge_changes,
+        merge_changes(dst) << src.instance_variable_get(:@__source_location),
+      )
     end
 
     private

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '2.2.50'
+  VERSION = '2.2.54'
 end

data/lib/resources/package.rb

@@ -288,7 +288,7 @@ module Inspec::Resources
       # Find the package
       cmd = inspec.command <<-EOF.gsub(/^\s*/, '')
         Get-ItemProperty (@("#{search_paths.join('", "')}") | Where-Object { Test-Path $_ }) |
-        Where-Object { $_.DisplayName -match "^\\s*#{package_name}\\s*$" -or $_.PSChildName -match "^\\s*#{package_name}\\s*$" } |
+        Where-Object { $_.DisplayName -match "^\\s*#{package_name.shellescape}\\s*$" -or $_.PSChildName -match "^\\s*#{package_name.shellescape}\\s*$" } |
         Select-Object -Property DisplayName,DisplayVersion | ConvertTo-Json
       EOF
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 2.2.50
+  version: 2.2.54
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train