From 8425a5087243548a5336823953e2a5e6140ce26d Mon Sep 17 00:00:00 2001 From: tyler-ball Date: Thu, 18 Apr 2019 12:29:57 -0600 Subject: [PATCH 1/2] Provide logger to license-acceptance for help debugging in the future Signed-off-by: tyler-ball --- lib/inspec/cli.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/inspec/cli.rb b/lib/inspec/cli.rb index 48e1339c3..54d7ccf0d 100644 --- a/lib/inspec/cli.rb +++ b/lib/inspec/cli.rb @@ -392,7 +392,11 @@ require 'license_acceptance/acceptor' begin if (commands_exempt_from_license_check & ARGV.map(&:downcase)).empty? && # Did they use a non-exempt command? !ARGV.empty? # Did they supply at least one command? - LicenseAcceptance::Acceptor.check_and_persist('inspec', Inspec::VERSION) + LicenseAcceptance::Acceptor.check_and_persist( + 'inspec', + Inspec::VERSION, + logger: Inspec::Log, + ) end rescue LicenseAcceptance::LicenseNotAcceptedError Inspec::Log.error 'InSpec cannot execute without accepting the license' From 63225931ecf6c70666c9ee33171dea99822617fc Mon Sep 17 00:00:00 2001 From: tyler-ball Date: Thu, 25 Apr 2019 13:54:09 -0600 Subject: [PATCH 2/2] Updating license-acceptance version constraint to support 1.0 when it is released Signed-off-by: tyler-ball --- inspec.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inspec.gemspec b/inspec.gemspec index 8fe6e302a..79a0cd300 100644 --- a/inspec.gemspec +++ b/inspec.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'train-aws', '~> 0.1' # Implementation dependencies - spec.add_dependency 'license-acceptance', '~> 0.2' + spec.add_dependency 'license-acceptance', '>= 0.2.13', '< 2.0' spec.add_dependency 'thor', '~> 0.20' spec.add_dependency 'json', '>= 1.8', '< 3.0' spec.add_dependency 'method_source', '~> 0.8'