Merge pull request #178 from chef/tduffield/license_scout/1.x

Use the version of LicenseScout that comes with the Omnibus gem.
chef-boneyard · Feb 8, 2018 · 46766ae · 46766ae
2 parents 5e34bf9 + ca69819
commit 46766ae
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 61 deletions.
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'omnibus', github: 'chef/omnibus'
 gem 'omnibus-software', github: 'chef/omnibus-software'
-gem 'license_scout', git: 'https://github.com/chef/license_scout'
 
 group :development do
   gem 'test-kitchen'

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
@@ -1,51 +1,41 @@
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: caddd4471104b7ee11c05c489c998419bff20bda
+  revision: 4ef2d1a5b9162f4f5f52617d2a0122796b4f3c43
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
       omnibus (>= 5.6.1)
 
 GIT
   remote: git://github.com/chef/omnibus.git
-  revision: 52393d7cab443b61790f94c62775d9032d283497
+  revision: 68c301587d8856c6ec4445a24ec49365bb22a314
   specs:
-    omnibus (5.6.1)
+    omnibus (5.6.8)
       aws-sdk (~> 2)
       chef-sugar (~> 3.3)
       cleanroom (~> 1.0)
       ffi-yajl (~> 2.2)
-      license_scout
+      license_scout (~> 1.0)
       mixlib-shellout (~> 2.0)
       mixlib-versioning
       ohai (~> 8.0)
       pedump
       ruby-progressbar (~> 1.7)
       thor (~> 0.18)
 
-GIT
-  remote: https://github.com/chef/license_scout
-  revision: 63187ba565b790bd4148be09a58a9c14914eb9d2
-  specs:
-    license_scout (0.1.3)
-      ffi-yajl (~> 2.2)
-      mixlib-shellout (~> 2.2)
-      toml-rb (~> 1.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    artifactory (2.8.2)
     awesome_print (1.8.0)
-    aws-sdk (2.10.48)
-      aws-sdk-resources (= 2.10.48)
-    aws-sdk-core (2.10.48)
+    aws-sdk (2.10.128)
+      aws-sdk-resources (= 2.10.128)
+    aws-sdk-core (2.10.128)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.48)
-      aws-sdk-core (= 2.10.48)
+    aws-sdk-resources (2.10.128)
+      aws-sdk-core (= 2.10.128)
     aws-sigv4 (1.0.2)
     berkshelf (6.3.1)
       buff-config (~> 2.0)
@@ -77,10 +67,10 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (12.21.12)
+    chef (12.21.31)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.21.12)
+      chef-config (= 12.21.31)
       chef-zero (>= 4.8, < 13)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -106,12 +96,12 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (12.21.12)
+    chef-config (12.21.31)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-sugar (3.5.0)
+    chef-sugar (3.6.0)
     chef-zero (5.3.2)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -123,40 +113,51 @@ GEM
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     erubis (2.7.0)
-    faraday (0.13.1)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
+    ffi (1.9.21)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
     fuzzyurl (0.9.0)
-    hashie (3.5.6)
-    highline (1.7.8)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    gyoku (1.3.1)
+      builder (>= 2.1.2)
+    hashie (3.5.7)
+    highline (1.7.10)
     hitimes (1.2.6)
     httpclient (2.8.3)
     iniparse (1.4.4)
     iostruct (0.0.4)
     ipaddress (0.8.3)
     jmespath (1.3.1)
     json (2.1.0)
-    kitchen-vagrant (1.2.1)
+    kitchen-vagrant (1.3.0)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
+    license_scout (1.0.0)
+      ffi-yajl (~> 2.2)
+      mixlib-shellout (~> 2.2)
+      toml-rb (~> 1.0)
+    little-plugger (1.1.4)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (2.1.12)
-      artifactory
+    mixlib-install (3.9.0)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-log (1.7.1)
     mixlib-shellout (2.3.2)
     mixlib-versioning (1.2.2)
-    molinillo (0.6.3)
-    multi_json (1.12.2)
+    molinillo (0.6.4)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -169,10 +170,11 @@ GEM
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
-    nio4r (2.1.0)
-    octokit (4.7.0)
+    nio4r (2.2.0)
+    nori (2.6.0)
+    octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.24.1)
+    ohai (8.26.1)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -190,11 +192,11 @@ GEM
       multipart-post (~> 2.0.0)
       progressbar
       zhexdump (>= 0.0.2)
-    plist (3.3.0)
-    progressbar (1.8.2)
+    plist (3.4.0)
+    progressbar (1.9.0)
     proxifier (1.0.3)
-    public_suffix (3.0.0)
-    rack (2.0.3)
+    public_suffix (3.0.1)
+    rack (2.0.4)
     retryable (2.0.4)
     ridley (5.1.1)
       addressable
@@ -214,64 +216,84 @@ GEM
       retryable (~> 2.0)
       semverse (~> 2.0)
       varia_model (~> 0.6)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-progressbar (1.8.3)
-    safe_yaml (1.0.4)
+    ruby-progressbar (1.9.0)
+    rubyntlm (0.6.2)
+    rubyzip (1.2.1)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
-    serverspec (2.40.0)
+    serverspec (2.41.3)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.68)
+      specinfra (~> 2.72)
     sfl (2.3)
     solve (4.0.0)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.71.2)
+    specinfra (2.73.2)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.17.0)
-      mixlib-install (>= 1.2, < 3.0)
+    test-kitchen (1.20.0)
+      mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
-      safe_yaml (~> 1.0)
       thor (~> 0.19, < 0.19.2)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
+      winrm-fs (~> 1.1.0)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    toml-rb (1.0.0)
+    toml-rb (1.1.1)
       citrus (~> 3.0, > 3.0)
     uuidtools (2.1.5)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
+    winrm (2.2.3)
+      builder (>= 2.1.2)
+      erubis (~> 2.7)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
+    winrm-elevated (1.1.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.1.1)
+      erubis (~> 2.7)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 1.1)
+      winrm (~> 2.0)
     wmi-lite (1.0.0)
     zhexdump (0.0.2)
 
@@ -281,7 +303,6 @@ PLATFORMS
 DEPENDENCIES
   berkshelf
   kitchen-vagrant
-  license_scout!
   omnibus!
   omnibus-software!
   test-kitchen