summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-06-01 15:14:39 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2018-06-01 15:14:39 -0700
commitf9a7b04af0f10afb0418404cee720a2cffe282e1 (patch)
treecd93a0143a44654ca2d3910c0cfc52da64d817e5
parent3527e413152d76d36edf512861d9719d9ba59f0c (diff)
downloadchef-f9a7b04af0f10afb0418404cee720a2cffe282e1.tar.gz
bump ffi without pulling in the inspec/train messlcg/debugging-ffi
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock37
2 files changed, 21 insertions, 19 deletions
diff --git a/Gemfile b/Gemfile
index 527199f80f..2c93307a2e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,8 @@ group(:omnibus_package) do
gem "appbundler"
gem "rb-readline"
- gem "inspec", "~> 2"
+ gem "inspec", "<= 2.1.67"
+ gem "train", "<= 1.4.4"
gem "chef-vault"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index da014f0f86..e2feb34186 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 297373563c6177a90c2f5f07cb2a68f31a57dc2b
+ revision: fac2105b132fddc5f671411b2b5f1cba7a2307c3
branch: master
specs:
chefstyle (0.10.0)
@@ -22,7 +22,7 @@ PATH
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
- ffi (< 1.9.22)
+ ffi
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
@@ -53,7 +53,7 @@ PATH
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
- ffi (< 1.9.22)
+ ffi
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
@@ -107,13 +107,13 @@ GEM
mixlib-cli (~> 1.4)
mixlib-shellout (~> 2.0)
ast (2.4.0)
- aws-sdk (2.11.50)
- aws-sdk-resources (= 2.11.50)
- aws-sdk-core (2.11.50)
+ aws-sdk (2.11.61)
+ aws-sdk-resources (= 2.11.61)
+ aws-sdk-core (2.11.61)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.50)
- aws-sdk-core (= 2.11.50)
+ aws-sdk-resources (2.11.61)
+ aws-sdk-core (= 2.11.61)
aws-sigv4 (1.0.2)
azure_mgmt_resources (0.16.0)
ms_rest_azure (~> 0.10.0)
@@ -138,7 +138,7 @@ GEM
safe_yaml (~> 1.0.0)
debug_inspector (0.0.3)
diff-lcs (1.3)
- docile (1.3.0)
+ docile (1.3.1)
docker-api (1.34.2)
excon (>= 0.47.0)
multi_json
@@ -148,16 +148,16 @@ GEM
ethon (0.11.0)
ffi (>= 1.3.0)
excon (0.62.0)
- faraday (0.15.1)
+ faraday (0.15.2)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
- ffi (1.9.21)
- ffi (1.9.21-x64-mingw32)
- ffi (1.9.21-x86-mingw32)
+ ffi (1.9.23)
+ ffi (1.9.23-x64-mingw32)
+ ffi (1.9.23-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.1)
@@ -229,7 +229,7 @@ GEM
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
timeliness (~> 0.3)
- ms_rest_azure (0.10.6)
+ ms_rest_azure (0.10.7)
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
@@ -375,13 +375,13 @@ GEM
ethon (>= 0.8.0)
unf (0.1.4)
unf_ext
- unicode-display_width (1.3.2)
+ unicode-display_width (1.3.3)
uuidtools (2.1.5)
webmock (3.4.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
- websocket (1.2.5)
+ websocket (1.2.8)
win32-api (1.5.3-universal-mingw32)
win32-dir (0.5.1)
ffi (>= 1.0.0)
@@ -420,7 +420,7 @@ GEM
rubyzip (~> 1.1)
winrm (~> 2.0)
wmi-lite (1.0.0)
- yard (0.9.12)
+ yard (0.9.13)
PLATFORMS
ruby
@@ -434,7 +434,7 @@ DEPENDENCIES
chef-vault
cheffish (~> 14)
chefstyle!
- inspec (~> 2)
+ inspec (<= 2.1.67)
netrc
octokit
pry
@@ -447,6 +447,7 @@ DEPENDENCIES
ruby-shadow
simplecov
tomlrb
+ train (<= 1.4.4)
travis
unf_ext (= 0.0.7.6)!
webmock