Merge remote-tracking branch 'lauren/master'

Conflicts:
	README.md

diff --git a/.gemfile b/.gemfile
deleted file mode 100644 (file)
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 444fe1a3a5bbb8f4a4ea3dab5df09fc1ad36a209..d0aec6d793bed7d48e3c8d12fba8f5bc3ae5ded2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.swp
 pkg/
+Gemfile.lock

diff --git a/.travis.yml b/.travis.yml
index bf7829ef78c550a598fc29a47a98037eb963c540..dd3394d8d2a1d1066d394fcf1841a24249bbddf2 100644 (file)
--- 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"
-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 (file)
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.md b/README.md
index 4ab857fb1118d43702f65907e8f02b13720b1994..c6d39151cc7e4669c0f964a18af0b40a94cf01f3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,11 @@
 apt
 ===
 
+[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-apt.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-apt)
+
+## Description
+Provides helpful definitions for dealing with Apt.
+=======
 Overview
 --------
 
@@ -212,4 +217,4 @@ Release Notes
 
 **1.1.0**
 
-This release includes Ubuntu 12.10 (Quantal) support for PPAs.
\ No newline at end of file
+This release includes Ubuntu 12.10 (Quantal) support for PPAs.