Merge remote-tracking branch 'upstream/master'

Gemfile

@@ -1,9 +1,9 @@
 source "https://rubygems.org"
 
-gem "rake"
+gem 'rake', '~> 10.5.0'
 gem "puppet", ENV['PUPPET_GEM_VERSION'] || '~> 3.8.0'
 gem "puppet-lint"
-gem "rspec-puppet", '~> 1.0.0'
+gem "rspec-puppet", '~> 2.3.2'
 gem "puppetlabs_spec_helper"
 gem "rspec-system-puppet"
 gem "vagrant-wrapper"

Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.1)
     builder (3.2.2)
@@ -139,7 +139,7 @@ GEM
       puppet-syntax
       rake
       rspec-puppet
-    rake (10.4.2)
+    rake (10.5.0)
     rbvmomi (1.8.2)
       builder
       nokogiri (>= 1.4.1)
@@ -156,7 +156,7 @@ GEM
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.4)
-    rspec-puppet (1.0.1)
+    rspec-puppet (2.3.2)
       rspec
     rspec-system (2.8.0)
       fog (~> 1.18)
@@ -186,7 +186,10 @@ DEPENDENCIES
   puppet-lint
   puppet-syntax
   puppetlabs_spec_helper
-  rake
-  rspec-puppet (~> 1.0.0)
+  rake (~> 10.5.0)
+  rspec-puppet (~> 2.3.2)
   rspec-system-puppet
   vagrant-wrapper
+
+BUNDLED WITH
+   1.11.2

manifests/params.pp

@@ -18,7 +18,7 @@
       $key_signature  = undef
       $package_name   = 'erlang'
 
-      if $::operatingsystemrelease =~ /^5/ {
+      if $::operatingsystemrelease and $::operatingsystemrelease =~ /^5/ {
         $local_repo_location  = '/etc/yum.repos.d/epel-erlang.repo'
         $remote_repo_location = 'https://repos.fedorapeople.org/repos/peter/erlang/epel-erlang.repo'
       } else {

spec/classes/erlang_spec.rb

@@ -7,7 +7,8 @@
     let(:facts) { {
       :osfamily => 'Debian',
       :lsbdistid => 'debian',
-      :lsbdistcodename => 'squeeze'
+      :lsbdistcodename => 'squeeze',
+      :operatingsystemrelease => '5'
     }}
 
     context 'with no parameters' do