summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-04-26 15:33:11 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2018-04-26 15:33:11 -0700
commit8cbdad60f18ec42bd99ed9a274ba03284953228d (patch)
treef7f705ab20495eb7746422057b0602bc9d2bce44
parent0fb75cea1cb78d2f8050320f9aca4c35ea1c45f4 (diff)
downloadchef-8cbdad60f18ec42bd99ed9a274ba03284953228d.tar.gz
update the Gemfile.lock and remove windows-gemspec ffi pinlcg/pin-ffi
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--Gemfile.lock37
-rw-r--r--chef-universal-mingw32.gemspec1
2 files changed, 19 insertions, 19 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 6bca1ee77b..40bda6152f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,6 +22,7 @@ PATH
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
+ ffi (< 1.9.22)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
@@ -52,7 +53,7 @@ PATH
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
- ffi (~> 1.9)
+ ffi (< 1.9.22)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
@@ -105,17 +106,17 @@ GEM
mixlib-cli (~> 1.4)
mixlib-shellout (~> 2.0)
ast (2.4.0)
- aws-sdk (2.11.33)
- aws-sdk-resources (= 2.11.33)
- aws-sdk-core (2.11.33)
+ aws-sdk (2.11.39)
+ aws-sdk-resources (= 2.11.39)
+ aws-sdk-core (2.11.39)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.33)
- aws-sdk-core (= 2.11.33)
+ aws-sdk-resources (2.11.39)
+ aws-sdk-core (= 2.11.39)
aws-sigv4 (1.0.2)
azure_mgmt_resources (0.16.0)
ms_rest_azure (~> 0.10.0)
- backports (3.11.2)
+ backports (3.11.3)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
@@ -127,7 +128,7 @@ GEM
mixlib-log (~> 2.0)
rack (~> 2.0)
uuidtools (~> 2.1)
- cheffish (14.0.0)
+ cheffish (14.0.1)
chef-zero (~> 14.0)
net-ssh
coderay (1.1.2)
@@ -140,22 +141,22 @@ GEM
docker-api (1.34.2)
excon (>= 0.47.0)
multi_json
- domain_name (0.5.20170404)
+ domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
ethon (0.11.0)
ffi (>= 1.3.0)
excon (0.62.0)
- faraday (0.14.0)
+ faraday (0.15.0)
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.23)
- ffi (1.9.23-x64-mingw32)
- ffi (1.9.23-x86-mingw32)
+ ffi (1.9.21)
+ ffi (1.9.21-x64-mingw32)
+ ffi (1.9.21-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.1)
@@ -181,7 +182,7 @@ GEM
httpclient (2.8.3)
inifile (3.0.0)
iniparse (1.4.4)
- inspec (2.1.30)
+ inspec (2.1.59)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -199,7 +200,7 @@ GEM
sslshake (~> 1.2)
thor (~> 0.20)
tomlrb (~> 1.2)
- train (~> 1.3)
+ train (~> 1.4)
ipaddress (0.8.3)
iso8601 (0.9.1)
jmespath (1.4.0)
@@ -227,7 +228,7 @@ GEM
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
timeliness (~> 0.3)
- ms_rest_azure (0.10.4)
+ ms_rest_azure (0.10.6)
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
@@ -348,7 +349,7 @@ GEM
thor (0.20.0)
timeliness (0.3.8)
tomlrb (1.2.6)
- train (1.3.0)
+ train (1.4.2)
aws-sdk (~> 2)
azure_mgmt_resources (~> 0.15)
docker-api (~> 1.26)
@@ -372,7 +373,7 @@ GEM
ethon (>= 0.8.0)
unf (0.1.4)
unf_ext
- unicode-display_width (1.3.0)
+ unicode-display_width (1.3.2)
uuidtools (2.1.5)
webmock (3.3.0)
addressable (>= 2.3.6)
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index 449f909bb2..2994ea7af5 100644
--- a/chef-universal-mingw32.gemspec
+++ b/chef-universal-mingw32.gemspec
@@ -2,7 +2,6 @@ gemspec = eval(IO.read(File.expand_path("../chef.gemspec", __FILE__)))
gemspec.platform = Gem::Platform.new(%w{universal mingw32})
-gemspec.add_dependency "ffi", "~> 1.9"
gemspec.add_dependency "win32-api", "~> 1.5.3"
gemspec.add_dependency "win32-dir", "~> 0.5.0"
gemspec.add_dependency "win32-event", "~> 0.6.1"