Test against Chef 11, and Chef 12+ in Travis

.gitignore

@@ -1,4 +1,5 @@
 *.gem
 .bundle
 Gemfile.lock
+travis.gemfile.lock
 pkg/*

.travis.yml

@@ -1,6 +1,17 @@
+language: ruby
+
 rvm:
+  - 1.9.3
   - 2.0.0
-  - 2.1.5
-  - 2.2.0
 
-script: bundle exec rake spec
+gemfile: ci.gemfile
+
+env:
+  - CHEF_VERSION="master"
+  - CHEF_VERSION="< 12"
+
+matrix:
+  exclude:
+  - rvm: 1.9.3
+    env: CHEF_VERSION="master"
+

Gemfile

@@ -3,13 +3,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in knife-windows.gemspec
 gemspec
 
-# TODO: Remove this line when a new version of `winrm-s` is released which contains:
-#
-#   https://github.com/chef/winrm-s/commit/d9a85d7c93ef4c24faaea760cdc58a3532d599e9
-#
-gem 'winrm-s', github: 'chef/winrm-s'
-
 group :test do
+  gem "chef"
   gem "rspec", '~> 3.0'
   gem "ruby-wmi"
   gem "httpclient"

appveyor.yml

@@ -5,9 +5,12 @@ platform:
   - x64
 
 environment:
+  bundle_gemfile: ci.gemfile
   matrix:
     - ruby_version: "193"
     - ruby_version: "200"
+    - chef_version: "master"
+    - chef_version: "< 12"
 
 clone_folder: c:\projects\knife-windows
 clone_depth: 1

ci.gemfile

@@ -0,0 +1,15 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in knife-windows.gemspec
+gemspec
+
+if ENV['CHEF_VERSION'] == 'master'
+  gem 'chef', github: 'chef/chef'
+else
+  gem 'chef', ENV['CHEF_VERSION']
+end
+
+gem "rspec", '~> 3.0'
+gem "ruby-wmi"
+gem "httpclient"
+gem 'rake'

knife-windows.gemspec

@@ -18,9 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "winrm-s", "~> 0.3.0.dev.0"
   s.add_dependency "nokogiri"
 
-
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'chef', '< 12'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")