Merge remote-tracking branch 'github/pull/366' into master

[chef.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index ccf8d5edaec34ca81875d23e270200bf3b66239b..d4dbea51a939c77f384423b8c3b4c046b52c29e1 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,23 +4,23 @@ GEM
     ast (2.4.1)
     bcrypt_pbkdf (1.0.1)
     builder (3.2.4)
     ast (2.4.1)
     bcrypt_pbkdf (1.0.1)
     builder (3.2.4)

-    chef-utils (16.5.77)
-    cookstyle (6.19.5)
-      rubocop (= 0.92.0)
+    chef-utils (16.7.61)
+    cookstyle (7.3.10)
+      rubocop (= 1.5.0)

     diff-lcs (1.4.4)
     docker-api (2.0.0)
       excon (>= 0.47.0)
       multi_json
     ed25519 (1.2.4)
     diff-lcs (1.4.4)
     docker-api (2.0.0)
       excon (>= 0.47.0)
       multi_json
     ed25519 (1.2.4)

-    erubi (1.9.0)
-    excon (0.76.0)
+    erubi (1.10.0)
+    excon (0.78.0)

     ffi (1.13.1)
     ffi (1.13.1)

-    gssapi (1.3.0)
+    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.11.0)
+    kitchen-dokken (2.11.1)

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


@@ -34,11 +34,11 @@ GEM
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)

-    mixlib-install (3.12.3)
+    mixlib-install (3.12.5)

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

-    mixlib-shellout (3.1.6)
+    mixlib-shellout (3.2.2)

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


@@ -49,13 +49,13 @@ 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.5)
+    parallel (1.20.1)
+    parser (2.7.2.0)

       ast (~> 2.4.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
     rainbow (3.0.0)
       ast (~> 2.4.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
     rainbow (3.0.0)

-    regexp_parser (1.8.1)
+    regexp_parser (2.0.0)

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


@@ -73,16 +73,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)

-    rubocop (0.92.0)
+    rubocop (1.5.0)

       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)

-      regexp_parser (>= 1.7)
+      regexp_parser (>= 2.0)

       rexml
       rexml

-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.2.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.7.1)
+    rubocop-ast (1.3.0)

       parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)


@@ -103,7 +103,7 @@ 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.7.2)
+    test-kitchen (2.8.0)

       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)


@@ -122,7 +122,7 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-cursor (~> 0.7)
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-cursor (~> 0.7)

-    tty-color (0.5.2)
+    tty-color (0.6.0)

     tty-cursor (0.7.1)
     tty-prompt (0.22.0)
       pastel (~> 0.8)
     tty-cursor (0.7.1)
     tty-prompt (0.22.0)
       pastel (~> 0.8)


@@ -134,7 +134,7 @@ GEM
     tty-screen (0.8.1)
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)
     tty-screen (0.8.1)
     unicode-display_width (1.7.0)
     unicode_utils (1.4.0)

-    winrm (2.3.4)
+    winrm (2.3.5)

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


@@ -143,7 +143,7 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)

-    winrm-elevated (1.2.2)
+    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)