Fixed linting errors.

Added new mailcatcher part parameter since mailcatcher isn't always installed in /usr/local/bin.
Fixed up exec command, there puppet 3.1.1 outputs the entire array to the upstart erb while 3.2.1 doesn't.
Excluded pkg directory.
Bumped version.

Author: actionjack

Diff for: .gitignore

@@ -1,3 +1,4 @@
 .idea
 .tmp
 .swp
+pkg/

Diff for: Modulefile

@@ -1,5 +1,5 @@
 name    'actionjack-mailcatcher'
-version '0.1.4'
+version '0.1.5'
 source 'https://github.com/actionjack/puppet-mailcatcher'
 author 'actionjack'
 license 'Apache License, Version 2.0'

Diff for: manifests/init.pp

@@ -1,7 +1,8 @@
 # == Class: mailcatcher
 #
 # Install and configure Mailcatcher.
-# MailCatcher runs a super simple SMTP server which catches any message sent to it to display in a web interface.
+# MailCatcher runs a super simple SMTP server which catches any message sent to
+# it to display in a web interface.
 # http://mailcatcher.me/
 #
 # === Parameters
@@ -24,6 +25,9 @@
 #   What TCP Port the mailcatcher web mail client service should listen on.
 #   The default is 1080
 #
+# [*mailcatcher_path*]
+#   Path to the mailcatcher program.
+#   The default is '/usr/local/bin'
 #
 # === Examples
 #
@@ -46,13 +50,15 @@
 # Copyright 2013 Martin Jackson, unless otherwise noted.
 #
 # Todo
-# - Only supports debian based distros need support for other distros e.g. redhat, centos, or Amazon.
+# - Only supports debian based distros need support for other distros
+#   e.g. redhat, centos, or Amazon.
 #
 class mailcatcher (
-  $smtp_ip   = $mailcatcher::params::smtp_ip,
-  $smtp_port = $mailcatcher::params::smtp_port,
-  $http_ip   = $mailcatcher::params::http_ip,
-  $http_port = $mailcatcher::params::http_port
+  $smtp_ip          = $mailcatcher::params::smtp_ip,
+  $smtp_port        = $mailcatcher::params::smtp_port,
+  $http_ip          = $mailcatcher::params::http_ip,
+  $http_port        = $mailcatcher::params::http_port,
+  $mailcatcher_path = $mailcatcher::params::mailcatcher_path
 ) inherits mailcatcher::params {
 
   class {'mailcatcher::package': } ->

Diff for: manifests/params.pp

@@ -1,10 +1,11 @@
 # class mailcatcher::params
 #
 class mailcatcher::params {
-  $smtp_ip   = '0.0.0.0'
-  $smtp_port = '1025'
-  $http_ip   = '0.0.0.0'
-  $http_port = '1080'
+  $smtp_ip          = '0.0.0.0'
+  $smtp_port        = '1025'
+  $http_ip          = '0.0.0.0'
+  $http_port        = '1080'
+  $mailcatcher_path = '/usr/local/bin'
 
   case $::osfamily {
 

Diff for: spec/classes/mailcatcher_spec.rb

@@ -15,11 +15,10 @@
         it { should contain_package('libsqlite3-dev') }
         it { should contain_package('rubygems') }
         it { should contain_package('mailcatcher').with({ 'provider' => 'gem'}) }
-        it { should contain_user('mailcatcher')}
-        it { should contain_file('/etc/init/mailcatcher.conf').with_content(/--http-ip\s0.0.0.0/)}
-        it { should contain_file('/etc/init/mailcatcher.conf').with_content(/--http-port\s1080/)}
-        it { should contain_file('/etc/init/mailcatcher.conf').with_content(/--smtp-ip 0.0.0.0/)}
-        it { should contain_file('/etc/init/mailcatcher.conf').with_content(/--smtp-port\s1025/)}
+        it { should contain_user('mailcatcher') }
+        it 'should contain a properly formatted start up configuration for upstart' do
+          should contain_file('/etc/init/mailcatcher.conf').with_content(/exec\s+nohup\s+\/usr\/local\/bin\/mailcatcher\s+--http-ip\s+0\.0\.0\.0\s+--http-port\s+1080\s+--smtp-ip\s+0\.0\.0\.0\s+--smtp-port\s+1025\s+-f/)
+        end
         it { should contain_file('/etc/init/mailcatcher.conf').with({ :notify => 'Class[Mailcatcher::Service]'})}
         it { should contain_file('/var/log/mailcatcher').with({
             :ensure  => 'directory',

Diff for: templates/etc/init/mailcatcher.conf.erb

@@ -12,5 +12,5 @@ setuid mailcatcher
 setgid mailcatcher
 
 script
- exec nohup /usr/local/bin/mailcatcher<%= @options.to_s %> -f  >> /var/log/mailcatcher/mailcatcher.log 2>&1
+ exec nohup <%= @mailcatcher_path %>/mailcatcher<%= @options.join(' ') %> -f  >> /var/log/mailcatcher/mailcatcher.log 2>&1
 end script