Merge pull request #8327 from chef/jsinha/remove_windows-api_dep

Remove windows-api pin and update InSpec to 3.9.0

4 files changed, 45 insertions, 46 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index aa32eefa16..774fffc8b4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,6 @@ PATH
       win32-process (~> 0.8.2)
       win32-service (>= 1.0, < 3.0)
       win32-taskscheduler (~> 2.0)
-      windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
 
 PATH
@@ -120,6 +119,8 @@ GEM
     erubis (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
     ffi (1.10.0)
     ffi (1.10.0-x64-mingw32)
     ffi (1.10.0-x86-mingw32)
@@ -133,9 +134,10 @@ GEM
     highline (1.7.10)
     htmlentities (4.3.4)
     iniparse (1.4.4)
-    inspec-core (3.7.1)
+    inspec-core (3.9.0)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
+      faraday_middleware (~> 0.12.2)
       hashie (~> 3.4)
       htmlentities
       json (>= 1.8, < 3.0)
@@ -177,8 +179,8 @@ GEM
     multi_json (1.13.1)
     multipart-post (2.0.0)
     necromancer (0.4.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
+    net-scp (2.0.0)
+      net-ssh (>= 2.6.5, < 6.0.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
@@ -189,7 +191,7 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     netrc (0.11.0)
-    octokit (4.13.0)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (14.8.11)
       chef-config (>= 12.8, < 15)
@@ -203,8 +205,8 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    parallel (1.17.0)
+    parser (2.6.2.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
     pastel (0.7.2)
@@ -226,7 +228,7 @@ GEM
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
     public_suffix (3.0.3)
-    rack (2.0.6)
+    rack (2.0.7)
     rainbow (3.0.0)
     rake (12.3.0)
     rb-readline (0.5.5)
@@ -277,16 +279,16 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slop (3.6.0)
-    specinfra (2.76.9)
+    specinfra (2.77.0)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       sfl
     sslshake (1.3.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)
     structured_warnings (0.3.0)
     syslog-logger (1.6.8)
@@ -319,7 +321,7 @@ GEM
       pastel (~> 0.7.2)
       strings (~> 0.1.0)
       tty-screen (~> 0.6.4)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
     webmock (3.5.1)
@@ -344,17 +346,15 @@ GEM
       win32-ipc (>= 0.6.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    win32-service (1.0.1)
+    win32-service (2.1.2)
       ffi
       ffi-win32-extensions
     win32-taskscheduler (2.0.4)
       ffi
       structured_warnings
-    windows-api (0.4.4)
-      win32-api (>= 1.4.5)
     wisper (2.0.0)
     wmi-lite (1.0.2)
-    yard (0.9.18)
+    yard (0.9.19)
 
 PLATFORMS
   ruby
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index 1188973cc2..9fb91e2445 100644
--- a/chef-universal-mingw32.gemspec
+++ b/chef-universal-mingw32.gemspec
@@ -12,7 +12,6 @@ gemspec.add_dependency "win32-mmap", "~> 0.4.1"
 gemspec.add_dependency "win32-mutex", "~> 0.4.2"
 gemspec.add_dependency "win32-process", "~> 0.8.2"
 gemspec.add_dependency "win32-service", ">= 1.0", "< 3.0"
-gemspec.add_dependency "windows-api", "~> 0.4.4"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
 gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
 gemspec.add_dependency "iso8601", "~> 0.12.1"
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index a1cd1bbe48..3580039d4f 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -17,8 +17,8 @@ group :development do
   gem "ohai", "~> 14.0"
 
   # Use Test Kitchen with Vagrant for converging the build environment
-  gem "test-kitchen",    "~> 1.21"
-  gem "kitchen-vagrant", "~> 1.3.1"
+  gem "test-kitchen"
+  gem "kitchen-vagrant"
   gem "winrm-fs", "~> 1.0"
   gem "pry"
   gem "pry-byebug"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 05148f153b..1798c4db89 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 7c1e039856513835f728b4e0c5a4106c339e99c2
+  revision: 7ad32798cd5893191e4b9bfc5b53e4cc8f32646b
   branch: master
   specs:
-    omnibus (6.0.20)
+    omnibus (6.0.23)
       aws-sdk-s3 (~> 1)
       chef-sugar (>= 3.3)
       cleanroom (~> 1.0)
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 93d8f49c8a5add0efd03a05c3311e49eea82b5ed
+  revision: 3f3bd5dd6d17212f2b90a2e45c63bf97224b48e6
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,17 +32,17 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
     aws-eventstream (1.0.2)
-    aws-partitions (1.144.0)
-    aws-sdk-core (3.48.1)
+    aws-partitions (1.148.0)
+    aws-sdk-core (3.48.3)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.15.0)
-      aws-sdk-core (~> 3, >= 3.48.0)
+    aws-sdk-kms (1.16.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.33.0)
-      aws-sdk-core (~> 3, >= 3.48.0)
+    aws-sdk-s3 (1.36.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.1.0)
@@ -179,10 +179,10 @@ GEM
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jmespath (1.4.0)
-    kitchen-vagrant (1.3.6)
-      test-kitchen (~> 1.4)
+    kitchen-vagrant (1.5.1)
+      test-kitchen (>= 1.4, < 3)
     libyajl2 (1.2.0)
-    license_scout (1.0.22)
+    license_scout (1.0.24)
       ffi-yajl (~> 2.2)
       mixlib-shellout (~> 2.2)
       toml-rb (~> 1.0)
@@ -213,19 +213,19 @@ GEM
     molinillo (0.6.6)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
+    net-scp (2.0.0)
+      net-ssh (>= 2.6.5, < 6.0.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
-    net-ssh-gateway (1.3.0)
-      net-ssh (>= 2.6.5)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     nori (2.6.0)
-    octokit (4.13.0)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     ohai (14.8.11)
       chef-config (>= 12.8, < 15)
@@ -258,7 +258,7 @@ GEM
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
     public_suffix (3.0.3)
-    rack (2.0.6)
+    rack (2.0.7)
     retryable (3.0.4)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -295,7 +295,7 @@ GEM
     solve (4.0.2)
       molinillo (~> 0.6)
       semverse (>= 1.1, < 4.0)
-    specinfra (2.76.9)
+    specinfra (2.77.0)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -303,12 +303,12 @@ GEM
     structured_warnings (0.3.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.24.0)
+    test-kitchen (2.0.1)
       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)
+      net-scp (>= 1.1, < 3.0)
+      net-ssh (>= 2.9, < 6.0)
+      net-ssh-gateway (>= 1.2, < 3.0)
       thor (~> 0.19)
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
@@ -371,7 +371,7 @@ PLATFORMS
 
 DEPENDENCIES
   berkshelf (>= 7.0)
-  kitchen-vagrant (~> 1.3.1)
+  kitchen-vagrant
   ohai (~> 14.0)
   omnibus!
   omnibus-software!
@@ -379,7 +379,7 @@ DEPENDENCIES
   pry
   pry-byebug
   pry-stack_explorer
-  test-kitchen (~> 1.21)
+  test-kitchen
   winrm-fs (~> 1.0)
 
 BUNDLED WITH