fixed the variables per travis ci build results

Author: Daniel Schaaff

manifests/agent.pp

@@ -60,6 +60,7 @@
   $puppet_agent_service   = $::puppet::params::puppet_agent_service,
   $puppet_agent_package   = $::puppet::params::puppet_agent_package,
   $version                = 'present',
+  $puppet_facter_package  = $::puppet::params::puppet_facter_package,
   $puppet_run_style       = 'service',
   $puppet_run_command     = '/usr/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1',
   $user_id                = undef,
@@ -125,23 +126,23 @@
   }
   case $::osfamily {
     'Darwin': {
-      package {"facter-${mac_facter_version}.dmg":
+      package {$puppet_facter_package:
         ensure   => present,
         provider => $package_provider,
-        source   => "https://downloads.puppetlabs.com/mac/facter-${mac_facter_version}.dmg",
+        source   => "https://downloads.puppetlabs.com/mac/${puppet_facter_package}",
       }
-      package { "puppet-${mac_version}.dmg":
+      package { $puppet_agent_package:
         ensure   => present,
         provider => $package_provider,
-        source   => "https://downloads.puppetlabs.com/mac/puppet-${mac_version}.dmg"
+        source   => "https://downloads.puppetlabs.com/mac/${puppet_agent_package}"
       }
     }
     default: {
       package { $puppet_agent_package:
         ensure   => $version,
         provider => $package_provider,
       }
-    } 
+    }
   }
 
   if $puppet_run_style == 'service' {
@@ -489,9 +490,9 @@
         }
         unless defined(Package['msgpack']) {
           package {'msgpack':
-            ensure    => 'latest',
-            provider  => 'gem',
-            require   => Package[$::puppet::params::ruby_dev, 'gcc'],
+            ensure   => 'latest',
+            provider => 'gem',
+            require  => Package[$::puppet::params::ruby_dev, 'gcc'],
           }
         }
       }

manifests/params.pp

@@ -91,8 +91,10 @@
     }
     'Darwin': {
       $puppet_agent_service         = 'com.puppetlabs.puppet'
-      $puppet_agent_package         = 'puppet-3.8.4.dmg'
-      $puppet_facter_package        = 'facter.2.4.4.dmg'
+      $puppet_agent_package         = 'puppet-3.8.5.dmg'
+      $puppet_facter_package        = 'facter.2.4.5.dmg'
+      $mac_facter_version           = '2.4.5',
+      $mac_version                  = '3.8.5',
       $package_provider             = 'pkgdmg'
       $puppet_conf                  = '/etc/puppet/puppet.conf'
       $puppet_vardir                = '/var/lib/puppet'