From 0179332e6454578dd2fdeca8290f3563922887e1 Mon Sep 17 00:00:00 2001
From: Bryan McLellan <btm@loftninjas.org>
Date: Mon, 18 May 2015 15:45:53 -0400
Subject: [PATCH] test chef11/chef12 bundle config

---
 .travis.yml           | 14 ++++++++++----
 Gemfile               |  1 +
 knife-windows.gemspec |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 16e6d977..8acd6b08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,12 @@
-rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.0
+language: ruby
 
+before_script: bundle install
 script: bundle exec rake spec
+
+matrix:
+  include:
+  - rvm: 1.9.3
+    gemfile: chef11.gemfile
+  - rvm: 2.0.0
+  - rvm: 2.1.5
+  - rvm: 2.2.0
diff --git a/Gemfile b/Gemfile
index 559eb436..7d6326f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,7 @@ gem 'winrm-s', github: 'chef/winrm-s'
 
 group :test do
   gem "rspec", '~> 3.0'
+  gem "chef"
   gem "ruby-wmi"
   gem "httpclient"
   gem 'rake'
diff --git a/knife-windows.gemspec b/knife-windows.gemspec
index 0fe5b178..800c7ab9 100644
--- a/knife-windows.gemspec
+++ b/knife-windows.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
 
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'chef', '< 12'
+  #s.add_development_dependency 'chef', '< 12'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")