Merge remote-tracking branch 'github/pull/320'

[chef.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 218043aef8ed2f4c006206f16df8b342a1974efb..5ac109beec149ce0ed179bb382c7058d01a4f1d5 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,27 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
 GEM
   remote: https://rubygems.org/
   specs:

-    ast (2.4.0)
+    ast (2.4.1)

     bcrypt_pbkdf (1.0.1)
     builder (3.2.4)
     bcrypt_pbkdf (1.0.1)
     builder (3.2.4)

-    cookstyle (6.3.4)
-      rubocop (= 0.82.0)
-    diff-lcs (1.3)
+    cookstyle (6.11.4)
+      rubocop (= 0.87.1)
+    diff-lcs (1.4.4)

     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
     ed25519 (1.2.4)
     equatable (0.6.1)
     erubi (1.9.0)
     docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
     ed25519 (1.2.4)
     equatable (0.6.1)
     erubi (1.9.0)

-    excon (0.73.0)
-    ffi (1.12.2)
+    excon (0.75.0)
+    ffi (1.13.1)

     gssapi (1.3.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
     httpclient (2.8.3)
     gssapi (1.3.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
     httpclient (2.8.3)

-    jaro_winkler (1.5.4)
-    kitchen-dokken (2.8.2)
+    kitchen-dokken (2.10.0)

       docker-api (~> 1.33)
       lockfile (~> 2.1)
       test-kitchen (>= 1.15, < 3)
       docker-api (~> 1.33)
       lockfile (~> 2.1)
       test-kitchen (>= 1.15, < 3)


@@ -32,39 +31,40 @@ GEM
       tty-prompt (~> 0.18)
     little-plugger (1.1.4)
     lockfile (2.1.3)
       tty-prompt (~> 0.18)
     little-plugger (1.1.4)
     lockfile (2.1.3)

-    logging (2.2.2)
+    logging (2.3.0)

       little-plugger (~> 1.1)
       little-plugger (~> 1.1)

-      multi_json (~> 1.10)
+      multi_json (~> 1.14)

     mixlib-install (3.12.1)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-shellout (3.0.9)
     mixlib-versioning (1.2.12)
     mixlib-install (3.12.1)
       mixlib-shellout
       mixlib-versioning
       thor
     mixlib-shellout (3.0.9)
     mixlib-versioning (1.2.12)

-    multi_json (1.14.1)
+    multi_json (1.15.0)

     necromancer (0.5.1)
     necromancer (0.5.1)

-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)

     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-telnet (0.1.1)
     nori (2.6.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-telnet (0.1.1)
     nori (2.6.0)

-    parallel (1.19.1)
-    parser (2.7.1.1)
-      ast (~> 2.4.0)
-    pastel (0.7.3)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pastel (0.7.4)

       equatable (~> 0.6)
       tty-color (~> 0.5)
     rainbow (3.0.0)
       equatable (~> 0.6)
       tty-color (~> 0.5)
     rainbow (3.0.0)

+    regexp_parser (1.7.1)

     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)

-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)

       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)


@@ -73,15 +73,18 @@ GEM
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)

-    rspec-support (3.9.2)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.87.1)

       parallel (~> 1.10)
       parallel (~> 1.10)

-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)

       rainbow (>= 2.2.2, < 4.0)
       rainbow (>= 2.2.2, < 4.0)

+      regexp_parser (>= 1.7)

       rexml
       rexml

+      rubocop-ast (>= 0.1.0, < 1.0)

       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)

+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)

     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
     rubyzip (2.3.0)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
     rubyzip (2.3.0)


@@ -91,7 +94,7 @@ GEM
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)

-    specinfra (2.82.15)
+    specinfra (2.82.18)

       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)


@@ -101,20 +104,20 @@ GEM
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)

-    test-kitchen (2.4.0)
+    test-kitchen (2.5.3)

       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 4.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 4.0)

-      net-scp (>= 1.1, < 3.0)
-      net-ssh (>= 2.9, < 6.0)
+      net-scp (>= 1.1, < 4.0)
+      net-ssh (>= 2.9, < 7.0)

       net-ssh-gateway (>= 1.2, < 3.0)
       net-ssh-gateway (>= 1.2, < 3.0)

-      thor (~> 0.19)
+      thor (>= 0.19, < 2.0)

       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)

-    thor (0.20.3)
+    thor (1.0.1)

     tomlrb (1.3.0)
     tty-box (0.5.0)
       pastel (~> 0.7.2)
     tomlrb (1.3.0)
     tty-box (0.5.0)
       pastel (~> 0.7.2)


@@ -130,7 +133,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)

-    tty-screen (0.7.1)
+    tty-screen (0.8.0)

     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     winrm (2.3.4)
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     winrm (2.3.4)


@@ -163,4 +166,4 @@ DEPENDENCIES
   test-kitchen
 
 BUNDLED WITH
   test-kitchen
 
 BUNDLED WITH

-   1.17.2
+   2.1.4