Merge pull request rodjek#274 from DavidS/include-pops-from-puppet4

Include pops from puppet4

lib/rspec-puppet/matchers/run.rb

@@ -58,7 +58,7 @@ def matches?(func_obj)
 
       def with_params(*params)
         @params = params
-        # stringify immediatly to protect us from the params being changed by
+        # stringify immediately to protect us from the params being changed by
         # the subject, e.g. with params.shift
         @func_args = @params.inspect[1..-2]
         self

lib/rspec-puppet/setup.rb

@@ -1,4 +1,7 @@
 require 'puppet'
+if Puppet.version.to_f >= 4.0
+  require 'puppet/pops'
+end
 require 'fileutils'
 
 module RSpec::Puppet

spec/functions/nasty_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe 'nasty' do
+
+  it { expect(subject).not_to eq(nil) }
+  it { expect(subject).to run.with_params('foo', 'bar').and_return('foo') }
+
   describe 'the underlying Run matcher' do
     it 'should not have its description manipulated by running the function' do
       run_matcher = run.with_params('foo', 'bar').and_return('foo')