From b5778d56a294e1a3f16055bdba659ff042231e82 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <h.haugen@gmail.com>
Date: Wed, 26 Jun 2013 14:19:57 -0700
Subject: [PATCH] Update specs for current testing practices and GH publish

---
 .fixtures.yml |  1 -
 .gitignore    |  1 +
 .travis.yml   | 39 +++++++++++++++++++++++++--------------
 Gemfile       |  5 ++++-
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 395fdfe..cecf6f5 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,6 +1,5 @@
 fixtures:
   repositories:
     "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib"
-    "create_resources": "git://github.com/puppetlabs/puppetlabs-create_resources.git"
   symlinks:
     "mysql": "#{source_dir}"
diff --git a/.gitignore b/.gitignore
index 444fe1a..d0aec6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.swp
 pkg/
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
index 0e759e2..c4b5dad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,39 @@
+branches:
+  only:
+    - master
 language: ruby
 bundler_args: --without development
-before_script:
-  - "[ $PUPPET_GEM_VERSION ~> 2.6 ] && git clone git://github.com/puppetlabs/puppetlabs-create_resources.git spec/fixtures/modules/create_resources || true"
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+after_success:
+  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
+  - .forge-release/publish
 rvm:
   - 1.8.7
   - 1.9.3
-  - ruby-head
+  - 2.0.0
 env:
-  - PUPPET_GEM_VERSION="~> 2.6.0"
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.0.0"
-  - PUPPET_GEM_VERSION="~> 3.1.0"
+  matrix:
+    - PUPPET_GEM_VERSION="~> 2.7.0"
+    - PUPPET_GEM_VERSION="~> 3.0.0"
+    - PUPPET_GEM_VERSION="~> 3.1.0"
+    - PUPPET_GEM_VERSION="~> 3.2.0"
+  global:
+    - PUBLISHER_LOGIN=puppetlabs
+    - secure: |-
+        Hc9OPm/kRTmjXSP3TbLir/y6Yy1LqmZS8zrqxdTbpo3Z04EYv1uKhaFDpECl
+        0a6bJRUWpLWIuDco08fHMeCTWoFGzE97EDelhHKSYiTNllzYKWPHy7ki/al6
+        wjz0gLtiDfmktHQOHatBy6EKLFjoyjGoE4cUUta4Ixq4tMBNzEA=
 matrix:
-  allow_failures:
-    - rvm: ruby-head
   exclude:
     - rvm: 1.9.3
       env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: ruby-head
+    - rvm: 2.0.0
       env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.6.0"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 2.6.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.0.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index 8e5e04d..0c9691d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :development, :test do
+  gem 'rake',                   :require => false
+  gem 'rspec-puppet',           :require => false
   gem 'puppetlabs_spec_helper', :require => false
+  gem 'puppet-lint',            :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']