From b7a572a7999f4dbbc79daee7f0ecd194b143327d Mon Sep 17 00:00:00 2001
From: Teemu Matilainen <teemu.matilainen@iki.fi>
Date: Mon, 15 Apr 2013 19:17:30 -0300
Subject: [PATCH 1/2] Use separate Gemfiles for Travis tests

Remove the CHEF_VERSION hack from the gemspec.
---
 .gitignore                    | 1 +
 .travis.yml                   | 8 ++++----
 Gemfile                       | 1 +
 Manifest.txt                  | 2 ++
 knife-solo.gemspec            | 7 +------
 test/gemfiles/Gemfile.chef-10 | 5 +++++
 test/gemfiles/Gemfile.chef-11 | 5 +++++
 7 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 test/gemfiles/Gemfile.chef-10
 create mode 100644 test/gemfiles/Gemfile.chef-11

diff --git a/.gitignore b/.gitignore
index 668bfe4a..c69954b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /test/support/knife-solo.pem
 /test/support/kitchens
 /Gemfile.lock
+/test/gemfiles/*.lock
diff --git a/.travis.yml b/.travis.yml
index 819294c3..ad999ef1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,10 @@
 language: ruby
 rvm:
   - 1.9.3
-env:
-  - CHEF_VERSION=
-  - CHEF_VERSION="~> 10"
+gemfile:
+  - test/gemfiles/Gemfile.chef-11
+  - test/gemfiles/Gemfile.chef-10
 matrix:
   include:
     - rvm: 2.0.0
-      env: CHEF_VERSION=
+      gemfile: test/gemfiles/Gemfile.chef-11
diff --git a/Gemfile b/Gemfile
index 851fabc2..fa75df15 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
+
 gemspec
diff --git a/Manifest.txt b/Manifest.txt
index 12b0c6b3..b9835bea 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -29,6 +29,8 @@ lib/knife-solo/ssh_command.rb
 lib/knife-solo/tools.rb
 test/bootstraps_test.rb
 test/deprecated_command_test.rb
+test/gemfiles/Gemfile.chef-10
+test/gemfiles/Gemfile.chef-11
 test/gitignore_test.rb
 test/integration/amazon_linux_2012_09_bootstrap_test.rb
 test/integration/cases/apache2_bootstrap.rb
diff --git a/knife-solo.gemspec b/knife-solo.gemspec
index 4e693ed2..c5a8cdd4 100644
--- a/knife-solo.gemspec
+++ b/knife-solo.gemspec
@@ -1,10 +1,5 @@
 require File.join(File.dirname(__FILE__), 'lib', 'knife-solo', 'info')
 
-chef_version = ['>= 10.12']
-unless ENV['CHEF_VERSION'].to_s.empty?
-  chef_version = Gem::Requirement.new(ENV['CHEF_VERSION'])
-end
-
 Gem::Specification.new do |s|
   s.name    = 'knife-solo'
   s.version = KnifeSolo.version
@@ -32,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rdoc'
 
-  s.add_dependency 'chef',     chef_version
+  s.add_dependency 'chef',     '>= 10.12'
   s.add_dependency 'net-ssh',  '>= 2.2.2', '< 3.0'
   s.add_dependency 'erubis',   '~> 2.7.0'
 end
diff --git a/test/gemfiles/Gemfile.chef-10 b/test/gemfiles/Gemfile.chef-10
new file mode 100644
index 00000000..93d71a6d
--- /dev/null
+++ b/test/gemfiles/Gemfile.chef-10
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'chef', '~> 10'
diff --git a/test/gemfiles/Gemfile.chef-11 b/test/gemfiles/Gemfile.chef-11
new file mode 100644
index 00000000..0aaf2e0c
--- /dev/null
+++ b/test/gemfiles/Gemfile.chef-11
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'chef', '~> 11'

From 5d1e12773351614a227e867862658f8fe31c14d5 Mon Sep 17 00:00:00 2001
From: Teemu Matilainen <teemu.matilainen@iki.fi>
Date: Mon, 15 Apr 2013 19:29:39 -0300
Subject: [PATCH 2/2] Move Ruby 2.0.0 to the standard Travis build matrix

---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad999ef1..0f6430e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,7 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
 gemfile:
   - test/gemfiles/Gemfile.chef-11
   - test/gemfiles/Gemfile.chef-10
-matrix:
-  include:
-    - rvm: 2.0.0
-      gemfile: test/gemfiles/Gemfile.chef-11