summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david.schmitt@puppet.com>2016-07-30 17:28:44 +0100
committerGitHub <noreply@github.com>2016-07-30 17:28:44 +0100
commit9a1c9245d38117cf911a12d79457ab9249d35958 (patch)
treece1e3e040e5beb391c7f08bb57085e6efe5505c4
parent6e525fdc1f898202bb63ab4d199f965a7fca24f2 (diff)
parentf152a031b70cb57307ca2d1aa8c28784773d5f2a (diff)
Merge pull request #290 from puppetlabs/update-modulesync
(MAINT) Update for modulesync_config 72d19f184
-rw-r--r--.gitignore3
-rw-r--r--.travis.yml2
-rw-r--r--Gemfile19
3 files changed, 13 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index dd126f2..0cd25de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
pkg/
Gemfile.lock
vendor/
-spec/fixtures/
+spec/fixtures/manifests/
+spec/fixtures/modules/
.vagrant/
.bundle/
coverage/
diff --git a/.travis.yml b/.travis.yml
index 4e2c66d..f631db04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
script: bundle exec rake beaker
services: docker
sudo: required
- - rvm: 2.1.6
+ - rvm: 2.1.9
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- rvm: 2.1.5
diff --git a/Gemfile b/Gemfile
index 9b5b214..c7da908 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,14 +13,12 @@ def location_for(place, version = nil)
end
group :development, :unit_tests do
- gem 'json', :require => false
- gem 'metadata-json-lint', :require => false
- gem 'puppet_facts', :require => false
- gem 'puppetlabs_spec_helper', :require => false
- gem 'rspec-puppet', '>= 2.3.2', :require => false
- gem 'simplecov', :require => false
- gem 'puppet-blacksmith', :require => false
- gem 'rest-client', '~> 1.8.0', :require => false
+ gem 'metadata-json-lint', :require => false
+ gem 'puppet_facts', :require => false
+ gem 'puppet-blacksmith', '>= 3.4.0', :require => false
+ gem 'puppetlabs_spec_helper', :require => false
+ gem 'rspec-puppet', '>= 2.3.2', :require => false
+ gem 'simplecov', :require => false
end
group :system_tests do
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
@@ -31,10 +29,13 @@ group :system_tests do
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
end
+# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
+# if using ruby 1.x
+gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
+
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
-
if File.exists? "#{__FILE__}.local"
eval(File.read("#{__FILE__}.local"), binding)
end