Update pedump to latest released; update all dependenciesjk/update

6 files changed, 45 insertions, 53 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 9b271fd072..243a120cf6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -158,12 +158,12 @@ GEM
       mixlib-cli (~> 1.4)
     artifactory (2.5.0)
     ast (2.3.0)
-    aws-sdk (2.6.1)
-      aws-sdk-resources (= 2.6.1)
-    aws-sdk-core (2.6.1)
+    aws-sdk (2.6.2)
+      aws-sdk-resources (= 2.6.2)
+    aws-sdk-core (2.6.2)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.1)
-      aws-sdk-core (= 2.6.1)
+    aws-sdk-resources (2.6.2)
+      aws-sdk-core (= 2.6.2)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -232,7 +232,7 @@ GEM
     domain_name (0.5.20160826)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    ethon (0.9.0)
+    ethon (0.9.1)
       ffi (>= 1.3.0)
     excon (0.52.0)
     faraday (0.9.2)
@@ -299,7 +299,7 @@ GEM
     jmespath (1.3.1)
     json (1.8.3)
     jwt (1.5.6)
-    kitchen-docker (2.6.0.rc.0)
+    kitchen-docker (2.6.0)
       test-kitchen (>= 1.0.0)
     kitchen-ec2 (1.2.0)
       aws-sdk (~> 2)
@@ -334,7 +334,7 @@ GEM
       mixlib-log
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (1.2.0)
+    mixlib-install (1.2.2)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -419,7 +419,7 @@ GEM
       websocket (~> 1.0)
     rack (2.0.1)
     rainbow (2.1.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rb-readline (0.5.3)
     rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -480,7 +480,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    specinfra (2.62.0)
+    specinfra (2.63.0)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index c1680665ca..6f8ec14a49 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,12 +11,12 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.5.0)
-    aws-sdk (2.6.1)
-      aws-sdk-resources (= 2.6.1)
-    aws-sdk-core (2.6.1)
+    aws-sdk (2.6.2)
+      aws-sdk-resources (= 2.6.2)
+    aws-sdk-core (2.6.2)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.1)
-      aws-sdk-core (= 2.6.1)
+    aws-sdk-resources (2.6.2)
+      aws-sdk-core (= 2.6.2)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -53,7 +53,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.14.60)
+    chef-config (12.14.77)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -115,7 +115,7 @@ GEM
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-config (2.2.4)
-    mixlib-install (1.2.0)
+    mixlib-install (1.2.2)
       artifactory
       mixlib-shellout
       mixlib-versioning
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index eba19b8864..8efea70082 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -12,8 +12,8 @@ GRAPH
   apache2 (3.2.2)
   apt (4.0.2)
     compat_resource (>= 12.10)
-  aws (4.0.0)
-    ohai (>= 2.1.0)
+  aws (4.1.1)
+    ohai (>= 4.0)
   base (0.1.0)
     apt (>= 0.0.0)
     build-essential (>= 0.0.0)
@@ -29,7 +29,7 @@ GRAPH
     sudo (>= 0.0.0)
     ubuntu (>= 0.0.0)
     users (>= 0.0.0)
-  build-essential (6.0.5)
+  build-essential (6.0.6)
     compat_resource (>= 12.14)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
@@ -40,7 +40,7 @@ GRAPH
   chef-sugar (3.4.0)
   chef_hostname (0.4.2)
     compat_resource (>= 0.0.0)
-  compat_resource (12.14.3)
+  compat_resource (12.14.6)
   cron (2.0.0)
   database (2.3.1)
     aws (>= 0.0.0)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index d324684d31..d599890f10 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,12 +3,12 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.5.0)
-    aws-sdk (2.6.1)
-      aws-sdk-resources (= 2.6.1)
-    aws-sdk-core (2.6.1)
+    aws-sdk (2.6.2)
+      aws-sdk-resources (= 2.6.2)
+    aws-sdk-core (2.6.2)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.1)
-      aws-sdk-core (= 2.6.1)
+    aws-sdk-resources (2.6.2)
+      aws-sdk-core (= 2.6.2)
     berkshelf (5.1.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
@@ -43,7 +43,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.14.60)
+    chef-config (12.14.77)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -111,7 +111,7 @@ GEM
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-config (2.2.4)
-    mixlib-install (1.2.0)
+    mixlib-install (1.2.2)
       artifactory
       mixlib-shellout
       mixlib-versioning
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 6e9e9cce71..45cad13e4f 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -4,9 +4,7 @@ gem "omnibus", github: "chef/omnibus", branch: "rhass/COOL-502_with_gcc_investig
 gem "omnibus-software", github: "chef/omnibus-software", branch: "lcg/ruby23"
 gem "license_scout", github: "chef/license_scout"
 
-# pedump pessimistically pins multipart-post to a version from 2013 which makes
-# bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 .
-gem "pedump", git: "https://github.com/ksubrama/pedump.git", branch: "patch-1"
+gem "pedump"
 
 # This development group is installed by default when you run `bundle install`,
 # but if you are using Omnibus in a CI-based infrastructure, you do not need
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 9c022cedf0..f7ce286b70 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/chef/license_scout.git
-  revision: 3f62c55a03a5d7452daad3c713824ec1561e37f1
+  revision: 37e75fd9372a5c69280258ef9d6c00ac27625c1e
   specs:
     license_scout (0.1.2)
       ffi-yajl (~> 2.2)
@@ -32,30 +32,18 @@ GIT
       ruby-progressbar (~> 1.7)
       thor (~> 0.18)
 
-GIT
-  remote: https://github.com/ksubrama/pedump.git
-  revision: b4319556e18c80d2cba064ffe57fe0dea549dfe2
-  branch: patch-1
-  specs:
-    pedump (0.5.0)
-      awesome_print
-      iostruct (>= 0.0.4)
-      multipart-post (~> 1.2)
-      progressbar
-      zhexdump (>= 0.0.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
     artifactory (2.5.0)
     awesome_print (1.7.0)
-    aws-sdk (2.6.1)
-      aws-sdk-resources (= 2.6.1)
-    aws-sdk-core (2.6.1)
+    aws-sdk (2.6.2)
+      aws-sdk-resources (= 2.6.2)
+    aws-sdk-core (2.6.2)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.1)
-      aws-sdk-core (= 2.6.1)
+    aws-sdk-resources (2.6.2)
+      aws-sdk-core (= 2.6.2)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -95,7 +83,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.14.60)
+    chef-config (12.14.77)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -139,7 +127,7 @@ GEM
       mixlib-log
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (1.2.0)
+    mixlib-install (1.2.2)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -151,7 +139,7 @@ GEM
     mixlib-versioning (1.1.0)
     molinillo (0.4.5)
     multi_json (1.12.1)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
@@ -173,6 +161,12 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
+    pedump (0.5.2)
+      awesome_print
+      iostruct (>= 0.0.4)
+      multipart-post (~> 2.0.0)
+      progressbar
+      zhexdump (>= 0.0.2)
     plist (3.2.0)
     progressbar (0.21.0)
     pry (0.10.4)
@@ -260,7 +254,7 @@ DEPENDENCIES
   license_scout!
   omnibus!
   omnibus-software!
-  pedump!
+  pedump
   pry
   pry-byebug
   pry-stack_explorer