Merge pull request #56 from sambauers/master

Update PHP versions, use Hiera for configs, allow configure params on PHP builds, add PThreads extension, update tests.

Author: mattheath

Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "cardboard", "~> 1.0"
+gem "cardboard", "~> 2.1"

Gemfile.lock

@@ -1,75 +1,80 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    CFPropertyList (2.2.8)
+    addressable (2.3.6)
     ansi (1.4.3)
-    boxen (1.5.2)
+    boxen (2.7.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
       highline (~> 1.6)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9.9)
-      octokit (~> 1.15)
-      puppet (~> 3.0)
-    cardboard (1.0.4)
-      boxen (~> 1.0)
+      librarian-puppet (~> 1.0.0)
+      octokit (~> 2.7, >= 2.7.1)
+      puppet (~> 3.7)
+    cardboard (2.1.0)
+      boxen (~> 2.1)
       puppet-lint (~> 0.3)
       puppetlabs_spec_helper (~> 0.4)
-      rspec-puppet (~> 0.1)
-    diff-lcs (1.2.4)
-    facter (1.7.2)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.5)
-    hiera (1.2.1)
+      rspec-puppet (~> 1.0)
+    diff-lcs (1.2.5)
+    facter (2.3.0)
+      CFPropertyList (~> 2.2.6)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    hiera (1.3.4)
       json_pure
-    highline (1.6.19)
-    json (1.8.0)
-    json_pure (1.8.0)
-    librarian-puppet (0.9.10)
-      json
+    highline (1.6.21)
+    json (1.8.1)
+    json_pure (1.8.1)
+    librarian (0.1.2)
+      highline
       thor (~> 0.15)
-    metaclass (0.0.1)
-    mocha (0.14.0)
+    librarian-puppet (1.0.9)
+      json
+      librarian (>= 0.1.2)
+    metaclass (0.0.4)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.9)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.25.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
-    puppet (3.2.4)
-      facter (~> 1.6)
+    multipart-post (2.0.0)
+    octokit (2.7.2)
+      sawyer (~> 0.5.2)
+    puppet (3.7.3)
+      facter (> 1.6, < 3)
       hiera (~> 1.0)
-      rgen (~> 0.6.5)
+      json_pure
     puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
+    puppet-syntax (1.3.0)
       rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.1.0)
-    rgen (0.6.5)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rspec-puppet (0.1.6)
+    puppetlabs_spec_helper (0.8.2)
+      mocha
+      puppet-lint
+      puppet-syntax
+      rake
+      rspec
+      rspec-puppet
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-puppet (1.0.1)
       rspec
-    thor (0.18.1)
+    rspec-support (3.1.2)
+    sawyer (0.5.5)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cardboard (~> 1.0)
+  cardboard (~> 2.1)

data/common.yaml

@@ -0,0 +1,14 @@
+---
+php::config::root:              "%{::boxen::config::home}/phpenv"
+php::config::logdir:            "%{::boxen::config::logdir}/php"
+php::config::configdir:         "%{::boxen::config::configdir}/php"
+php::config::datadir:           "%{::boxen::config::datadir}/php"
+php::config::pluginsdir:        "%{php::config::root}/plugins"
+php::config::cachedir:          "%{php::config::datadir}/cache"
+php::config::extensioncachedir: "%{php::config::datadir}/cache/extensions"
+php::config::configure_params:  {}
+php::config::composer:
+  version:  '1.0.0-alpha9'
+  checksum: '05df355b5277c8c9012470e699fa5494'
+php::config::phpenv:
+  revision: '6499bb6c7b645af3f4e67f7e17708d5ee208453f'

data/hiera.yaml

@@ -0,0 +1,3 @@
+---
+:hierarchy:
+  - common

lib/puppet/provider/php_version/php_source.rb

@@ -253,7 +253,6 @@ def get_configure_args(version, install_path, config_path)
       "--with-zlib=#{@resource[:homebrew_path]}/opt/zlibphp",
       "--with-snmp=/usr",
       "--with-libedit",
-      "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent",
       "--with-mhash",
       "--with-curl",
       "--with-openssl=/usr",
@@ -267,7 +266,17 @@ def get_configure_args(version, install_path, config_path)
     ]
 
     # PHP-FPM isn't available until 5.3.3
-    args << "--enable-fpm" unless @resource[:version].match(/\A5\.3\.[12]\z/)
+    if Gem::Version.new(@resource[:version]) > Gem::Version.new('5.3.2')
+      args << "--enable-fpm"
+    end
+
+    # libevent was removed in 5.3.8
+    if Gem::Version.new(@resource[:version]) < Gem::Version.new('5.3.8')
+      args << "--with-libevent-dir=#{@resource[:homebrew_path]}/opt/libevent"
+    end
+
+    # User specified configure params
+    args << @resource[:configure_params]
 
     args
   end

lib/puppet/type/php_version.rb

@@ -34,4 +34,8 @@
 
   newparam(:user_home) do
   end
+
+  newparam(:configure_params) do
+    defaultto ''
+  end
 end

manifests/5_4_35.pp

@@ -0,0 +1,9 @@
+# Installs php 5.4.35
+#
+# Usage:
+#
+#     include php::5_4_35
+#
+class php::5_4_35 {
+  php::version { '5.4.35': }
+}

manifests/5_4_36.pp

@@ -0,0 +1,9 @@
+# Installs php 5.4.36
+#
+# Usage:
+#
+#     include php::5_4_36
+#
+class php::5_4_36 {
+  php::version { '5.4.36': }
+}

manifests/5_5.pp

@@ -2,14 +2,15 @@
 #
 # Usage:
 #
-#     include php::5-5
+#     include php::5_5
+#
 class php::5_5 {
   require php
   require php::5_5_0
 
   file { "${php::config::root}/versions/5.5":
     ensure  => symlink,
     force   => true,
-    target  => "${php::root}/versions/5.5.0"
+    target  => "${php::config::root}/versions/5.5.0"
   }
 }

manifests/5_5_18.pp

@@ -0,0 +1,8 @@
+# Installs php 5.5.18
+#
+# Usage:
+#
+#     include php::5_5_18
+class php::5_5_18 {
+  php::version { '5.5.18': }
+}