license-acceptance 1.0.18 → 2.1.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 857078f9f2d4c9d74fcb5a08876039fa5930c3f7286b1a7d03e2a84bda4d229b
4
- data.tar.gz: c7c4d34ac946733f0f980f33d1b5fd0dd518e1c8fc1927a9a406580f3ac491c0
3
+ metadata.gz: 19afa6b91e05cf1154cfff732b5f3087c3596a82ed06396519479e3dc1382013
4
+ data.tar.gz: 5ce668d4c66b2760304b5a29fba485a71be8c9001666e8df1d822b768adfcdc5
5
5
  SHA512:
6
- metadata.gz: c813cf96544c839b605631e587cad4ee3e798d6950022f454e417ac5f83234e969418f0d500f69ee730a102a046e5f20bf97782582fde203d58815d9dae30c9a
7
- data.tar.gz: 6b497916918c9537c1cc234e6abace8ed448713640ac937b34593a8ac69b93bec72cfe4cca184514b4fe667203c5ec9af1546b1dcaf696a23d3318a47c37b4dd
6
+ metadata.gz: b021343e3b27845e52f9e747919441bf6770bcc118f215b0dbbe34db1b59e7a42bef47da0202db8b4eec0fe237415a0426d343d395d9691f72fdf1dd3949742a
7
+ data.tar.gz: 597052f9ac8275ffd6d33cf80a2ae14aa1db7d1a6976800ee330e02d343a9df6b27df7f033cc566e64a13921f9dcbc73d36dc2bc21b7880532565d09446391eb
data/Gemfile CHANGED
@@ -1,6 +1,22 @@
1
1
  source "https://rubygems.org"
2
2
 
3
- git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
3
+ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
4
4
 
5
5
  # Specify your gem's dependencies in license-acceptance.gemspec
6
6
  gemspec
7
+
8
+ group :development do
9
+ gem "chefstyle", "1.5.7"
10
+ gem "climate_control", "~> 0.2"
11
+ gem "mixlib-cli", "~> 2.1"
12
+ gem "rake", ">= 10.1.0"
13
+ gem "rspec", "~> 3.0"
14
+ gem "thor", ">= 0.20", "< 2.0" # validate 2.0 when it ships
15
+ end
16
+
17
+ group :debug do
18
+ gem "pry"
19
+ gem "pry-byebug"
20
+ gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
21
+ gem "rb-readline"
22
+ end
@@ -1,19 +1,19 @@
1
- require "forwardable"
2
- require "license_acceptance/config"
3
- require "license_acceptance/logger"
4
- require "license_acceptance/product_reader"
5
- require "license_acceptance/product_relationship"
6
- require "license_acceptance/strategy/environment"
7
- require "license_acceptance/strategy/file"
8
- require "license_acceptance/strategy/argument"
9
- require "license_acceptance/strategy/prompt"
10
- require "license_acceptance/strategy/provided_value"
1
+ require "forwardable" unless defined?(Forwardable)
2
+ require_relative "config"
3
+ require_relative "logger"
4
+ require_relative "product_reader"
5
+ require_relative "product_relationship"
6
+ require_relative "strategy/environment"
7
+ require_relative "strategy/file"
8
+ require_relative "strategy/argument"
9
+ require_relative "strategy/prompt"
10
+ require_relative "strategy/provided_value"
11
11
 
12
12
  module LicenseAcceptance
13
13
 
14
- ACCEPT = "accept"
15
- ACCEPT_SILENT = "accept-silent"
16
- ACCEPT_NO_PERSIST = "accept-no-persist"
14
+ ACCEPT = "accept".freeze
15
+ ACCEPT_SILENT = "accept-silent".freeze
16
+ ACCEPT_NO_PERSIST = "accept-no-persist".freeze
17
17
 
18
18
  class Acceptor
19
19
  extend Forwardable
@@ -21,7 +21,7 @@ module LicenseAcceptance
21
21
 
22
22
  attr_reader :config, :product_reader, :env_strategy, :file_strategy, :arg_strategy, :prompt_strategy, :provided_strategy
23
23
 
24
- def initialize(opts={})
24
+ def initialize(opts = {})
25
25
  @config = Config.new(opts)
26
26
  Logger.initialize(config.logger)
27
27
  @product_reader = ProductReader.new
@@ -75,37 +75,48 @@ module LicenseAcceptance
75
75
  end
76
76
  @acceptance_value = accepted_silent? ? ACCEPT_SILENT : ACCEPT
77
77
  return true
78
- elsif config.output.isatty && prompt_strategy.request(missing_licenses) do
79
- # We have to infer the acceptance value if they use the prompt to accept
80
- if config.persist
81
- @acceptance_value = ACCEPT
82
- file_strategy.persist(product_relationship, missing_licenses)
83
- else
84
- @acceptance_value = ACCEPT_NO_PERSIST
85
- []
86
- end
87
- end
88
- return true
89
- else
78
+ end
79
+
80
+ if acceptance_value_provided?
81
+ value = provided_strategy.value || env_strategy.value || arg_strategy.value
82
+ output.puts("Unrecognized license acceptance value '#{value}', expected one of: '#{ACCEPT}', '#{ACCEPT_SILENT}', '#{ACCEPT_NO_PERSIST}'")
90
83
  raise LicenseNotAcceptedError.new(product_relationship.parent, missing_licenses)
91
84
  end
85
+
86
+ return true if output.isatty && accepted_license_prompt?(product_relationship, missing_licenses)
87
+
88
+ raise LicenseNotAcceptedError.new(product_relationship.parent, missing_licenses)
92
89
  end
93
90
 
94
- def self.check_and_persist!(product_id, version, opts={})
91
+ def self.check_and_persist!(product_id, version, opts = {})
95
92
  new(opts).check_and_persist!(product_id, version)
96
93
  end
97
94
 
98
- def self.check_and_persist(product_id, version, opts={})
95
+ def self.check_and_persist(product_id, version, opts = {})
99
96
  new(opts).check_and_persist(product_id, version)
100
97
  end
101
98
 
99
+ def accepted_license_prompt?(product_relationship, missing_licenses)
100
+ prompt_strategy.request(missing_licenses) do
101
+ # We have to infer the acceptance value if they use the prompt to accept
102
+ if config.persist
103
+ @acceptance_value = ACCEPT
104
+ file_strategy.persist(product_relationship, missing_licenses)
105
+ else
106
+ @acceptance_value = ACCEPT_NO_PERSIST
107
+ []
108
+ end
109
+ end
110
+ end
111
+
102
112
  # Check whether the specified product requires license acceptance for the given version.
103
113
  def license_required?(mixlib_name, version)
104
114
  product = product_reader.lookup_by_mixlib(mixlib_name)
105
115
  return false if product.nil?
106
116
  # If they don't pass a version we assume they want latest
107
117
  # All versions in all channels require license acceptance
108
- return true if ["latest", "unstable", "current", "stable"].include?(version.to_s) || version.nil?
118
+ return true if %w{latest unstable current stable}.include?(version.to_s) || version.nil?
119
+
109
120
  Gem::Version.new(version) >= Gem::Version.new(product.license_required_version)
110
121
  end
111
122
 
@@ -114,6 +125,7 @@ module LicenseAcceptance
114
125
  def id_from_mixlib(mixlib_name)
115
126
  product = product_reader.lookup_by_mixlib(mixlib_name)
116
127
  return nil if product.nil?
128
+
117
129
  product.id
118
130
  end
119
131
 
@@ -138,23 +150,27 @@ module LicenseAcceptance
138
150
  provided_strategy.silent? || env_strategy.silent? || arg_strategy.silent?
139
151
  end
140
152
 
153
+ def acceptance_value_provided?
154
+ provided_strategy.value? || env_strategy.value? || arg_strategy.value?
155
+ end
156
+
141
157
  # In the case where users accept with a command line argument or environment variable
142
158
  # we still want to output the fact that the filesystem was changed.
143
159
  def output_num_persisted(count)
144
- s = count > 1 ? "s": ""
160
+ s = count > 1 ? "s" : ""
145
161
  output.puts <<~EOM
146
- #{Strategy::Prompt::BORDER}
147
- #{Strategy::Prompt::CHECK} #{count} product license#{s} accepted.
148
- #{Strategy::Prompt::BORDER}
162
+ #{Strategy::Prompt::BORDER}
163
+ #{Strategy::Prompt::CHECK} #{count} product license#{s} accepted.
164
+ #{Strategy::Prompt::BORDER}
149
165
  EOM
150
166
  end
151
167
 
152
168
  def output_persist_failed(errs)
153
169
  output.puts <<~EOM
154
- #{Strategy::Prompt::BORDER}
155
- #{Strategy::Prompt::CHECK} Product license accepted.
156
- Could not persist acceptance:\n\t* #{errs.map(&:message).join("\n\t* ")}
157
- #{Strategy::Prompt::BORDER}
170
+ #{Strategy::Prompt::BORDER}
171
+ #{Strategy::Prompt::CHECK} Product license accepted.
172
+ Could not persist acceptance:\n\t* #{errs.map(&:message).join("\n\t* ")}
173
+ #{Strategy::Prompt::BORDER}
158
174
  EOM
159
175
  end
160
176
 
@@ -1,6 +1,6 @@
1
1
  begin
2
- require 'mixlib/cli'
3
- rescue => exception
2
+ require "mixlib/cli" unless defined?(Mixlib::CLI)
3
+ rescue
4
4
  raise "Must have mixlib-cli gem installed to use this mixin"
5
5
  end
6
6
 
@@ -1,6 +1,6 @@
1
1
  begin
2
- require 'thor'
3
- rescue => exception
2
+ require "thor" unless defined?(Thor)
3
+ rescue
4
4
  raise "Must have thor gem installed to use this mixin"
5
5
  end
6
6
 
@@ -12,7 +12,7 @@ module LicenseAcceptance
12
12
  def self.included(klass)
13
13
  klass.class_option :chef_license,
14
14
  type: :string,
15
- desc: 'Accept the license for this product and any contained products: accept, accept-no-persist, accept-silent'
15
+ desc: "Accept the license for this product and any contained products: accept, accept-no-persist, accept-silent"
16
16
  end
17
17
 
18
18
  end
@@ -1,10 +1,10 @@
1
- require 'logger'
1
+ require "logger"
2
2
 
3
3
  module LicenseAcceptance
4
4
  class Config
5
5
  attr_accessor :output, :logger, :license_locations, :persist_location, :persist
6
6
 
7
- def initialize(opts={})
7
+ def initialize(opts = {})
8
8
  @output = opts.fetch(:output, $stdout)
9
9
  @logger = opts.fetch(:logger, ::Logger.new(IO::NULL))
10
10
  @license_locations = opts.fetch(:license_locations, default_license_locations)
@@ -21,7 +21,7 @@ module LicenseAcceptance
21
21
 
22
22
  def default_license_locations
23
23
  if windows?
24
- root = ENV.fetch("SYSTEMDRIVE","C:")
24
+ root = ENV.fetch("SYSTEMDRIVE", "C:")
25
25
  l = [ File.join(root, "chef/accepted_licenses/") ]
26
26
  unless is_root?
27
27
  # Look through a list of possible user locations and pick the first one that exists
@@ -32,6 +32,7 @@ module LicenseAcceptance
32
32
  possible_dirs << ENV["HOMESHARE"] + ENV["HOMEPATH"] if ENV["HOMESHARE"] && ENV["HOMEPATH"]
33
33
  possible_dirs << ENV["USERPROFILE"] if ENV["USERPROFILE"]
34
34
  raise NoValidEnvironmentVar if possible_dirs.empty?
35
+
35
36
  possible_dirs.each do |possible_dir|
36
37
  if Dir.exist?(possible_dir)
37
38
  full_possible_dir = File.join(possible_dir, ".chef/accepted_licenses/")
@@ -42,7 +43,7 @@ module LicenseAcceptance
42
43
  end
43
44
  else
44
45
  l = [ "/etc/chef/accepted_licenses/" ]
45
- l << File.join(ENV['HOME'], ".chef/accepted_licenses/") unless is_root?
46
+ l << File.join(ENV["HOME"], ".chef/accepted_licenses/") unless is_root?
46
47
  end
47
48
  l
48
49
  end
@@ -1,4 +1,4 @@
1
- require "license_acceptance/config"
1
+ require_relative "config"
2
2
 
3
3
  module LicenseAcceptance
4
4
  module Logger
@@ -14,14 +14,16 @@ module LicenseAcceptance
14
14
 
15
15
  def ==(other)
16
16
  return false if other.class != Product
17
+
17
18
  if other.id == id &&
18
- other.pretty_name == pretty_name &&
19
- other.filename == filename &&
20
- other.mixlib_name == mixlib_name
21
- other.license_required_version == license_required_version
22
- return true
19
+ other.pretty_name == pretty_name &&
20
+ other.filename == filename &&
21
+ other.mixlib_name == mixlib_name &&
22
+ other.license_required_version == license_required_version
23
+ return true
23
24
  end
24
- return false
25
+
26
+ false
25
27
  end
26
28
 
27
29
  end
@@ -1,7 +1,7 @@
1
- require "tomlrb"
2
- require "license_acceptance/logger"
3
- require "license_acceptance/product"
4
- require "license_acceptance/product_relationship"
1
+ autoload :Tomlrb, "tomlrb"
2
+ require_relative "logger"
3
+ require_relative "product"
4
+ require_relative "product_relationship"
5
5
 
6
6
  module LicenseAcceptance
7
7
  class ProductReader
@@ -18,7 +18,7 @@ module LicenseAcceptance
18
18
  toml = Tomlrb.load_file(location, symbolize_keys: false)
19
19
  raise InvalidProductInfo.new(location) if toml.empty? || toml["products"].nil? || toml["relationships"].nil?
20
20
 
21
- for product in toml["products"]
21
+ toml["products"].each do |product|
22
22
  products[product["id"]] = Product.new(
23
23
  product["id"], product["pretty_name"],
24
24
  product["filename"], product["mixlib_name"],
@@ -26,7 +26,7 @@ module LicenseAcceptance
26
26
  )
27
27
  end
28
28
 
29
- for parent_id, children in toml["relationships"]
29
+ toml["relationships"].each do |parent_id, children|
30
30
  parent = products[parent_id]
31
31
  raise UnknownParent.new(parent_id) if parent.nil?
32
32
  # Its fine to not have a relationship entry, but not fine to have
@@ -34,9 +34,11 @@ module LicenseAcceptance
34
34
  if children.nil? || children.empty? || !children.is_a?(Array)
35
35
  raise NoChildRelationships.new(parent)
36
36
  end
37
+
37
38
  children.map! do |child_id|
38
39
  child = products[child_id]
39
40
  raise UnknownChild.new(child_id) if child.nil?
41
+
40
42
  child
41
43
  end
42
44
  relationships[parent] = children
@@ -52,6 +54,7 @@ module LicenseAcceptance
52
54
  if ENV["CHEF_LICENSE_PRODUCT_INFO"]
53
55
  return ENV["CHEF_LICENSE_PRODUCT_INFO"]
54
56
  end
57
+
55
58
  File.absolute_path(File.join(__FILE__, "../../../config/product_info.toml"))
56
59
  end
57
60
 
@@ -60,9 +63,10 @@ module LicenseAcceptance
60
63
  raise UnknownProduct.new(parent_id)
61
64
  end
62
65
  children = relationships.fetch(parent_product, [])
63
- if !parent_version.is_a? String
66
+ unless parent_version.is_a? String
64
67
  raise ProductVersionTypeError.new(parent_version)
65
68
  end
69
+
66
70
  ProductRelationship.new(parent_product, children, parent_version)
67
71
  end
68
72
 
@@ -1,4 +1,4 @@
1
- require "license_acceptance/strategy/base"
1
+ require_relative "base"
2
2
 
3
3
  module LicenseAcceptance
4
4
  module Strategy
@@ -6,6 +6,8 @@ module LicenseAcceptance
6
6
  # Look for acceptance values in the ARGV
7
7
  class Argument < Base
8
8
 
9
+ FLAG = "--chef-license".freeze
10
+
9
11
  attr_reader :argv
10
12
 
11
13
  def initialize(argv)
@@ -13,31 +15,30 @@ module LicenseAcceptance
13
15
  end
14
16
 
15
17
  def accepted?
16
- look_for_value(ACCEPT)
18
+ String(value).downcase == ACCEPT
17
19
  end
18
20
 
19
21
  def silent?
20
- look_for_value(ACCEPT_SILENT)
22
+ String(value).downcase == ACCEPT_SILENT
21
23
  end
22
24
 
23
25
  def no_persist?
24
- look_for_value(ACCEPT_NO_PERSIST)
26
+ String(value).downcase == ACCEPT_NO_PERSIST
25
27
  end
26
28
 
27
- private
29
+ def value?
30
+ argv.any? { |s| s == FLAG || s.start_with?("#{FLAG}=") }
31
+ end
28
32
 
29
- def look_for_value(sought)
30
- if argv.include?("--chef-license=#{sought}")
31
- return true
32
- end
33
- i = argv.index("--chef-license")
34
- unless i.nil?
35
- val = argv[i+1]
36
- if val != nil && val.downcase == sought
37
- return true
38
- end
33
+ def value
34
+ match = argv.detect { |s| s.start_with?("#{FLAG}=") }
35
+ return match.split("=").last if match
36
+
37
+ argv.each_cons(2) do |arg, value|
38
+ return value if arg == FLAG
39
39
  end
40
- return false
40
+
41
+ nil
41
42
  end
42
43
  end
43
44
  end
@@ -1,4 +1,4 @@
1
- require "license_acceptance/strategy/base"
1
+ require_relative "base"
2
2
 
3
3
  module LicenseAcceptance
4
4
  module Strategy
@@ -6,6 +6,8 @@ module LicenseAcceptance
6
6
  # Look for acceptance values in the environment
7
7
  class Environment < Base
8
8
 
9
+ ENV_KEY = "CHEF_LICENSE".freeze
10
+
9
11
  attr_reader :env
10
12
 
11
13
  def initialize(env)
@@ -13,24 +15,23 @@ module LicenseAcceptance
13
15
  end
14
16
 
15
17
  def accepted?
16
- look_for_value(ACCEPT)
18
+ String(value).downcase == ACCEPT
17
19
  end
18
20
 
19
21
  def silent?
20
- look_for_value(ACCEPT_SILENT)
22
+ String(value).downcase == ACCEPT_SILENT
21
23
  end
22
24
 
23
25
  def no_persist?
24
- look_for_value(ACCEPT_NO_PERSIST)
26
+ String(value).downcase == ACCEPT_NO_PERSIST
25
27
  end
26
28
 
27
- private
29
+ def value?
30
+ env.key?(ENV_KEY)
31
+ end
28
32
 
29
- def look_for_value(sought)
30
- if env['CHEF_LICENSE'] && env['CHEF_LICENSE'].downcase == sought
31
- return true
32
- end
33
- return false
33
+ def value
34
+ env[ENV_KEY]
34
35
  end
35
36
 
36
37
  end
@@ -1,9 +1,9 @@
1
- require 'date'
2
- require 'yaml'
3
- require 'fileutils'
4
- require 'etc'
5
- require "license_acceptance/logger"
6
- require "license_acceptance/strategy/base"
1
+ require "date"
2
+ autoload :YAML, "yaml"
3
+ require "fileutils" unless defined?(FileUtils)
4
+ require "etc" unless defined?(Etc)
5
+ require_relative "../logger"
6
+ require_relative "base"
7
7
 
8
8
  module LicenseAcceptance
9
9
  module Strategy
@@ -28,11 +28,9 @@ module LicenseAcceptance
28
28
  logger.debug("Searching for the following licenses: #{missing_licenses.map(&:id)}")
29
29
 
30
30
  searching.each do |product|
31
- found = false
32
31
  config.license_locations.each do |loc|
33
32
  f = ::File.join(loc, product.filename)
34
33
  if ::File.exist?(f)
35
- found = true
36
34
  logger.debug("Found license #{product.filename} at #{f}")
37
35
  missing_licenses.delete(product)
38
36
  break
@@ -49,7 +47,7 @@ module LicenseAcceptance
49
47
  parent_version = product_relationship.parent_version
50
48
  root_dir = config.persist_location
51
49
 
52
- if !Dir.exist?(root_dir)
50
+ unless Dir.exist?(root_dir)
53
51
  begin
54
52
  FileUtils.mkdir_p(root_dir)
55
53
  rescue StandardError => e
@@ -70,7 +68,7 @@ module LicenseAcceptance
70
68
  errs << err unless err.nil?
71
69
  end
72
70
  end
73
- return errs
71
+ errs
74
72
  end
75
73
 
76
74
  private
@@ -91,11 +89,11 @@ module LicenseAcceptance
91
89
  contents = Hash[contents.map { |k, v| [k.to_s, v] }]
92
90
  license_file << YAML.dump(contents)
93
91
  end
94
- return nil
92
+ nil
95
93
  rescue StandardError => e
96
94
  msg = "Could not persist license to #{path}"
97
95
  logger.info "#{msg}\n\t#{e.message}\n\t#{e.backtrace.join("\n\t")}"
98
- return e
96
+ e
99
97
  end
100
98
 
101
99
  end
@@ -1,13 +1,13 @@
1
- require 'tty-prompt'
2
- require 'pastel'
3
- require "license_acceptance/logger"
4
- require "license_acceptance/strategy/base"
5
- require "timeout"
1
+ autoload :TTY, "tty-prompt"
2
+ require "pastel" unless defined?(Pastel)
3
+ require_relative "../logger"
4
+ require_relative "base"
5
+ require "timeout" unless defined?(Timeout)
6
6
 
7
7
  module LicenseAcceptance
8
8
  module Strategy
9
9
 
10
- # Interactive prompt for accepting and persistnce license acceptance, or failing with custom exit code
10
+ # Interactive prompt for accepting and persistence license acceptance, or failing with custom exit code
11
11
  class Prompt < Base
12
12
  include Logger
13
13
 
@@ -17,30 +17,30 @@ module LicenseAcceptance
17
17
  @output = config.output
18
18
  end
19
19
 
20
- WIDTH = 50.freeze
20
+ WIDTH = 50
21
21
  PASTEL = Pastel.new
22
22
  BORDER = "+---------------------------------------------+".freeze
23
23
  YES = PASTEL.green.bold("yes")
24
- CHECK = PASTEL.green("✔")
24
+ CHECK = PASTEL.green("✔")
25
25
 
26
26
  def request(missing_licenses, &persist_callback)
27
27
  logger.debug("Requesting a license for #{missing_licenses.map(&:id)}")
28
28
  c = missing_licenses.size
29
- s = c > 1 ? "s": ""
29
+ s = c > 1 ? "s" : ""
30
30
 
31
31
  acceptance_question = "Do you accept the #{c} product license#{s} (#{YES}/no)?"
32
32
  output.puts <<~EOM
33
- #{BORDER}
34
- Chef License Acceptance
33
+ #{BORDER}
34
+ Chef License Acceptance
35
35
 
36
- Before you can continue, #{c} product license#{s}
37
- must be accepted. View the license at
38
- https://www.chef.io/end-user-license-agreement/
36
+ Before you can continue, #{c} product license#{s}
37
+ must be accepted. View the license at
38
+ https://www.chef.io/end-user-license-agreement/
39
39
 
40
- License#{s} that need accepting:
41
- * #{missing_licenses.map(&:pretty_name).join("\n * ")}
40
+ License#{s} that need accepting:
41
+ * #{missing_licenses.map(&:pretty_name).join("\n * ")}
42
42
 
43
- #{acceptance_question}
43
+ #{acceptance_question}
44
44
 
45
45
  EOM
46
46
 
@@ -51,10 +51,10 @@ module LicenseAcceptance
51
51
 
52
52
  output.puts <<~EOM
53
53
 
54
- If you do not accept this license you will
55
- not be able to use Chef products.
54
+ If you do not accept this license you will
55
+ not be able to use Chef products.
56
56
 
57
- #{acceptance_question}
57
+ #{acceptance_question}
58
58
 
59
59
  EOM
60
60
 
@@ -62,7 +62,7 @@ module LicenseAcceptance
62
62
  if answer != "yes"
63
63
  output.puts BORDER
64
64
  end
65
- return answer
65
+ answer
66
66
  end
67
67
 
68
68
  private
@@ -73,12 +73,12 @@ module LicenseAcceptance
73
73
 
74
74
  answer = "no"
75
75
  begin
76
- Timeout::timeout(60, PromptTimeout) do
76
+ Timeout.timeout(60, PromptTimeout) do
77
77
  answer = prompt.ask(">") do |q|
78
78
  q.modify :down, :trim
79
79
  q.required true
80
80
  q.messages[:required?] = "You must enter 'yes' or 'no'"
81
- q.validate /^\s*(yes|no)\s*$/i
81
+ q.validate(/^\s*(yes|no)\s*$/i)
82
82
  q.messages[:valid?] = "You must enter 'yes' or 'no'"
83
83
  end
84
84
  end
@@ -95,13 +95,13 @@ module LicenseAcceptance
95
95
  output.puts "#{CHECK} #{c} product license#{s} persisted.\n\n"
96
96
  else
97
97
  output.puts <<~EOM
98
- #{CHECK} #{c} product license#{s} accepted.
99
- Could not persist acceptance:\n\t* #{errs.map(&:message).join("\n\t* ")}
98
+ #{CHECK} #{c} product license#{s} accepted.
99
+ Could not persist acceptance:\n\t* #{errs.map(&:message).join("\n\t* ")}
100
100
  EOM
101
101
  end
102
102
  return true
103
103
  end
104
- return false
104
+ false
105
105
  end
106
106
  end
107
107
 
@@ -1,4 +1,4 @@
1
- require "license_acceptance/strategy/base"
1
+ require_relative "base"
2
2
 
3
3
  module LicenseAcceptance
4
4
  module Strategy
@@ -12,17 +12,20 @@ module LicenseAcceptance
12
12
  end
13
13
 
14
14
  def accepted?
15
- value == ACCEPT
15
+ String(value).downcase == ACCEPT
16
16
  end
17
17
 
18
18
  def silent?
19
- value == ACCEPT_SILENT
19
+ String(value).downcase == ACCEPT_SILENT
20
20
  end
21
21
 
22
22
  def no_persist?
23
- value == ACCEPT_NO_PERSIST
23
+ String(value).downcase == ACCEPT_NO_PERSIST
24
24
  end
25
- end
26
25
 
26
+ def value?
27
+ !!value
28
+ end
29
+ end
27
30
  end
28
31
  end
@@ -1,3 +1,3 @@
1
1
  module LicenseAcceptance
2
- VERSION = "1.0.18"
2
+ VERSION = "2.1.13".freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: license-acceptance
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.18
4
+ version: 2.1.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - tyler-ball
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-03-14 00:00:00.000000000 Z
11
+ date: 2020-12-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pastel
@@ -28,162 +28,50 @@ dependencies:
28
28
  name: tomlrb
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '1.2'
34
+ - - "<"
35
+ - !ruby/object:Gem::Version
36
+ version: '3.0'
34
37
  type: :runtime
35
38
  prerelease: false
36
39
  version_requirements: !ruby/object:Gem::Requirement
37
40
  requirements:
38
- - - "~>"
41
+ - - ">="
39
42
  - !ruby/object:Gem::Version
40
43
  version: '1.2'
44
+ - - "<"
45
+ - !ruby/object:Gem::Version
46
+ version: '3.0'
41
47
  - !ruby/object:Gem::Dependency
42
48
  name: tty-box
43
49
  requirement: !ruby/object:Gem::Requirement
44
50
  requirements:
45
51
  - - "~>"
46
52
  - !ruby/object:Gem::Version
47
- version: '0.3'
53
+ version: '0.6'
48
54
  type: :runtime
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
51
57
  requirements:
52
58
  - - "~>"
53
59
  - !ruby/object:Gem::Version
54
- version: '0.3'
60
+ version: '0.6'
55
61
  - !ruby/object:Gem::Dependency
56
62
  name: tty-prompt
57
63
  requirement: !ruby/object:Gem::Requirement
58
64
  requirements:
59
65
  - - "~>"
60
66
  - !ruby/object:Gem::Version
61
- version: '0.18'
67
+ version: '0.20'
62
68
  type: :runtime
63
69
  prerelease: false
64
70
  version_requirements: !ruby/object:Gem::Requirement
65
71
  requirements:
66
72
  - - "~>"
67
- - !ruby/object:Gem::Version
68
- version: '0.18'
69
- - !ruby/object:Gem::Dependency
70
- name: rake
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - "~>"
74
- - !ruby/object:Gem::Version
75
- version: '13.0'
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - "~>"
81
- - !ruby/object:Gem::Version
82
- version: '13.0'
83
- - !ruby/object:Gem::Dependency
84
- name: rspec
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - "~>"
88
- - !ruby/object:Gem::Version
89
- version: '3.0'
90
- type: :development
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - "~>"
95
- - !ruby/object:Gem::Version
96
- version: '3.0'
97
- - !ruby/object:Gem::Dependency
98
- name: pry
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - "~>"
102
- - !ruby/object:Gem::Version
103
- version: '0.12'
104
- type: :development
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - "~>"
109
- - !ruby/object:Gem::Version
110
- version: '0.12'
111
- - !ruby/object:Gem::Dependency
112
- name: pry-byebug
113
- requirement: !ruby/object:Gem::Requirement
114
- requirements:
115
- - - "~>"
116
- - !ruby/object:Gem::Version
117
- version: '3.6'
118
- type: :development
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - "~>"
123
- - !ruby/object:Gem::Version
124
- version: '3.6'
125
- - !ruby/object:Gem::Dependency
126
- name: pry-stack_explorer
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - "~>"
130
- - !ruby/object:Gem::Version
131
- version: '0.4'
132
- type: :development
133
- prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - "~>"
137
- - !ruby/object:Gem::Version
138
- version: '0.4'
139
- - !ruby/object:Gem::Dependency
140
- name: mixlib-cli
141
- requirement: !ruby/object:Gem::Requirement
142
- requirements:
143
- - - "~>"
144
- - !ruby/object:Gem::Version
145
- version: '1.7'
146
- type: :development
147
- prerelease: false
148
- version_requirements: !ruby/object:Gem::Requirement
149
- requirements:
150
- - - "~>"
151
- - !ruby/object:Gem::Version
152
- version: '1.7'
153
- - !ruby/object:Gem::Dependency
154
- name: thor
155
- requirement: !ruby/object:Gem::Requirement
156
- requirements:
157
- - - ">="
158
- - !ruby/object:Gem::Version
159
- version: '0.20'
160
- - - "<"
161
- - !ruby/object:Gem::Version
162
- version: '2.0'
163
- type: :development
164
- prerelease: false
165
- version_requirements: !ruby/object:Gem::Requirement
166
- requirements:
167
- - - ">="
168
73
  - !ruby/object:Gem::Version
169
74
  version: '0.20'
170
- - - "<"
171
- - !ruby/object:Gem::Version
172
- version: '2.0'
173
- - !ruby/object:Gem::Dependency
174
- name: climate_control
175
- requirement: !ruby/object:Gem::Requirement
176
- requirements:
177
- - - "~>"
178
- - !ruby/object:Gem::Version
179
- version: '0.2'
180
- type: :development
181
- prerelease: false
182
- version_requirements: !ruby/object:Gem::Requirement
183
- requirements:
184
- - - "~>"
185
- - !ruby/object:Gem::Version
186
- version: '0.2'
187
75
  description: Chef End User License Agreement Acceptance for Ruby products
188
76
  email:
189
77
  - tball@chef.io
@@ -221,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
221
109
  requirements:
222
110
  - - ">="
223
111
  - !ruby/object:Gem::Version
224
- version: '2.3'
112
+ version: '2.4'
225
113
  required_rubygems_version: !ruby/object:Gem::Requirement
226
114
  requirements:
227
115
  - - ">="