Merge 3367ac6 into e071016

.travis.yml

@@ -2,8 +2,15 @@ rvm:
 - 1.9.3
 - 2.0.0
 - 2.1.3
+gemfile:
+- Gemfile
+- gemfile.chef-11
 language: ruby
 bundler_args: "--without development integration openstack"
 notifications:
   slack:
     secure: bOxdT8KjXuWpBaNvMsf1zGcBRS5Ua3ESYcBWUEXXKE+f+AatmATCdynHq1QJBzE6NtWcGvxlacF4oA3FMmMhJZW9PF3igmYK2TC/aF8TXQ+nE8uzibkj+BphI6/so6TnXCPxoCp6TQ8gZm9cWyj1M4gnFJiZx9eYMVKCIOSRU/0=
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: Gemfile

Gemfile

@@ -3,14 +3,14 @@
 source 'https://rubygems.org'
 
 gem 'berkshelf',  '~> 3.0'
-gem 'chef',       '>= 11.14'
+gem 'chef',       '>= 12.0'
 
 group :test do
   gem 'rake'
-  gem 'chefspec',   '~> 4.1.1'
-  gem 'foodcritic', '~> 3.0'
+  gem 'chefspec',   '~> 4.2.0'
+  gem 'foodcritic', '~> 4.0'
   gem 'thor-foodcritic'
-  gem 'rubocop',    '~> 0.27.0'
+  gem 'rubocop',    '~> 0.28.0'
   gem 'coveralls',  require: false
 end
 

gemfile.chef-11

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+source 'https://rubygems.org'
+
+gem 'berkshelf',  '~> 3.0'
+gem 'chef',       '~> 11.16'
+
+group :test do
+  gem 'rake'
+  gem 'chefspec',   '~> 4.1.1'
+  gem 'foodcritic', '~> 3.0'
+  gem 'thor-foodcritic'
+  gem 'rubocop',    '~> 0.28.0'
+  gem 'coveralls',  require: false
+end
+
+group :development do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-kitchen'
+  gem 'guard-rubocop'
+  gem 'guard-foodcritic'
+end
+
+group :integration do
+  gem 'test-kitchen', '~> 1.0'
+  gem 'kitchen-vagrant'
+  gem 'kitchen-sharedtests', '~> 0.2.0'
+end
+
+group :openstack do
+  gem 'kitchen-openstack'
+end