From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Jul 2016 17:41:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/74'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5dbcbc9fc104320252388249ad1fbb9984bb5339?hp=7f059d628300c07f7832cdede923d468d0f81085

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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..d5649d75c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.kitchen/
diff --git a/.kitchen.yml b/.kitchen.yml
new file mode 100644
index 000000000..cc8065562
--- /dev/null
+++ b/.kitchen.yml
@@ -0,0 +1,14 @@
+---
+driver:
+  name: vagrant
+
+provisioner:
+  name: chef_zero
+
+platforms:
+  - name: ubuntu-16.04
+
+suites:
+  - name: tools
+    run_list:
+      - recipe[tools::default]
diff --git a/Gemfile b/Gemfile
index 47ac10107..b08776e20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,5 @@ source "https://rubygems.org"
 
 gem "rubocop"
 gem "foodcritic"
+gem "test-kitchen"
+gem "kitchen-vagrant"
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d57bb090..10bd9d1f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    artifactory (2.3.3)
     ast (2.3.0)
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
@@ -14,7 +15,18 @@ GEM
       treetop (~> 1.4)
       yajl-ruby (~> 1.1)
     gherkin (4.0.0)
+    kitchen-vagrant (0.20.0)
+      test-kitchen (~> 1.4)
     mini_portile2 (2.1.0)
+    mixlib-install (1.1.0)
+      artifactory
+      mixlib-shellout
+      mixlib-versioning
+    mixlib-shellout (2.2.6)
+    mixlib-versioning (1.1.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (3.2.0)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
@@ -33,6 +45,15 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     rufus-lru (1.1.0)
+    safe_yaml (1.0.4)
+    test-kitchen (1.10.2)
+      mixlib-install (~> 1.0, >= 1.0.4)
+      mixlib-shellout (>= 1.2, < 3.0)
+      net-scp (~> 1.1)
+      net-ssh (>= 2.9, < 4.0)
+      safe_yaml (~> 1.0)
+      thor (~> 0.18)
+    thor (0.19.1)
     treetop (1.6.5)
       polyglot (~> 0.3)
     unicode-display_width (1.1.0)
@@ -43,7 +64,9 @@ PLATFORMS
 
 DEPENDENCIES
   foodcritic
+  kitchen-vagrant
   rubocop
+  test-kitchen
 
 BUNDLED WITH
-   1.10.6
+   1.11.2