Merge branch '4.3.x'

Author: hunner

CHANGELOG.md

@@ -1,3 +1,27 @@
+##2014-07-14 - Supported Release 4.3.1
+### Summary
+This supported release updates the metadata.json to work around upgrade behavior of the PMT.
+
+#### Bugfixes
+- Synchronize metadata.json with PMT-generated metadata to pass checksums
+
+##2014-06-27 - Supported Release 4.3.0
+### Summary
+This release is the first supported release of the stdlib 4 series. It remains
+backwards-compatible with the stdlib 3 series. It adds two new functions, one bugfix, and many testing updates.
+
+#### Features
+- New `bool2str()` function
+- New `camalcase()` function
+
+#### Bugfixes
+- Fix `has_interface_with()` when interfaces fact is nil
+
+##2014-06-04 - Release 4.2.2
+### Summary
+
+This release adds PE3.3 support in the metadata and fixes a few tests.
+
 ## 2014-05-08 - Release - 4.2.1
 ### Summary
 This release moves a stray symlink that can cause problems.

Gemfile

@@ -18,7 +18,6 @@ group :development, :test do
   gem 'puppet-lint',             :require => false
   gem 'pry',                     :require => false
   gem 'simplecov',               :require => false
-  gem 'beaker',                  :require => false
   gem 'beaker-rspec',            :require => false
 end
 

Modulefile

@@ -25,7 +25,7 @@ module Puppet::Parser::Functions
     interfaces = lookupvar('interfaces')
 
     # If we do not have any interfaces, then there are no requested attributes
-    return false if (interfaces == :undefined)
+    return false if (interfaces == :undefined || interfaces.nil?)
 
     interfaces = interfaces.split(',')
 

lib/puppet/parser/functions/has_interface_with.rb

@@ -1,35 +1,47 @@
 {
+  "name": "puppetlabs-stdlib",
+  "version": "4.3.1",
+  "author": "puppetlabs",
+  "summary": "Puppet Module Standard Library",
+  "license": "Apache 2.0",
+  "source": "git://github.com/puppetlabs/puppetlabs-stdlib",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
+  "issues_url": "https://github.com/puppetlabs/puppetlabs-stdlib/issues",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "4",
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "4",
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "4",
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "4",
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
@@ -49,7 +61,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "10.04",
-        "12.04"
+        "12.04",
+        "14.04"
       ]
     },
     {
@@ -84,22 +97,15 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": "3.2.x"
+      "version_requirement": "3.3.x"
     },
     {
       "name": "puppet",
       "version_requirement": ">=2.7.20 <4.0.0"
     }
   ],
-  "name": "puppetlabs-stdlib",
-  "version": "4.2.1",
-  "source": "git://github.com/puppetlabs/puppetlabs-stdlib",
-  "author": "puppetlabs",
-  "license": "Apache 2.0",
-  "summary": "Puppet Module Standard Library",
   "description": "Standard Library for Puppet Modules",
-  "project_page": "https://github.com/puppetlabs/puppetlabs-stdlib",
   "dependencies": [
-
+  
   ]
 }

metadata.json

@@ -19,7 +19,7 @@
     end
 
     it 'should eat the last two characters of \r\n' do
-      pp = <<-EOS
+      pp = <<-'EOS'
       $input = "test\r\n"
       if size($input) != 6 {
         fail("Size of ${input} is not 6.")

spec/acceptance/chop_spec.rb

@@ -4,15 +4,13 @@
 describe 'ensure_packages function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   describe 'success' do
     it 'ensure_packages a package' do
-      apply_manifest('package { "zsh": ensure => absent, }')
+      apply_manifest('package { "rake": ensure => absent, provider => "gem", }')
       pp = <<-EOS
-      $a = "zsh"
-      ensure_packages($a)
+      $a = "rake"
+      ensure_packages($a,{'provider' => 'gem'})
       EOS
 
-      apply_manifest(pp, :expect_changes => true) do |r|
-        expect(r.stdout).to match(/Package\[zsh\]\/ensure: (created|ensure changed 'purged' to 'present')/)
-      end
+      apply_manifest(pp, :expect_changes => true)
     end
     it 'ensures a package already declared'
     it 'takes defaults arguments'

spec/acceptance/ensure_packages_spec.rb

@@ -4,15 +4,13 @@
 describe 'ensure_resource function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   describe 'success' do
     it 'ensure_resource a package' do
-      apply_manifest('package { "zsh": ensure => absent, }')
+      apply_manifest('package { "rake": ensure => absent, provider => "gem", }')
       pp = <<-EOS
-      $a = "zsh"
-      ensure_resource('package', $a)
+      $a = "rake"
+      ensure_resource('package', $a, {'provider' => 'gem'})
       EOS
 
-      apply_manifest(pp, :expect_changes => true) do |r|
-        expect(r.stdout).to match(/Package\[zsh\]\/ensure: created/)
-      end
+      apply_manifest(pp, :expect_changes => true)
     end
     it 'ensures a resource already declared'
     it 'takes defaults arguments'

spec/acceptance/ensure_resource_spec.rb

@@ -4,18 +4,31 @@
 describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   describe 'success' do
     let(:facts_d) do
-      if fact('is_pe') == "true"
-        '/etc/puppetlabs/facter/facts.d'
+      if 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
+        else
+          '/etc/puppetlabs/facter/facts.d'
+        end
       else
         '/etc/facter/facts.d'
       end
     end
     after :each do
-      shell("if [ -f #{facts_d}/fqdn.txt ] ; then rm #{facts_d}/fqdn.txt ; fi")
+      shell("if [ -f '#{facts_d}/fqdn.txt' ] ; then rm '#{facts_d}/fqdn.txt' ; fi")
+    end
+    before :all do
+      #No need to create on windows, PE creates by default
+      if fact('osfamily') !~ /windows/i
+        shell("mkdir -p '#{facts_d}'")
+      end
     end
     it 'fqdn_rotates floats' do
-      shell("mkdir -p #{facts_d}")
-      shell("echo 'fqdn=fakehost.localdomain' > #{facts_d}/fqdn.txt")
+      shell("echo fqdn=fakehost.localdomain > '#{facts_d}/fqdn.txt'")
       pp = <<-EOS
       $a = ['a','b','c','d']
       $o = fqdn_rotate($a)

spec/acceptance/fqdn_rotate_spec.rb

@@ -3,22 +3,6 @@
 
 describe 'get_module_path function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   describe 'success' do
-    it 'get_module_paths stdlib' do
-      pp = <<-EOS
-      $a = $::is_pe ? {
-        'true'  => '/opt/puppet/share/puppet/modules/stdlib',
-        'false' => '/etc/puppet/modules/stdlib',
-      }
-      $o = get_module_path('stdlib')
-      if $o == $a {
-        notify { 'output correct': }
-      }
-      EOS
-
-      apply_manifest(pp, :catch_failures => true) do |r|
-        expect(r.stdout).to match(/Notice: output correct/)
-      end
-    end
     it 'get_module_paths dne' do
       pp = <<-EOS
       $a = $::is_pe ? {
@@ -28,6 +12,8 @@
       $o = get_module_path('dne')
       if $o == $a {
         notify { 'output correct': }
+      } else {
+        notify { "failed; module path is '$o'": }
       }
       EOS