Skip to content

Commit b3c2d8e

Browse files
committed
direct conversion from jamie to test kitchen 1.0-alpha
1 parent 996455a commit b3c2d8e

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Gemfile.lock
22
Berksfile.lock
33
tmp/
4-
.jamie/
5-
.jamie.local.yml
4+
.kitchen
5+
.kitchen.local.yml

.jamie.yml renamed to .kitchen.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ suites:
3535
- name: source
3636
run_list:
3737
- recipe[nodejs]
38+
- recipe[nodejs::npm]
3839
attributes:
3940
nodejs:
4041
install_method: source

Gemfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
source :rubygems
1+
source 'https://rubygems.org'
22

33
gem 'foodcritic'
44
gem 'berkshelf'
5-
gem 'jamie'
6-
gem 'jamie-vagrant'
5+
gem 'thor-foodcritic'
6+
gem 'vagrant', '~> 1.0.6'
7+
8+
group :integration do
9+
gem 'test-kitchen', :git => "git://github.com/opscode/test-kitchen.git", :branch => '1.0'
10+
gem 'kitchen-vagrant', :git => "git://github.com/opscode/kitchen-vagrant.git"
11+
12+
# Change .kitchen.yml's driver_plugin to ec2 and populate
13+
# .kitchen.local.yml's driver_config with aws auth data
14+
gem 'kitchen-ec2', :git => "git://github.com/opscode/kitchen-ec2.git"
15+
end

Vagrantfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# Automatically install and mount cookbooks from Berksfile
22

3+
require 'kitchen/vagrant'
34
require 'berkshelf/vagrant'
4-
require 'jamie/vagrant'
55

66
Vagrant::Config.run do |config|
7-
Jamie::Vagrant.define_vms(config)
7+
Kitchen::Vagrant.define_vms(config)
88
end
9-

0 commit comments

Comments
 (0)