Merge pull request puppetlabs#73 from branan/use_spechelper_gem

Update for new gem version of puppetlabs_spec_helper

Author: cprice404

.gemfile

@@ -0,0 +1,5 @@
+source :rubygems
+
+puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
+gem 'puppet', puppetversion
+gem 'puppetlabs_spec_helper', '>= 0.1.0'

.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+rvm:
+  - 1.8.7
+before_script:
+after_script:
+script: "rake spec_full"
+branches:
+  only:
+    - master
+env:
+  - PUPPET_VERSION=2.7.13
+  - PUPPET_VERSION=2.7.6
+  - PUPPET_VERSION=2.6.9
+notifications:
+  email: false
+gemfile: .gemfile

Rakefile

@@ -1,16 +1,2 @@
-require 'rake'
-require 'rspec/core/rake_task'
-
-task :default => [:test]
-
-desc 'Run RSpec'
-RSpec::Core::RakeTask.new(:test) do |t|
-  t.pattern = 'spec/{unit}/**/*.rb'
-  t.rspec_opts = ['--color']
-end
-
-desc 'Generate code coverage'
-RSpec::Core::RakeTask.new(:coverage) do |t|
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec']
-end
+require 'rubygems'
+require 'puppetlabs_spec_helper/rake_tasks'

spec/lib/puppet_spec/files.rb

@@ -1,28 +1,4 @@
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, 'lib')
-
-# Don't want puppet getting the command line arguments for rake or autotest
-ARGV.clear
-
-require 'puppet'
-require 'facter'
-require 'mocha'
-gem 'rspec', '>=2.0.0'
-require 'rspec/expectations'
-
-
-# So everyone else doesn't have to include this base constant.
-module PuppetSpec
-  FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
-end
-
-# TODO: ultimately would like to move these requires into the puppet_spec_helper.rb file, but the namespaces
-#  are not currently the same between the two, so tests would need to be modified.  Not ready to undertake that
-#  just yet.
-require 'puppet_spec/files'
-
-require 'puppet_spec_helper'
-
+require 'puppetlabs_spec_helper/puppet_spec_helper'
 
 RSpec.configure do |config|
 

spec/lib/puppet_spec/fixtures.rb

@@ -3,7 +3,7 @@
 require 'fileutils'
 require 'spec_helper'
 describe Puppet::Parser::Functions.function(:get_module_path) do
-  include PuppetSpec::Files
+  include PuppetlabsSpec::Files
 
   def get_scope(environment = 'production')
     scope = Puppet::Parser::Scope.new
@@ -30,7 +30,7 @@ def get_scope(environment = 'production')
       get_scope.function_get_module_path(['foo']).should == foo_path
     end
     it 'should be able to find module paths from the environment' do
-      conf_file = tmpfile('conffile')
+      conf_file = tmpfilename('conffile')
       File.open(conf_file, 'w') do |fh|
         fh.write("[dansenvironment]\nmodulepath = #{modulepath}")
       end