From 2247df4f6e828d6791a46cb12d4e2df2e0b98dce Mon Sep 17 00:00:00 2001
From: Branan Purvine-Riley <branan@puppetlabs.com>
Date: Tue, 29 May 2012 13:55:26 -0700
Subject: Update for new gem version of puppetlabs_spec_helper

This updates the Rakefile and spec_helper to use the common versions
available in the puppetlabs_spec_helper rubygem branch. This mostly
just removes a bunch of duplicated code, but it also gives us more
flexibility in how the module is tested in the future.
---
 .gemfile | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .gemfile

(limited to '.gemfile')

diff --git a/.gemfile b/.gemfile
new file mode 100644
index 0000000..7e4ae1d
--- /dev/null
+++ b/.gemfile
@@ -0,0 +1,5 @@
+source :rubygems
+
+puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
+gem 'puppet', puppetversion
+gem 'puppet_module_spec_helper', :git => 'git://github.com/branan/puppetlabs_spec_helper'
-- 
cgit v1.2.3


From d9410f72e416da15eb1660d15ba2b4288ccc0873 Mon Sep 17 00:00:00 2001
From: Branan Purvine-Riley <branan@puppetlabs.com>
Date: Tue, 29 May 2012 17:53:27 -0700
Subject: Require the new puppetlabs_spec_helper gem name

---
 .gemfile            | 2 +-
 Rakefile            | 2 +-
 spec/spec_helper.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to '.gemfile')

diff --git a/.gemfile b/.gemfile
index 7e4ae1d..9aad840 100644
--- a/.gemfile
+++ b/.gemfile
@@ -2,4 +2,4 @@ source :rubygems
 
 puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
 gem 'puppet', puppetversion
-gem 'puppet_module_spec_helper', :git => 'git://github.com/branan/puppetlabs_spec_helper'
+gem 'puppetlabs_spec_helper', '>= 0.1.0'
diff --git a/Rakefile b/Rakefile
index 277c8e2..14f1c24 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,2 +1,2 @@
 require 'rubygems'
-require 'puppet_module_spec_helper/rake_tasks'
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0fd4a26..3fdcbbc 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-require 'puppet_module_spec_helper/puppet_spec_helper'
+require 'puppetlabs_spec_helper/puppet_spec_helper'
 
 RSpec.configure do |config|
 
-- 
cgit v1.2.3