summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-09-30 15:02:03 -0700
committerJohn Keiser <john@johnkeiser.com>2015-09-30 15:30:49 -0700
commit949d18e80262dff407a5089c201619afb5c2221e (patch)
tree8e8ca13e46584ee50e4563bd17587959a68988f3
parent5a7666d911998deabfe5d5bbd38f2eea4f7351c2 (diff)
downloadchef-jk/external-tests.tar.gz
Ship our Gemfile so people can run our tests from the gemjk/external-tests
-rw-r--r--.travis.yml18
-rw-r--r--Gemfile2
-rw-r--r--chef.gemspec2
3 files changed, 11 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 7e8fd878c4..9f253df6c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,31 +30,31 @@ matrix:
gemfile: pedant.gemfile
script: bundle exec rake pedant
- rvm: 2.2
- env: GEMFILE_MOD=\"gem 'cheffish', github: 'chef/cheffish'\"
+ env: "GEMFILE_MOD=\"gem 'cheffish', github: 'chef/cheffish'\""
script: bundle exec rake cheffish_spec
- rvm: 2.2
- env: GEMFILE_MOD=\"gem 'chef-provisioning', github: 'chef/chef-provisioning'\"
+ env: "GEMFILE_MOD=\"gem 'chef-provisioning', github: 'chef/chef-provisioning'\""
script: bundle exec rake chef_provisioning_spec
- rvm: 2.2
- env: GEMFILE_MOD=\"gem 'chef-provisioning-aws', github: 'chef/chef-provisioning-aws'\"
+ env: "GEMFILE_MOD=\"gem 'chef-provisioning-aws', github: 'chef/chef-provisioning-aws'\""
script: bundle exec rake chef_provisioning_aws_spec
- rvm: 2.2
- env: GEMFILE_MOD=\"gem 'chefspec'\"
+ env: "GEMFILE_MOD=\"gem 'chefspec'\""
script: bundle exec rake chefspec_spec
- rvm: 2.2
- env: GEMFILE_MOD=\"gem 'chef-sugar'\"
+ env: "GEMFILE_MOD=\"gem 'chef-sugar'\""
script: bundle exec rake chef_sugar_spec
- rvm: 2.2
- env: GEMFILE_MOD=\"gem 'chef-rewind'\"
+ env: "GEMFILE_MOD=\"gem 'chef-rewind'\""
script: bundle exec rake chef_rewind_spec
- rvm: 2.2
- env: GEMFILE_MOD=\"gem 'foodcritic', github: 'acrmp/foodcritic', branch: 'v5.0.0'\"
+ env: "GEMFILE_MOD=\"gem 'foodcritic', github: 'acrmp/foodcritic', branch: 'v5.0.0'\""
script: bundle exec rake foodcritic_spec
- rvm: 2.2
- env: GEMFILE_MOD=\"gem 'halite', github: 'poise/halite'\"
+ env: "GEMFILE_MOD=\"gem 'halite', github: 'poise/halite'\""
script: bundle exec rake halite_spec
- rvm: 2.2
- env: GEMFILE_MOD=\"gem 'poise', github: 'poise/poise'\"
+ env: "GEMFILE_MOD=\"gem 'poise', github: 'poise/poise'\""
script: bundle exec rake poise_spec
# Not working yet: halite
# - rvm: 2.2
diff --git a/Gemfile b/Gemfile
index 6075622932..9d5cf0fea1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,7 @@ group(:development, :test) do
# gem 'chef-rewind'
end
-instance_eval(ENV['GEMFILE_MOD'])
+instance_eval(ENV['GEMFILE_MOD']) if ENV['GEMFILE_MOD']
# If you want to load debugging tools into the bundle exec sandbox,
# add these additional dependencies into chef/Gemfile.local
diff --git a/chef.gemspec b/chef.gemspec
index f28cde21e7..b1abe7670a 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -52,5 +52,5 @@ Gem::Specification.new do |s|
s.executables = %w( chef-client chef-solo knife chef-shell chef-apply )
s.require_path = 'lib'
- s.files = %w(Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
+ s.files = %w(Gemfile Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) }
end