license-acceptance 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eee8ab3bdb6b370c3b0c2dddb7a86f22cea5240eae5df17e58e4c367fc08a0fe
-  data.tar.gz: 7f25c5f59f833808115dead1157b33f09c9fe4e4000c3c4e70dee586466d74a9
+  metadata.gz: 6c2e076dba9be610985535dca130a348b58d6beb27efba823d97fd86077d8d60
+  data.tar.gz: 6370bf24f3c58e13194975b9e0dbb06a2dc577cd5b632def8aa6b92acbaeeae4
 SHA512:
-  metadata.gz: ef3af6247b87811c3796838e707d47b153c7828160a4dee699b3e95f2bef534c055fa34e828548a7e0dc9830b146014c2a8a7a4ac2cca4d94388e180d4fa5581
-  data.tar.gz: aa6d132e77ecfb95a8c4e263d29d7731a44f2c8d40d4cd7eeb48fbf8964c5a9e807c6cde3fec5f757af3cb9de2e5fbfc1e8d60c5729598f204fa2829d6e1c42c
+  metadata.gz: 93edc97194f0dc6556867113a1faf12ff559c28ab4b5ad41b1eeeca6a8a84305db55d2be10f251b6f0cf760630867b08912eef9a33757fa51ad69fbec4b66996
+  data.tar.gz: 767e584dc945ff8e324a965a574cd174905089b2918c2a99ca28221edba28616a9a23fa9dea624f66c3d67d688583719ccb648fc7fa1e5d871737eb7875f6662

data/Gemfile

@@ -6,9 +6,9 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 group :development do
-  gem "chefstyle", "1.2.1"
+  gem "chefstyle", "1.3.2"
   gem "climate_control", "~> 0.2"
-  gem "mixlib-cli", "~> 1.7"
+  gem "mixlib-cli", "~> 2.1"
   gem "rake", ">= 10.1.0"
   gem "rspec", "~> 3.0"
   gem "thor", ">= 0.20", "< 2.0" # validate 2.0 when it ships

data/lib/license_acceptance/acceptor.rb

@@ -1,4 +1,4 @@
-require "forwardable"
+require "forwardable" unless defined?(Forwardable)
 require "license_acceptance/config"
 require "license_acceptance/logger"
 require "license_acceptance/product_reader"
@@ -74,21 +74,18 @@ module LicenseAcceptance
           end
         end
         @acceptance_value = accepted_silent? ? ACCEPT_SILENT : ACCEPT
-        true
-      elsif config.output.isatty && prompt_strategy.request(missing_licenses) do
-        # We have to infer the acceptance value if they use the prompt to accept
-        if config.persist
-          @acceptance_value = ACCEPT # rubocop: disable Lint/AssignmentInCondition
-          file_strategy.persist(product_relationship, missing_licenses)
-        else
-          @acceptance_value = ACCEPT_NO_PERSIST # rubocop: disable Lint/AssignmentInCondition
-          []
-        end
+        return true
       end
-        true
-      else
+
+      if acceptance_value_provided?
+        value = provided_strategy.value || env_strategy.value || arg_strategy.value
+        output.puts("Unrecognized license acceptance value '#{value}', expected one of: '#{ACCEPT}', '#{ACCEPT_SILENT}', '#{ACCEPT_NO_PERSIST}'")
         raise LicenseNotAcceptedError.new(product_relationship.parent, missing_licenses)
       end
+
+      return true if output.isatty && accepted_license_prompt?(product_relationship, missing_licenses)
+
+      raise LicenseNotAcceptedError.new(product_relationship.parent, missing_licenses)
     end
 
     def self.check_and_persist!(product_id, version, opts = {})
@@ -99,6 +96,19 @@ module LicenseAcceptance
       new(opts).check_and_persist(product_id, version)
     end
 
+    def accepted_license_prompt?(product_relationship, missing_licenses)
+      prompt_strategy.request(missing_licenses) do
+        # We have to infer the acceptance value if they use the prompt to accept
+        if config.persist
+          @acceptance_value = ACCEPT
+          file_strategy.persist(product_relationship, missing_licenses)
+        else
+          @acceptance_value = ACCEPT_NO_PERSIST
+          []
+        end
+      end
+    end
+
     # Check whether the specified product requires license acceptance for the given version.
     def license_required?(mixlib_name, version)
       product = product_reader.lookup_by_mixlib(mixlib_name)
@@ -140,6 +150,10 @@ module LicenseAcceptance
       provided_strategy.silent? || env_strategy.silent? || arg_strategy.silent?
     end
 
+    def acceptance_value_provided?
+      provided_strategy.value? || env_strategy.value? || arg_strategy.value?
+    end
+
     # In the case where users accept with a command line argument or environment variable
     # we still want to output the fact that the filesystem was changed.
     def output_num_persisted(count)

data/lib/license_acceptance/cli_flags/mixlib_cli.rb

@@ -1,5 +1,5 @@
 begin
-  require "mixlib/cli"
+  require "mixlib/cli" unless defined?(Mixlib::CLI)
 rescue
   raise "Must have mixlib-cli gem installed to use this mixin"
 end

data/lib/license_acceptance/cli_flags/thor.rb

@@ -1,5 +1,5 @@
 begin
-  require "thor"
+  require "thor" unless defined?(Thor)
 rescue
   raise "Must have thor gem installed to use this mixin"
 end

data/lib/license_acceptance/product_reader.rb

@@ -1,4 +1,4 @@
-require "tomlrb"
+autoload :Tomlrb, "tomlrb"
 require "license_acceptance/logger"
 require "license_acceptance/product"
 require "license_acceptance/product_relationship"

data/lib/license_acceptance/strategy/argument.rb

@@ -6,6 +6,8 @@ module LicenseAcceptance
     # Look for acceptance values in the ARGV
     class Argument < Base
 
+      FLAG = "--chef-license".freeze
+
       attr_reader :argv
 
       def initialize(argv)
@@ -13,32 +15,30 @@ module LicenseAcceptance
       end
 
       def accepted?
-        look_for_value(ACCEPT)
+        String(value).downcase == ACCEPT
       end
 
       def silent?
-        look_for_value(ACCEPT_SILENT)
+        String(value).downcase == ACCEPT_SILENT
       end
 
       def no_persist?
-        look_for_value(ACCEPT_NO_PERSIST)
+        String(value).downcase == ACCEPT_NO_PERSIST
+      end
+
+      def value?
+        argv.any? { |s| s == FLAG || s.start_with?("#{FLAG}=") }
       end
 
-      private
+      def value
+        match = argv.detect { |s| s.start_with?("#{FLAG}=") }
+        return match.split("=").last if match
 
-      def look_for_value(sought)
-        if argv.include?("--chef-license=#{sought}")
-          return true
+        argv.each_cons(2) do |arg, value|
+          return value if arg == FLAG
         end
 
-        i = argv.index("--chef-license")
-        unless i.nil?
-          val = argv[i + 1]
-          if !val.nil? && val.downcase == sought
-            return true
-          end
-        end
-        false
+        nil
       end
     end
   end

data/lib/license_acceptance/strategy/environment.rb

@@ -6,6 +6,8 @@ module LicenseAcceptance
     # Look for acceptance values in the environment
     class Environment < Base
 
+      ENV_KEY = "CHEF_LICENSE".freeze
+
       attr_reader :env
 
       def initialize(env)
@@ -13,25 +15,23 @@ module LicenseAcceptance
       end
 
       def accepted?
-        look_for_value(ACCEPT)
+        String(value).downcase == ACCEPT
       end
 
       def silent?
-        look_for_value(ACCEPT_SILENT)
+        String(value).downcase == ACCEPT_SILENT
       end
 
       def no_persist?
-        look_for_value(ACCEPT_NO_PERSIST)
+        String(value).downcase == ACCEPT_NO_PERSIST
       end
 
-      private
-
-      def look_for_value(sought)
-        if env["CHEF_LICENSE"] && env["CHEF_LICENSE"].downcase == sought
-          return true
-        end
+      def value?
+        env.key?(ENV_KEY)
+      end
 
-        false
+      def value
+        env[ENV_KEY]
       end
 
     end

data/lib/license_acceptance/strategy/file.rb

@@ -1,7 +1,7 @@
 require "date"
-require "yaml"
-require "fileutils"
-require "etc"
+autoload :YAML, "yaml"
+require "fileutils" unless defined?(FileUtils)
+require "etc" unless defined?(Etc)
 require "license_acceptance/logger"
 require "license_acceptance/strategy/base"
 

data/lib/license_acceptance/strategy/prompt.rb

@@ -1,8 +1,8 @@
-require "tty-prompt"
+autoload :TTY, "tty-prompt"
 require "pastel"
 require "license_acceptance/logger"
 require "license_acceptance/strategy/base"
-require "timeout"
+require "timeout" unless defined?(Timeout)
 
 module LicenseAcceptance
   module Strategy

data/lib/license_acceptance/strategy/provided_value.rb

@@ -22,7 +22,10 @@ module LicenseAcceptance
       def no_persist?
         value == ACCEPT_NO_PERSIST
       end
-    end
 
+      def value?
+        !!value
+      end
+    end
   end
 end

data/lib/license_acceptance/version.rb

@@ -1,3 +1,3 @@
 module LicenseAcceptance
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: license-acceptance
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - tyler-ball
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel