Merge pull request #231 from tmatilai/separate-gemfiles-for-travis

Use separate Gemfiles for Travis tests

.gitignore

@@ -9,3 +9,4 @@
 /test/support/knife-solo.pem
 /test/support/kitchens
 /Gemfile.lock
+/test/gemfiles/*.lock

.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
-env:
-  - CHEF_VERSION=
-  - CHEF_VERSION="~> 10"
-matrix:
-  include:
-    - rvm: 2.0.0
-      env: CHEF_VERSION=
+gemfile:
+  - test/gemfiles/Gemfile.chef-11
+  - test/gemfiles/Gemfile.chef-10

Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
+
 gemspec

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

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

test/gemfiles/Gemfile.chef-10

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'chef', '~> 10'

test/gemfiles/Gemfile.chef-11

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'chef', '~> 11'