inspec 4.6.4 → 4.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8bb84b8222dcb5484737f5e157abb050765d3d988a1153c9ddff8e770415fe3
-  data.tar.gz: ef6f2c3a982ffd20ee7cbde1908ae3f0c27dd45c04bd46be6a69713f03a7d776
+  metadata.gz: 2f5b73cc4ec9d1e11867bb9e7d0cc7eeb1007ef4b10f56485d817bd56811d662
+  data.tar.gz: 12b23768ff808f509c88b7ce0558a73e04a328d8d9a6e37da6b6ac74208e891e
 SHA512:
-  metadata.gz: 79ac61b9b4d8d4703a8f3f1f08a2fdebdc81590cb759c8dbee6cfb23d66ce558e3458662c54dd19b7f3a1da801bbc65dad2d6da81e2caef5d3ce8b94e5fd9c49
-  data.tar.gz: 36c93530a71e46988ef3da4716669cd3cc97073c10e7ebf770c97b69c2d5607da7d9b6a512765f810dfdbac6e570fe596d1e47958257c0ed57d2c18acf14fa48
+  metadata.gz: 39a2cdcd01416f61101a2436ce3a01bc754cd3212010d348a094b14b1ac8a7b07e9dbc4b2da1795c5b75ea628e760c4cf5ddb84a446531531bdad78f3d24f183
+  data.tar.gz: 25b1c69962503c6567ec46f8122edddc614bdfa16b475b6a64ad4c488e7e115830aeb59a215826cfb6b9ac1b67b9b9a6c6c1de395c7d0dce3689bc4ae88121b9

data/Gemfile

@@ -28,7 +28,6 @@ group :test do
   gem "mocha", "~> 1.1"
   gem "ruby-progressbar", "~> 1.8"
   gem "webmock", "~> 3.0"
-  gem "passgen"
   gem "m"
   gem "pry", "~> 0.10"
   gem "pry-byebug"

data/lib/inspec/base_cli.rb

@@ -2,6 +2,7 @@ require "thor"
 require "inspec/log"
 require "inspec/ui"
 require "inspec/config"
+require "inspec/dist"
 require "inspec/utils/deprecation/global_method"
 
 # Allow end of options during array type parsing
@@ -24,6 +25,32 @@ module Inspec
       attr_accessor :inspec_cli_command
     end
 
+    def self.start(given_args = ARGV, config = {})
+      check_license! if config[:enforce_license] || config[:enforce_license].nil?
+
+      super(given_args, config)
+    end
+
+    # EULA acceptance
+    def self.check_license!
+      allowed_commands = ["-h", "--help", "help", "-v", "--version", "version"]
+
+      require "license_acceptance/acceptor"
+      begin
+        if (allowed_commands & 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::Dist::EXEC_NAME,
+            Inspec::VERSION,
+            logger: Inspec::Log
+          )
+        end
+      rescue LicenseAcceptance::LicenseNotAcceptedError
+        Inspec::Log.error "#{Inspec::Dist::PRODUCT_NAME} cannot execute without accepting the license"
+        Inspec::UI.new.exit(:license_not_accepted)
+      end
+    end
+
     # https://github.com/erikhuda/thor/issues/244
     def self.exit_on_failure?
       true

data/lib/inspec/cli.rb

@@ -419,26 +419,6 @@ end
 #=====================================================================#
 
 help_commands = ["-h", "--help", "help"]
-version_commands = ["-v", "--version", "version"]
-commands_exempt_from_license_check = help_commands + version_commands
-
-#---------------------------------------------------------------------#
-# EULA acceptance
-#---------------------------------------------------------------------#
-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,
-      logger: Inspec::Log
-    )
-  end
-rescue LicenseAcceptance::LicenseNotAcceptedError
-  Inspec::Log.error "InSpec cannot execute without accepting the license"
-  Inspec::UI.new.exit(:license_not_accepted)
-end
 
 #---------------------------------------------------------------------#
 # Adjustments for help handling

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "4.6.4".freeze
+  VERSION = "4.6.9".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 4.6.4
+  version: 4.6.9
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train