summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gemfile5
-rw-r--r--.gitignore1
-rw-r--r--.travis.yml29
-rw-r--r--Gemfile13
-rw-r--r--README.markdown2
5 files changed, 35 insertions, 15 deletions
diff --git a/.gemfile b/.gemfile
deleted file mode 100644
index 9aad840..0000000
--- a/.gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-source :rubygems
-
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper', '>= 0.1.0'
diff --git a/.gitignore b/.gitignore
index 42a59a4..49cf465 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
pkg/
metadata.json
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
index 0ec5a08..dd3394d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,25 @@
language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
rvm:
- 1.8.7
-before_script:
-after_script:
-script: "rake spec_full"
-branches:
- only:
- - master
+ - 1.9.3
+ - ruby-head
env:
- - PUPPET_VERSION=2.7.13
- - PUPPET_VERSION=2.7.6
- - PUPPET_VERSION=2.6.9
+ - PUPPET_GEM_VERSION="~> 2.6"
+ - PUPPET_GEM_VERSION="~> 2.7"
+ - PUPPET_GEM_VERSION="~> 3.0"
+matrix:
+ allow_failures:
+ - rvm: ruby-head
+ exclude:
+ - rvm: 1.9.3
+ env: PUPPET_GEM_VERSION="~> 2.7"
+ - rvm: ruby-head
+ env: PUPPET_GEM_VERSION="~> 2.7"
+ - rvm: 1.9.3
+ env: PUPPET_GEM_VERSION="~> 2.6"
+ - rvm: ruby-head
+ env: PUPPET_GEM_VERSION="~> 2.6"
notifications:
email: false
-gemfile: .gemfile
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..8e5e04d
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,13 @@
+source :rubygems
+
+group :development, :test do
+ gem 'puppetlabs_spec_helper', :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+ gem 'puppet', puppetversion, :require => false
+else
+ gem 'puppet', :require => false
+end
+
+# vim:ft=ruby
diff --git a/README.markdown b/README.markdown
index a1e168a..e3aef69 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,5 +1,7 @@
# NTP #
+[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-ntp.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-ntp)
+
Manage the NTP service.
This module has been built and tested using Puppet 2.6.x