Merge pull request #5253 from tas50/chefspecisout

Chefspec 5.0 is out. Remove fetching from git master

3 files changed, 28 insertions, 34 deletions

diff --git a/Gemfile b/Gemfile
index e06ab4ed44..a2a2bfe088 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,7 +35,7 @@ group(:integration) do
   gem "chef-provisioning-aws"
   gem "chef-rewind"
   gem "chef-sugar"
-  gem "chefspec", git: "https://github.com/sethvargo/chefspec", branch: "master"
+  gem "chefspec"
   gem "halite"
   gem "poise"
   gem "knife-windows"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0ae840cd62..4925948eec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,16 +14,6 @@ GIT
       bundler (~> 1.2)
       thor (~> 0.18)
 
-GIT
-  remote: https://github.com/sethvargo/chefspec
-  revision: b8754bdbdffc26e2744dcb5d18fd5ee5e82a703a
-  branch: master
-  specs:
-    chefspec (4.7.0)
-      chef (>= 12.0)
-      fauxhai (~> 3.6)
-      rspec (~> 3.0)
-
 PATH
   remote: .
   specs:
@@ -114,12 +104,12 @@ GEM
       mixlib-cli (~> 1.4)
     artifactory (2.3.3)
     ast (2.3.0)
-    aws-sdk (2.5.5)
-      aws-sdk-resources (= 2.5.5)
-    aws-sdk-core (2.5.5)
+    aws-sdk (2.5.6)
+      aws-sdk-resources (= 2.5.6)
+    aws-sdk-core (2.5.6)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.5)
-      aws-sdk-core (= 2.5.5)
+    aws-sdk-resources (2.5.6)
+      aws-sdk-core (= 2.5.6)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -131,31 +121,35 @@ GEM
     chef-api (0.7.0)
       logify (~> 0.1)
       mime-types
-    chef-provisioning (1.9.1)
-      cheffish (>= 1.3.1, < 4.0)
+    chef-provisioning (2.0.0)
+      cheffish (~> 4.0)
       inifile (>= 2.0.2)
       mixlib-install (~> 1.0)
       net-scp (~> 1.0)
       net-ssh (>= 2.9, < 4.0)
       net-ssh-gateway (~> 1.2.0)
       winrm (~> 1.3)
-    chef-provisioning-aws (1.11.0)
+    chef-provisioning-aws (2.0.0)
       aws-sdk (>= 2.1.26, < 3.0)
       aws-sdk-v1 (>= 1.59.0)
-      chef-provisioning (~> 1.4)
+      chef-provisioning (~> 2.0)
       retryable (~> 2.0, >= 2.0.1)
       ubuntu_ami (~> 0.4, >= 0.4.1)
     chef-rewind (0.0.9)
     chef-sugar (3.4.0)
-    chef-zero (4.9.0)
+    chef-zero (5.0.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
-      rack (< 2)
+      rack (~> 2.0)
       uuidtools (~> 2.1)
-    cheffish (3.0.0)
-      chef-zero (~> 4.3)
+    cheffish (4.0.0)
+      chef-zero (~> 5.0)
       net-ssh
+    chefspec (5.0.0)
+      chef (>= 12.0)
+      fauxhai (~> 3.6)
+      rspec (~> 3.0)
     coderay (1.1.1)
     colorize (0.8.1)
     cucumber-core (1.5.0)
@@ -325,7 +319,7 @@ GEM
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rack (1.6.4)
+    rack (2.0.1)
     rainbow (2.1.0)
     rake (11.2.2)
     rb-readline (0.5.3)
@@ -355,7 +349,7 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-prof (0.15.9)
+    ruby-prof (0.16.2)
     ruby-progressbar (1.8.1)
     ruby-shadow (2.5.0)
     rubyntlm (0.6.0)
@@ -375,7 +369,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    specinfra (2.61.1)
+    specinfra (2.61.2)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
@@ -452,7 +446,7 @@ DEPENDENCIES
   chef-rewind
   chef-sugar
   cheffish
-  chefspec!
+  chefspec
   chefstyle!
   foodcritic
   github_changelog_generator
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index b42bbb363e..b5df4fad63 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -64,7 +64,7 @@ GIT
 
 GIT
   remote: git://github.com/winrb/winrm.git
-  revision: d6ae35d857234676916054344070d601519ec102
+  revision: dd376892db3c5212708664f1c41c57bb54b8e2ac
   branch: winrm-v2
   specs:
     winrm (2.0.0)
@@ -82,12 +82,12 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.3)
-    aws-sdk (2.5.5)
-      aws-sdk-resources (= 2.5.5)
-    aws-sdk-core (2.5.5)
+    aws-sdk (2.5.6)
+      aws-sdk-resources (= 2.5.6)
+    aws-sdk-core (2.5.6)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.5)
-      aws-sdk-core (= 2.5.5)
+    aws-sdk-resources (2.5.6)
+      aws-sdk-core (= 2.5.6)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)