From c035ad837972a819a5b058adcd168dca771e1c2c Mon Sep 17 00:00:00 2001 From: Bryan McLellan Date: Mon, 18 May 2015 15:45:53 -0400 Subject: [PATCH] test chef11/chef12 bundle config --- .travis.yml | 15 +++++++++++---- Gemfile | 1 + knife-windows.gemspec | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 16e6d977..1399e7f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,13 @@ -rvm: - - 2.0.0 - - 2.1.5 - - 2.2.0 +language: ruby script: bundle exec rake spec +install: bundle install --retry=3 + +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")