Merge branch 'template_deprecation_warnings'

* template_deprecation_warnings:
  Update travis.yml to latest versions of puppet
  Remove deprecation warnings for pin.pref.erb as well
  add @ to variables in template

diff --git a/.gitignore b/.gitignore
index d0aec6d793bed7d48e3c8d12fba8f5bc3ae5ded2..b77434bea0792513cdff50c8759df47957f77965 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.swp
 pkg/
 Gemfile.lock
+spec/fixtures/manifests

diff --git a/.travis.yml b/.travis.yml
index 8f713e06b8fb28bbc476f0ccbc3db93b5dd04e26..a19074d0b8412434d76d5d32f489c4210f9615e2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,13 @@ env:
   - PUPPET_GEM_VERSION="~> 2.7.0"
   - PUPPET_GEM_VERSION="~> 3.0.0"
   - PUPPET_GEM_VERSION="~> 3.1.0"
+  - PUPPET_GEM_VERSION="~> 3.2.0"
 matrix:
-  allow_failures:
-    - rvm: ruby-head
   exclude:
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 3.0.0"
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
     - rvm: 1.9.3
       env: PUPPET_GEM_VERSION="~> 2.7.0"
     - rvm: ruby-head

diff --git a/spec/fixtures/manifests/site.pp b/spec/fixtures/manifests/site.pp
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/templates/pin.pref.erb b/templates/pin.pref.erb
index 74b92659b87352db11945d7e1cd07971c1ec2613..74df8b79c45b54b36400e7d942da2f67df6c9e4d 100644 (file)
--- a/templates/pin.pref.erb
+++ b/templates/pin.pref.erb
@@ -1,5 +1,5 @@
-# <%= name %>
-Explanation: <%= explanation %>
-Package: <%= packages %>
-Pin: <%= pin %>
-Pin-Priority: <%= priority %>
+# <%= @name %>
+Explanation: <%= @explanation %>
+Package: <%= @packages %>
+Pin: <%= @pin %>
+Pin-Priority: <%= @priority %>

diff --git a/templates/source.list.erb b/templates/source.list.erb
index faa7e286ece80cfafd89db734010328030b03c24..65764b2612cac71780f8cbef50cb2b2d9faaf9d6 100644 (file)
--- a/templates/source.list.erb
+++ b/templates/source.list.erb
@@ -1,5 +1,5 @@
-# <%= name %>
-deb <%= location %> <%= release_real %> <%= repos %>
-<%- if include_src then -%>
-deb-src <%= location %> <%= release_real %> <%= repos %>
+# <%= @name %>
+deb <%= @location %> <%= @release_real %> <%= @repos %>
+<%- if @include_src then -%>
+deb-src <%= @location %> <%= @release_real %> <%= @repos %>
 <%- end -%>