simp-beaker-helpers 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a7b9000c37c88b4151d82a3fdea8cdc75c2300ba994a5070605b37d4dca1d8
-  data.tar.gz: c38e03db1419d9b56493655de5e304d796dbe8a85c5f98c3f2a5d62b49eb72e8
+  metadata.gz: 06c5bb0aadedabbd7c93aab3b66123af0ee0c31c20420e15d52f8e1a16b86601
+  data.tar.gz: 23d115e02eb74f7aeecda877220275d1ae43951cd6bc75d3584e6e8bc64eeab9
 SHA512:
-  metadata.gz: 7224ee90b064a2ce1dc12550e15f1ec7c77d60dd59d7c7679a9649e734dfaf4df1d0365aaa70b4d72e0518cda3f67c63c84290ef5468fbc7cb3e51568991ed5e
-  data.tar.gz: f16f0db7a9e546f9d30933f2e05c751ead09654bcd7c976c28f862e93ca09866dd1f739a3a630625e7a64f6b6e22f3f3bfacb82f3bb64f4decb0523edbce7cb7
+  metadata.gz: 2c855652d1b54877ec82b9b979c2b9dec45e8ccb6e303d9375e8b8440552b6066b9009c85885c62043623408e31c7090310279bd51bba29223fdf279154b04a1
+  data.tar.gz: 9c8dd37796df29ec3e1d40b5d91459ae585b997cbffa9aaba4011069c999d65f81f91b99bec34e6956ef699c6e65905073173139a8ab35db361aab8fb223f2a1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 1.14.1 / 2019-04-15
+* Handle license acceptance option needed for new versions of inspec.
+
 ### 1.14.0 / 2019-04-08
 * Added function, install_simp_repo, to install the simp online repos.
   The repos are defined in a hash in the function. All the repos

data/lib/simp/beaker_helpers/inspec.rb

@@ -57,7 +57,15 @@ module Simp::BeakerHelpers
     def run
       sut_inspec_results = '/tmp/inspec_results.json'
 
-      inspec_cmd = "inspec exec '#{@test_dir}' --reporter json > #{sut_inspec_results}"
+      inspec_version = Gem::Version.new(on(@sut, 'inspec --version').output.lines.first.strip)
+
+      # See: https://github.com/inspec/inspec/pull/3935
+      if inspec_version <= Gem::Version.new('3.9.0')
+        inspec_cmd = "inspec exec '#{@test_dir}' --reporter json > #{sut_inspec_results}"
+      else
+        inspec_cmd = "inspec exec '#{@test_dir}' --chef-license accept --reporter json > #{sut_inspec_results}"
+      end
+
       result = on(@sut, inspec_cmd, :accept_all_exit_codes => true)
 
       tmpdir = Dir.mktmpdir

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.14.0'
+  VERSION = '1.14.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker