Prep 4.8.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7343ceffe0a00c905aec0e8498162251a27d8a46..1daa5f064fbbc32c2e018b2fdaaed5dfae258701 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 2015-08-10 - Supported Release 4.8.0
+### Summary
+This release adds a function for reading metadata.json from any module, and expands file\_line's abilities.
+
+#### Features
+- New parameter `replace` on `file_line`
+- New function `load_module_metadata()` to load metadata.json and return the content as a hash.
+- Added hash support to `size()`
+
+#### Bugfixes
+- Fix various docs typos
+- Fix `file_line` resource on puppet < 3.3
+
 ##2015-06-22 - Supported Release 4.7.0
 ###Summary
 

diff --git a/metadata.json b/metadata.json
index 5c20ade2f8357dc887672b7594dfe278b3770195..dab84e568fab386dfe6a562354f1a8d440a77f71 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-stdlib",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "author": "puppetlabs",
   "summary": "Standard library of resources for Puppet modules.",
   "license": "Apache-2.0",

diff --git a/spec/acceptance/ensure_resource_spec.rb b/spec/acceptance/ensure_resource_spec.rb
index 1cee53db97991b20413a11d9ef3765a66bf8acdd..fe619a9e53311036fa0c71b4f34abe9fb6581b72 100755 (executable)
--- a/spec/acceptance/ensure_resource_spec.rb
+++ b/spec/acceptance/ensure_resource_spec.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby -S rspec
 require 'spec_helper_acceptance'
 
-describe 'ensure_resource function', :unless => fact('osfamily') =~ /windows/i do
+describe 'ensure_resource function', :unless => fact('osfamily') =~ /(windows|Suse)/i do
   describe 'success' do
     it 'ensure_resource a package' do
       apply_manifest('package { "rake": ensure => absent, provider => "gem", }')

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 03ff993ca6209a56e12edde6e9841cb668f05189..406fcb60803a37e0d98696abde4767be94882dec 100755 (executable)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -35,15 +35,13 @@ end
 
 RSpec.shared_context "with faked facts" do
   let(:facts_d) do
-    puppet_version = (on default, puppet('--version')).output.chomp
-    if Puppet::Util::Package.versioncmp(puppet_version, '4.0.0') < 0 && fact('is_pe', '--puppet') == "true"
-      if fact('osfamily') =~ /windows/i
-        if fact('kernelmajversion').to_f < 6.0
-          'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'
-        else
-          'C:/ProgramData/PuppetLabs/facter/facts.d'
-        end
+    if fact('osfamily') =~ /windows/i
+      if fact('kernelmajversion').to_f < 6.0
+        'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d'
       else
+        'C:/ProgramData/PuppetLabs/facter/facts.d'
+      end
+    elsif fact('is_pe', '--puppet') == "true"
         '/etc/puppetlabs/facter/facts.d'
       end
     else