From df32a38336ce6fbd289966147da84c6b7824b9ca Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Mon, 12 Sep 2016 20:59:00 +0200 Subject: [PATCH] improve gemfile, update readme for local tests --- .kitchen.vagrant.yml | 4 ++-- Gemfile | 6 ++++++ README.md | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.kitchen.vagrant.yml b/.kitchen.vagrant.yml index 470133d..216cd92 100644 --- a/.kitchen.vagrant.yml +++ b/.kitchen.vagrant.yml @@ -59,7 +59,7 @@ verifier: - https://github.com/dev-sec/tests-ssh-hardening suites: -- name: ssh-ansible_1.9 +- name: nginx-ansible_1.9 provisioner: ansible_version: 1.9.4 -- name: ssh-ansible_latest +- name: nginx-ansible_latest diff --git a/Gemfile b/Gemfile index 71eede2..837e89f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,12 @@ source 'https://rubygems.org' +if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2') + gem 'rack', '< 2.0' + gem 'ruby_dep', '< 1.4.0' + gem 'listen', '< 3.0.0' +end + group :test do gem 'rake' gem 'foodcritic', '~> 4.0' diff --git a/README.md b/README.md index acb97a0..e4aa674 100644 --- a/README.md +++ b/README.md @@ -78,14 +78,14 @@ bundle exec kitchen converge default-ubuntu-1204 ``` # fast test on one machine -KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen test default-ubuntu-1204 +KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen test nginx-ansible-19-ubuntu-1404 # test on all machines KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen test # for development -KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen create default-ubuntu-1204 -KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen converge default-ubuntu-1204 +KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen create nginx-ansible-19-ubuntu-1404 +KITCHEN_YAML=".kitchen.vagrant.yml" bundle exec kitchen converge nginx-ansible-19-ubuntu-1404 ``` For more information see [test-kitchen](http://kitchen.ci/docs/getting-started)