summaryrefslogtreecommitdiff
path: root/acceptance
diff options
context:
space:
mode:
Diffstat (limited to 'acceptance')
-rw-r--r--acceptance/Gemfile13
-rw-r--r--acceptance/Gemfile.lock104
2 files changed, 53 insertions, 64 deletions
diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index 77b45e733d..105ad723be 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -3,19 +3,10 @@ source "https://rubygems.org"
gem "chef-acceptance", github: "chef/chef-acceptance"
gem "kitchen-ec2"
gem "inspec"
-# Pinning to github for kitchen-vagrant because 0.19.0 incorrectly
-# puts in a box_url for bento when a vagrant box in atlas is specified
gem "kitchen-vagrant"
gem "windows_chef_zero"
gem "kitchen-inspec"
gem "test-kitchen"
gem "winrm-elevated"
-gem "berkshelf", "4.3.5"
-
-# until 2.0.0 is fixed for unstable packages
-gem "mixlib-install", "1.2.3"
-
-# nio4r 2.x was throwing a "could not install" error because of a Ruby version
-# conflict (that didn't actually exist). Since the only gem that really needs
-# it is celluloid, let's just pin it until it becomes a bigger problem.
-gem "nio4r", ">= 1.1.0", "< 2.0.0"
+gem "berkshelf"
+gem "mixlib-install"
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index e33389f135..f94dfcde96 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -12,44 +12,42 @@ GEM
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
artifactory (2.6.0)
- aws-sdk (2.7.3)
- aws-sdk-resources (= 2.7.3)
- aws-sdk-core (2.7.3)
+ aws-sdk (2.7.5)
+ aws-sdk-resources (= 2.7.5)
+ aws-sdk-core (2.7.5)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.7.3)
- aws-sdk-core (= 2.7.3)
+ aws-sdk-resources (2.7.5)
+ aws-sdk-core (= 2.7.5)
aws-sigv4 (1.0.0)
- berkshelf (4.3.5)
+ berkshelf (5.6.2)
addressable (~> 2.3, >= 2.3.4)
- berkshelf-api-client (~> 2.0, >= 2.0.2)
- buff-config (~> 1.0)
- buff-extensions (~> 1.0)
- buff-shell_out (~> 0.1)
- celluloid (= 0.16.0)
- celluloid-io (~> 0.16.1)
+ berkshelf-api-client (>= 2.0.2, < 4.0)
+ buff-config (~> 2.0)
+ buff-extensions (~> 2.0)
+ buff-shell_out (~> 1.0)
cleanroom (~> 1.0)
faraday (~> 0.9)
httpclient (~> 2.7)
minitar (~> 0.5, >= 0.5.4)
- mixlib-archive (~> 0.1)
+ mixlib-archive (~> 0.4)
octokit (~> 4.0)
retryable (~> 2.0)
- ridley (~> 4.5)
- solve (~> 2.0)
- thor (~> 0.19)
- berkshelf-api-client (2.0.2)
- faraday (~> 0.9.1)
- httpclient (~> 2.7.0)
- ridley (~> 4.5)
- buff-config (1.0.1)
- buff-extensions (~> 1.0)
- varia_model (~> 0.4)
- buff-extensions (1.0.0)
- buff-ignore (1.1.1)
- buff-ruby_engine (0.1.0)
- buff-shell_out (0.2.0)
- buff-ruby_engine (~> 0.1.0)
+ ridley (~> 5.0)
+ solve (> 2.0, < 4.0)
+ thor (~> 0.19, < 0.19.2)
+ berkshelf-api-client (3.0.0)
+ faraday (~> 0.9)
+ httpclient (~> 2.7)
+ ridley (>= 4.5, < 6.0)
+ buff-config (2.0.0)
+ buff-extensions (~> 2.0)
+ varia_model (~> 0.6)
+ buff-extensions (2.0.0)
+ buff-ignore (1.2.0)
+ buff-ruby_engine (1.0.0)
+ buff-shell_out (1.1.0)
+ buff-ruby_engine (~> 1.0)
builder (3.2.3)
celluloid (0.16.0)
timers (~> 4.0.0)
@@ -68,7 +66,7 @@ GEM
excon (>= 0.38.0)
json
erubis (2.7.0)
- excon (0.54.0)
+ excon (0.55.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.17)
@@ -79,8 +77,8 @@ GEM
builder (>= 2.1.2)
hashie (3.5.1)
hitimes (1.2.4)
- httpclient (2.7.2)
- inspec (1.12.0)
+ httpclient (2.8.3)
+ inspec (1.14.0)
faraday (>= 0.9.0)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
@@ -115,20 +113,21 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.10)
method_source (0.8.2)
- minitar (0.5.4)
+ minitar (0.6.1)
mixlib-archive (0.4.1)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
mixlib-config (2.2.4)
- mixlib-install (1.2.3)
+ mixlib-install (2.1.12)
artifactory
mixlib-shellout
mixlib-versioning
+ thor
mixlib-log (1.7.1)
mixlib-shellout (2.2.7)
mixlib-versioning (1.1.0)
- molinillo (0.4.5)
+ molinillo (0.5.6)
multi_json (1.12.1)
multipart-post (2.0.0)
net-scp (1.2.1)
@@ -136,7 +135,7 @@ GEM
net-ssh (4.0.1)
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
- nio4r (1.2.1)
+ nio4r (2.0.0)
nori (2.6.0)
octokit (4.6.2)
sawyer (~> 0.8.0, >= 0.5.3)
@@ -148,12 +147,12 @@ GEM
public_suffix (2.0.5)
rainbow (2.2.1)
retryable (2.0.4)
- ridley (4.6.1)
+ ridley (5.1.0)
addressable
- buff-config (~> 1.0)
- buff-extensions (~> 1.0)
- buff-ignore (~> 1.1.1)
- buff-shell_out (~> 0.1)
+ buff-config (~> 2.0)
+ buff-extensions (~> 2.0)
+ buff-ignore (~> 1.2)
+ buff-shell_out (~> 1.0)
celluloid (~> 0.16.0)
celluloid-io (~> 0.16.1)
chef-config (>= 12.5.0)
@@ -164,8 +163,8 @@ GEM
json (>= 1.7.7)
mixlib-authentication (>= 1.3.0)
retryable (~> 2.0)
- semverse (~> 1.1)
- varia_model (~> 0.4.0)
+ semverse (~> 2.0)
+ varia_model (~> 0.6)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
@@ -186,16 +185,16 @@ GEM
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubyntlm (0.6.1)
- rubyzip (1.2.0)
+ rubyzip (1.2.1)
safe_yaml (1.0.4)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
- semverse (1.2.1)
+ semverse (2.0.0)
slop (3.6.0)
- solve (2.0.3)
- molinillo (~> 0.4.2)
- semverse (~> 1.1)
+ solve (3.1.0)
+ molinillo (>= 0.5)
+ semverse (>= 1.1, < 3.0)
sslshake (1.0.13)
test-kitchen (1.15.0)
mixlib-install (>= 1.2, < 3.0)
@@ -205,7 +204,7 @@ GEM
net-ssh-gateway (~> 1.2)
safe_yaml (~> 1.0)
thor (~> 0.18)
- thor (0.19.4)
+ thor (0.19.1)
timers (4.0.4)
hitimes
train (0.22.1)
@@ -216,8 +215,8 @@ GEM
net-ssh (>= 2.9, < 5.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
- varia_model (0.4.1)
- buff-extensions (~> 1.0)
+ varia_model (0.6.0)
+ buff-extensions (~> 2.0)
hashie (>= 2.0.2, < 4.0.0)
windows_chef_zero (2.0.0)
test-kitchen (>= 1.2.1)
@@ -243,14 +242,13 @@ PLATFORMS
ruby
DEPENDENCIES
- berkshelf (= 4.3.5)
+ berkshelf
chef-acceptance!
inspec
kitchen-ec2
kitchen-inspec
kitchen-vagrant
- mixlib-install (= 1.2.3)
- nio4r (>= 1.1.0, < 2.0.0)
+ mixlib-install
test-kitchen
windows_chef_zero
winrm-elevated
View Lorry Controller Status