puppetlabs_spec_helper 0.7.0 → 0.8.0

data/CHANGELOG

@@ -1,3 +1,14 @@
+2014-07-29 - Release 0.8.0
+Summary:
+This release uses the new puppet-syntax gem to perform manifest validation
+better than before! Shiny.
+
+Features:
+- Use puppet-syntax gem for manifest validation rake task
+
+Bugfixes:
+- Fix compatibility with rspec 3
+
 2014-07-17 - Release 0.7.0
 Summary:
 This feature release adds the ability to test structured facts, manifest

data/lib/puppetlabs_spec_helper/puppetlabs_spec/matchers.rb

@@ -1,13 +1,18 @@
 require 'stringio'
+require 'rspec/expectations'
 
 ########################################################################
 # Backward compatibility for Jenkins outdated environment.
 module RSpec
   module Matchers
     module BlockAliases
-      alias_method :to,     :should      unless method_defined? :to
-      alias_method :to_not, :should_not  unless method_defined? :to_not
-      alias_method :not_to, :should_not  unless method_defined? :not_to
+      if method_defined? :should
+        alias_method :to, :should unless method_defined? :to
+      end
+      if method_defined? :should_not
+        alias_method :to_not, :should_not unless method_defined? :to_not
+        alias_method :not_to, :should_not unless method_defined? :not_to
+      end
     end
   end
 end

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -200,31 +200,18 @@ task :lint do
   PuppetLint.configuration.ignore_paths << "spec/fixtures/**/*.pp"
 end
 
-desc "Check puppet manifest syntax"
-task :syntax do
-  require 'puppet/face'
-  parser = Puppet::Face['parser', :current]
+require 'puppet-syntax/tasks/puppet-syntax'
+PuppetSyntax.exclude_paths ||= []
+PuppetSyntax.exclude_paths << "spec/fixtures/**/*.pp"
+PuppetSyntax.future_parser = true if ENV['FUTURE_PARSER'] == 'yes'
 
-  RakeFileUtils.send(:verbose, true) do
-    matched_files = FileList['**/*.pp'].exclude 'spec/fixtures/**/*.pp'
-
-    matched_files.to_a.each do |puppet_file|
-      parser.validate(puppet_file)
-    end
-  end
-end
-
-desc "Validate manifests, templates, and ruby files in lib."
+desc "Check syntax of Ruby files and call :syntax"
 task :validate do
-  Dir['manifests/**/*.pp'].each do |manifest|
-    sh "puppet parser validate --noop #{manifest}"
-  end
   Dir['lib/**/*.rb'].each do |lib_file|
     sh "ruby -c #{lib_file}"
   end
-  Dir['templates/**/*.erb'].each do |template|
-    sh "erb -P -x -T '-' #{template} | ruby -c"
-  end
+
+  Rake::Task[:syntax].invoke
 end
 
 desc "Display the list of available rake tasks"

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 module PuppetlabsSpecHelper
   module Version
-    STRING = '0.7.0'
+    STRING = '0.8.0'
   end
 end

data/puppetlabs_spec_helper.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rake'
   s.add_runtime_dependency 'rspec-puppet'
   s.add_runtime_dependency 'puppet-lint'
+  s.add_runtime_dependency 'puppet-syntax'
   s.add_runtime_dependency 'rspec'
   s.add_runtime_dependency 'mocha'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puppet-syntax
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement