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

[chef.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 6bc8a8a721ec148a3a05215c11875c5510330530..2a7f86a7ee35d94207f5efe675bdd0decd042873 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,49 +1,49 @@
 GEM
   remote: https://rubygems.org/
   specs:
 GEM
   remote: https://rubygems.org/
   specs:

-    ast (2.4.1)
-    bcrypt_pbkdf (1.0.1)
+    ast (2.4.2)
+    bcrypt_pbkdf (1.1.0)

     builder (3.2.4)
     builder (3.2.4)

-    chef-utils (16.3.45)
-    cookstyle (6.13.3)
-      rubocop (= 0.88.0)
+    chef-utils (17.2.29)
+      concurrent-ruby
+    concurrent-ruby (1.1.9)
+    cookstyle (7.14.2)
+      rubocop (= 1.17.0)

     diff-lcs (1.4.4)
     diff-lcs (1.4.4)

-    docker-api (1.34.2)
+    docker-api (2.1.0)

       excon (>= 0.47.0)
       multi_json
     ed25519 (1.2.4)
       excon (>= 0.47.0)
       multi_json
     ed25519 (1.2.4)

-    equatable (0.6.1)
-    erubi (1.9.0)
-    excon (0.75.0)
-    ffi (1.13.1)
-    gssapi (1.3.0)
+    erubi (1.10.0)
+    excon (0.82.0)
+    ffi (1.15.1)
+    gssapi (1.3.1)

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

-    kitchen-dokken (2.10.0)
-      docker-api (~> 1.33)
+    kitchen-dokken (2.13.0)
+      docker-api (>= 1.33, < 3)

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

-    license-acceptance (1.0.19)
+    license-acceptance (2.1.13)

       pastel (~> 0.7)
       pastel (~> 0.7)

-      tomlrb (~> 1.2)
-      tty-box (~> 0.3)
-      tty-prompt (~> 0.18)
+      tomlrb (>= 1.2, < 3.0)
+      tty-box (~> 0.6)
+      tty-prompt (~> 0.20)

     little-plugger (1.1.4)
     lockfile (2.1.3)
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     little-plugger (1.1.4)
     lockfile (2.1.3)
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)

-    mixlib-install (3.12.1)
+    mixlib-install (3.12.11)

       mixlib-shellout
       mixlib-versioning
       thor
       mixlib-shellout
       mixlib-versioning
       thor

-    mixlib-shellout (3.1.2)
+    mixlib-shellout (3.2.5)

       chef-utils
     mixlib-versioning (1.2.12)
     multi_json (1.15.0)
       chef-utils
     mixlib-versioning (1.2.12)
     multi_json (1.15.0)

-    necromancer (0.5.1)

     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)


@@ -51,65 +51,65 @@ GEM
       net-ssh (>= 4.0.0)
     net-telnet (0.1.1)
     nori (2.6.0)
       net-ssh (>= 4.0.0)
     net-telnet (0.1.1)
     nori (2.6.0)

-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)

       ast (~> 2.4.1)
       ast (~> 2.4.1)

-    pastel (0.7.4)
-      equatable (~> 0.6)
+    pastel (0.8.0)

       tty-color (~> 0.5)
     rainbow (3.0.0)
       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)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)

       diff-lcs (>= 1.2.0, < 2.0)
       diff-lcs (>= 1.2.0, < 2.0)

-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)

     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)

-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.2)

       diff-lcs (>= 1.2.0, < 2.0)
       diff-lcs (>= 1.2.0, < 2.0)

-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.88.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.17.0)

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

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

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

-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)

       rexml
       rexml

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

       ruby-progressbar (~> 1.7)
       ruby-progressbar (~> 1.7)

-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.2.0)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    rubyntlm (0.6.2)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    rubyntlm (0.6.3)

     rubyzip (2.3.0)
     rubyzip (2.3.0)

-    serverspec (2.41.5)
+    serverspec (2.41.7)

       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)

-    specinfra (2.82.18)
+    specinfra (2.82.25)

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

-    strings (0.1.8)
-      strings-ansi (~> 0.1)
-      unicode-display_width (~> 1.5)
+    strings (0.2.1)
+      strings-ansi (~> 0.2)
+      unicode-display_width (>= 1.5, < 3.0)

       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)

-    test-kitchen (2.5.4)
+    test-kitchen (2.12.0)

       bcrypt_pbkdf (~> 1.0)
       bcrypt_pbkdf (~> 1.0)

+      chef-utils (>= 16.4.35)

       ed25519 (~> 1.2)
       ed25519 (~> 1.2)

-      license-acceptance (~> 1.0, >= 1.0.11)
+      license-acceptance (>= 1.0.11, < 3.0)

       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 4.0)
       net-scp (>= 1.1, < 4.0)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 4.0)
       net-scp (>= 1.1, < 4.0)


@@ -119,26 +119,25 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)

-    thor (1.0.1)
-    tomlrb (1.3.0)
-    tty-box (0.5.0)
-      pastel (~> 0.7.2)
-      strings (~> 0.1.6)
+    thor (1.1.0)
+    tomlrb (2.0.1)
+    tty-box (0.7.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)

       tty-cursor (~> 0.7)
       tty-cursor (~> 0.7)

-    tty-color (0.5.1)
+    tty-color (0.6.0)

     tty-cursor (0.7.1)
     tty-cursor (0.7.1)

-    tty-prompt (0.21.0)
-      necromancer (~> 0.5.0)
-      pastel (~> 0.7.0)
-      tty-reader (~> 0.7.0)
-    tty-reader (0.7.0)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)

       tty-cursor (~> 0.7)
       tty-cursor (~> 0.7)

-      tty-screen (~> 0.7)
-      wisper (~> 2.0.0)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)

     tty-screen (0.8.1)
     tty-screen (0.8.1)

-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)

     unicode_utils (1.4.0)
     unicode_utils (1.4.0)

-    winrm (2.3.4)
+    winrm (2.3.6)

       builder (>= 2.1.2)
       erubi (~> 1.8)
       gssapi (~> 1.2)
       builder (>= 2.1.2)
       erubi (~> 1.8)
       gssapi (~> 1.2)


@@ -146,12 +145,12 @@ GEM
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)

-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.2.1)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-elevated (1.2.3)

       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
       erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)

-    winrm-fs (1.3.4)
+    winrm-fs (1.3.5)

       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 2.0)
       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 2.0)


@@ -168,4 +167,4 @@ DEPENDENCIES
   test-kitchen
 
 BUNDLED WITH
   test-kitchen
 
 BUNDLED WITH

-   2.1.4
+   2.2.16