From a471e7ee5f5f1ed4add6662143816481310bdd2f Mon Sep 17 00:00:00 2001 From: Fletcher Nichol Date: Tue, 7 May 2013 14:48:19 -0600 Subject: [PATCH] Convert project from Jamie CI to Test Kitchen 1.0.0 alpha. --- .gitignore | 5 ++--- .jamie.yml => .kitchen.yml | 0 Gemfile | 4 ++-- Rakefile | 6 +++--- Vagrantfile | 6 ------ 5 files changed, 7 insertions(+), 14 deletions(-) rename .jamie.yml => .kitchen.yml (100%) delete mode 100644 Vagrantfile diff --git a/.gitignore b/.gitignore index 0947313..72aeb54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ Gemfile.lock Berksfile.lock -.vagrant -.jamie/ -.jamie.local.yml +.kitchen/ +.kitchen.local.yml .bundle/ tmp/ diff --git a/.jamie.yml b/.kitchen.yml similarity index 100% rename from .jamie.yml rename to .kitchen.yml diff --git a/Gemfile b/Gemfile index 9d0ac82..62a8f39 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,6 @@ gem 'foodcritic' group :integration do gem 'berkshelf' - gem 'jamie' - gem 'jamie-vagrant' + gem 'test-kitchen', '~> 1.0.0.alpha.5' + gem 'kitchen-vagrant' end diff --git a/Rakefile b/Rakefile index 2bc08db..3e2ec66 100644 --- a/Rakefile +++ b/Rakefile @@ -6,10 +6,10 @@ FoodCritic::Rake::LintTask.new do |t| end begin - require 'jamie/rake_tasks' - Jamie::RakeTasks.new + require 'kitchen/rake_tasks' + Kitchen::RakeTasks.new rescue LoadError - puts ">>>>> Jamie gem not loaded, omitting tasks" unless ENV['CI'] + puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI'] end task :default => [:foodcritic] diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 542be26..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,6 +0,0 @@ -require 'jamie/vagrant' -require 'berkshelf/vagrant' - -Vagrant::Config.run do |config| - Jamie::Vagrant.define_vms(config) -end