aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickaël Canévet <mickael.canevet@camptocamp.com>2014-12-11 13:57:30 +0100
committerMickaël Canévet <mickael.canevet@camptocamp.com>2014-12-11 13:57:30 +0100
commitaae3299e7960ea0fe54a9fca4c15861d99669ba5 (patch)
treebaf6c0b07ad1fa0c104f463c4f360fc49198de7f
parent3ee2735268a16d6e1960eddd8d45bef7a3eb436c (diff)
downloadpuppet-dhcp-aae3299e7960ea0fe54a9fca4c15861d99669ba5.tar.gz
puppet-dhcp-aae3299e7960ea0fe54a9fca4c15861d99669ba5.tar.bz2
Update with modulesync_configs [skip ci]
-rw-r--r--.travis.yml6
-rw-r--r--Gemfile13
-rw-r--r--Rakefile1
3 files changed, 15 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index b73ab4b..5e24532 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,14 @@
---
language: ruby
-bundler_args: --without development
+bundler_args: --without system_tests
script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]
matrix:
fast_finish: true
include:
- rvm: 1.8.7
- env: PUPPET_GEM_VERSION="~> 3.0"
+ env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+ - rvm: 1.8.7
+ env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
diff --git a/Gemfile b/Gemfile
index c716faa..cd34bef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,19 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"
-group :development, :test do
+group :development, :unit_tests do
gem 'rake', :require => false
- gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet.git', :branch => 'future-no-import'
+ gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
- gem 'metadata-json-lint', :require => false
+ gem 'simplecov', :require => false
gem 'puppet_facts', :require => false, :git => 'https://github.com/camptocamp/puppet_facts.git'
+ gem 'json', :require => false
+ gem 'metadata-json-lint', :require => false
+end
+
+group :system_tests do
+ gem 'beaker-rspec', :require => false
+ gem 'serverspec', :require => false
end
if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 47d75d8..5cf3aa8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.fail_on_warnings
+PuppetLint.configuration.send('relative')
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]