license-acceptance 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ae4a25ff89f94b78498d69d0d5805a243e065cc2e622e4ec08f2acf8294345d
-  data.tar.gz: b994a62576a2e0c24694f916d3e4672f556077d8882bb52aa853706ef1e4e9c3
+  metadata.gz: f86114ca5b22ab56cb28a423f3c60cd092241b8541bbf569002a5003e08da1f7
+  data.tar.gz: 1347d3b7392ecbb2730b8fb4b5a7039efede80f8518443bd816b307af0c986e4
 SHA512:
-  metadata.gz: c6d8d023638ba548846b92b27e166a7ff2683b96b59eb5513b71c28ebbd46792dfd755e46893409e02dfbf4ce83dcee28e60e4c26716078fbe122b465553d399
-  data.tar.gz: d4501d2b154e6fcf8dabdc1a40c689d2bb575ea09f0f61b1f3ccbb5775609808ac6543fc6f9ed9bbee262fc085ddc634ecc4f3732a01cc17e951422162fdcded
+  metadata.gz: d8bbb8bae60146e0736abdc9b7492b69c0b822936f13411b9159b7267d341910f2a6d6a76dd9f2e5120b7e7bb7568c88c0a8b0a9ed61d1e99b7c11f0ca0757fd
+  data.tar.gz: b829ddf04523ec275a961449befde2f0b978e313e0264c799a77659a13fa95ff6d3b17bf00a3a5dc768867d8b1bb652fa9dbfc94746a49c5aa8834b1fce5be89

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    license-acceptance (0.1.0)
-      pastel (>= 0.7)
+    license-acceptance (0.2.5)
+      pastel (~> 0.7)
       tomlrb (~> 1.2)
-      tty-box (>= 0.3)
-      tty-platform (>= 0.2)
-      tty-prompt (>= 0.18)
+      tty-box (~> 0.3)
+      tty-prompt (~> 0.18)
 
 GEM
   remote: https://rubygems.org/
@@ -20,7 +19,7 @@ GEM
     diff-lcs (1.3)
     equatable (0.5.0)
     method_source (0.9.2)
-    mixlib-cli (2.0.3)
+    mixlib-cli (1.7.0)
     necromancer (0.4.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
@@ -34,7 +33,7 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    rake (12.3.2)
+    rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -48,10 +47,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    strings (0.1.4)
-      strings-ansi (~> 0.1.0)
-      unicode-display_width (~> 1.4.0)
-      unicode_utils (~> 1.4.0)
+    strings (0.1.5)
+      strings-ansi (~> 0.1)
+      unicode-display_width (~> 1.5)
+      unicode_utils (~> 1.4)
     strings-ansi (0.1.0)
     thor (0.20.3)
     timers (4.3.0)
@@ -62,7 +61,6 @@ GEM
       tty-cursor (~> 0.6.0)
     tty-color (0.4.3)
     tty-cursor (0.6.1)
-    tty-platform (0.2.0)
     tty-prompt (0.18.1)
       necromancer (~> 0.4.0)
       pastel (~> 0.7.0)
@@ -74,7 +72,7 @@ GEM
       tty-screen (~> 0.6.4)
       wisper (~> 2.0.0)
     tty-screen (0.6.5)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     unicode_utils (1.4.0)
     wisper (2.0.0)
 
@@ -82,16 +80,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.17)
-  climate_control (>= 0.2)
+  climate_control (~> 0.2)
   license-acceptance!
-  mixlib-cli (>= 1.7)
-  pry (>= 0.12)
-  pry-byebug (>= 3.6)
-  pry-stack_explorer (>= 0.4)
-  rake (>= 10.0)
-  rspec (>= 3.0)
-  thor (>= 0.20)
+  mixlib-cli (~> 1.7)
+  pry (~> 0.12)
+  pry-byebug (~> 3.6)
+  pry-stack_explorer (~> 0.4)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  thor (~> 0.20)
 
 BUNDLED WITH
    1.17.3

data/config/product_info.toml

@@ -1 +1,28 @@
 # DO NOT CHANGE - overwritten by expeditor at build time
+title = "All known products that require license acceptance, and the mapping of parent to child relationships"
+
+[[products]]
+name = "chef-client"
+pretty_name = "Chef Client"
+hab_pkg_id = "chef/chef-client"
+filename = "chef_client"
+
+[[products]]
+name = "inspec"
+pretty_name = "InSpec"
+hab_pkg_id = "chef/inspec"
+filename = "inspec"
+
+[[products]]
+name = "supermarket"
+pretty_name = "Supermarket"
+filename = "supermarket"
+
+[[products]]
+name = "chef-server"
+pretty_name = "Chef Server"
+hab_pkg_id = "chef/oc_erchef"
+filename = "chef_server"
+
+[relationships]
+"chef-client" = ["inspec"]

data/lib/license_acceptance/config.rb

@@ -1,5 +1,4 @@
 require 'logger'
-require 'tty-platform'
 
 module LicenseAcceptance
   class Config
@@ -16,16 +15,12 @@ module LicenseAcceptance
 
     private
 
-    def platform
-      @platform ||= TTY::Platform.new
-    end
-
     def is_root?
       Process.uid == 0
     end
 
     def default_license_locations
-      if platform.windows?
+      if windows?
         l = [ File.join(ENV["HOMEDRIVE"], "chef/accepted_licenses/") ]
         unless is_root?
           # Look through a list of possible user locations and pick the first one that exists
@@ -55,6 +50,10 @@ module LicenseAcceptance
       license_locations[-1]
     end
 
+    def windows?
+      !!(RUBY_PLATFORM =~ /(cygwin|mswin|mingw|bccwin|wince|emx)/i)
+    end
+
   end
 
   class NoValidEnvironmentVar < StandardError

data/lib/license_acceptance/prompt_acceptance.rb

@@ -68,13 +68,15 @@ module LicenseAcceptance
       prompt = TTY::Prompt.new(track_history: false, active_color: :bold, interrupt: :exit, output: output)
 
       answer = "no"
-      Timeout::timeout(60, PromptTimeout) do
-        answer = prompt.ask(">") do |q|
-          q.modify :down, :trim
-          q.required true
-          q.messages[:required?] = "You must enter 'yes' or 'no'"
-          q.validate /^\s*(yes|no)\s*$/i
-          q.messages[:valid?] = "You must enter 'yes' or 'no'"
+      begin
+        Timeout::timeout(60, PromptTimeout) do
+          answer = prompt.ask(">") do |q|
+            q.modify :down, :trim
+            q.required true
+            q.messages[:required?] = "You must enter 'yes' or 'no'"
+            q.validate /^\s*(yes|no)\s*$/i
+            q.messages[:valid?] = "You must enter 'yes' or 'no'"
+          end
         end
       rescue PromptTimeout
         prompt.unsubscribe(prompt.reader)

data/lib/license_acceptance/version.rb

@@ -1,3 +1,3 @@
 module LicenseAcceptance
-  VERSION = "0.2.1"
+  VERSION = "0.2.6"
 end

data/spec/license_acceptance/config_spec.rb

@@ -6,7 +6,6 @@ require "license_acceptance/product_relationship"
 RSpec.describe LicenseAcceptance::Config do
   let(:opts) { {} }
   let(:config) { LicenseAcceptance::Config.new(opts) }
-  let(:platform) { instance_double(TTY::Platform) }
 
   it "loads correctly with default values" do
     config
@@ -31,13 +30,12 @@ RSpec.describe LicenseAcceptance::Config do
 
   describe "#default_license_locations and #default_persist_location" do
     before do
-      expect(TTY::Platform).to receive(:new).and_return(platform)
       expect(Process).to receive(:uid).and_return(uid)
     end
 
     describe "when platform is Windows" do
       before do
-        expect(platform).to receive(:windows?).and_return(true)
+        stub_const("RUBY_PLATFORM", "mingw")
       end
 
       describe "when user is Administrator" do
@@ -81,7 +79,7 @@ RSpec.describe LicenseAcceptance::Config do
 
     describe "when platform is non-Windows" do
       before do
-        expect(platform).to receive(:windows?).and_return(false)
+        stub_const("RUBY_PLATFORM", "darwin")
       end
 
       describe "when user is root" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: license-acceptance
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - tyler-ball
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: tty-platform
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -230,11 +216,7 @@ files:
 homepage: https://chef.io
 licenses:
 - Apache-2.0
-metadata:
-  allowed_push_host: https://rubygems.org
-  homepage_uri: https://chef.io
-  source_code_uri: https://github.com/chef/license-acceptance
-  changelog_uri: https://github.com/chef/license-acceptance/blob/master/CHANGELOG.md
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths: