From: Raphaël Pinson <raphael.pinson@camptocamp.com>
Date: Tue, 25 Nov 2014 13:20:34 +0000 (+0100)
Subject: Use parser=future
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c58bc1391546c7975933f31ade2b38b35e16919a;p=puppet-dhcp.git

Use parser=future
---

diff --git a/.travis.yml b/.travis.yml
index 0946b14..0cc99fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,11 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future"
+  allow_failures:
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future"
 notifications:
   email: false
 deploy:
diff --git a/Gemfile b/Gemfile
index 29ed93f..3928d5a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test do
   gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
+  gem 'rspec-puppet',            :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'metadata-json-lint',      :require => false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index adbb191..98b22c3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,6 +17,10 @@ RSpec.configure do |c|
     if Gem::Version.new(`puppet --version`) >= Gem::Version.new('3.5')
       Puppet.settings[:strict_variables]=true
     end
+
+    if ENV['PUPPET_PARSER'] == 'future'
+      Puppet.settings[:parser]='future'
+    end
   end
 
   c.after :each do