Merge pull request #31 from boxen/5.5.0

Add PHP 5.5.0 --> 5.5.10

files/brews/bison26.rb

@@ -0,0 +1,18 @@
+require 'formula'
+
+class Bisonphp26 < Formula
+  homepage 'http://www.gnu.org/software/bison/'
+  url 'http://ftpmirror.gnu.org/bison/bison-2.6.5.tar.gz'
+  mirror 'http://ftp.gnu.org/gnu/bison/bison-2.6.5.tar.gz'
+  sha1 '2cea0ea4a41dcfc05332613060026de0af1458cc'
+
+  version '2.6.5-boxen1'
+
+  keg_only :provided_by_osx, 'Some formulae require a newer version of bison.'
+
+  def install
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}"
+    system "make install"
+  end
+end

lib/puppet/provider/php_version/php_source.rb

@@ -164,8 +164,17 @@ def configure(version)
     args = args.join(" ")
 
     # Right, the hard part - configure for our system
-    puts "Configuring PHP #{version}: #{args}"
-    puts %x( cd #{@resource[:phpenv_root]}/php-src/ && export ac_cv_exeext='' && ./configure #{args} )
+
+    # Some env variables are needed for configuration
+    env = "export ac_cv_exeext=''"
+
+    # PHP 5.5+ requires a later version of Bison than OSX provides (2.6 vs 2.3)
+    env << " && export PATH=/opt/boxen/homebrew/opt/bisonphp26/bin:$PATH" unless @resource[:version].match(/\A5\.[34]/)
+
+    # Construct and run configure command
+    configure_command = "cd #{@resource[:phpenv_root]}/php-src/ && #{env} && ./configure #{args}"
+    puts "Configuring PHP #{version}: #{configure_command}"
+    puts %x( #{configure_command} )
     exit_code = $?
 
     # Ensure Configure exited successfully

manifests/5_5.pp

@@ -0,0 +1,15 @@
+# Installs php 5.5.0 and symlinks it as 5.5
+#
+# Usage:
+#
+#     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"
+  }
+}

manifests/5_5_0.pp

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

manifests/5_5_1.pp

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

manifests/5_5_10.pp

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

manifests/5_5_2.pp

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

manifests/5_5_3.pp

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

manifests/5_5_4.pp

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

manifests/5_5_5.pp

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

manifests/5_5_6.pp

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

manifests/5_5_7.pp

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

manifests/5_5_8.pp

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

manifests/5_5_9.pp

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

manifests/fpm/5_5_0.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.0
+# Installs PHP 5.5.0 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_0
+#
+class php::fpm::5_5_0 {
+  php::fpm { '5.5.0': }
+}

manifests/fpm/5_5_1.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.1
+# Installs PHP 5.5.1 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_1
+#
+class php::fpm::5_5_1 {
+  php::fpm { '5.5.1': }
+}

manifests/fpm/5_5_10.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.10
+# Installs PHP 5.5.10 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_10
+#
+class php::fpm::5_5_10 {
+  php::fpm { '5.5.10': }
+}

manifests/fpm/5_5_2.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.2
+# Installs PHP 5.5.2 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_2
+#
+class php::fpm::5_5_2 {
+  php::fpm { '5.5.2': }
+}

manifests/fpm/5_5_3.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.3
+# Installs PHP 5.5.3 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_3
+#
+class php::fpm::5_5_3 {
+  php::fpm { '5.5.3': }
+}

manifests/fpm/5_5_4.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.4
+# Installs PHP 5.5.4 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_4
+#
+class php::fpm::5_5_4 {
+  php::fpm { '5.5.4': }
+}

manifests/fpm/5_5_5.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.5
+# Installs PHP 5.5.5 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_5
+#
+class php::fpm::5_5_5 {
+  php::fpm { '5.5.5': }
+}

manifests/fpm/5_5_6.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.6
+# Installs PHP 5.5.6 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_6
+#
+class php::fpm::5_5_6 {
+  php::fpm { '5.5.6': }
+}

manifests/fpm/5_5_7.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.7
+# Installs PHP 5.5.7 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_7
+#
+class php::fpm::5_5_7 {
+  php::fpm { '5.5.7': }
+}

manifests/fpm/5_5_8.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.8
+# Installs PHP 5.5.8 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_8
+#
+class php::fpm::5_5_8 {
+  php::fpm { '5.5.8': }
+}

manifests/fpm/5_5_9.pp

@@ -0,0 +1,10 @@
+# Launches a PHP FPM service running PHP 5.5.9
+# Installs PHP 5.5.9 if it doesn't already exist
+#
+# Usage:
+#
+#     include php::fpm::5_5_9
+#
+class php::fpm::5_5_9 {
+  php::fpm { '5.5.9': }
+}

manifests/init.pp

@@ -85,6 +85,18 @@
     ensure => '2.13-boxen1',
   }
 
+  # PHP 5.5 drops support for Bison 2.3 which is shipped with OSX
+  # Therefore need a later version, which we'll again sandbox just for this
+
+  homebrew::formula { 'bisonphp26':
+    source => 'puppet:///modules/php/brews/bison26.rb',
+    before => Package['boxen/brews/bisonphp26'],
+  }
+
+  package { 'boxen/brews/bisonphp26':
+    ensure => '2.6.5-boxen1',
+  }
+
   # Install dupe version of zlib as tapping homebrew dupes appears to have
   # broken. I've also tried to build a specific zlib module, but this also
   # will not currently install via brew within boxen

spec/classes/fpm/php_fpm_5_5_0_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_0" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.0")
+  end
+end

spec/classes/fpm/php_fpm_5_5_10_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_10" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.10")
+  end
+end

spec/classes/fpm/php_fpm_5_5_1_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_1" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.1")
+  end
+end

spec/classes/fpm/php_fpm_5_5_2_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_2" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.2")
+  end
+end

spec/classes/fpm/php_fpm_5_5_3_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_3" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.3")
+  end
+end

spec/classes/fpm/php_fpm_5_5_4_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_4" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.4")
+  end
+end

spec/classes/fpm/php_fpm_5_5_5_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_5" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.5")
+  end
+end

spec/classes/fpm/php_fpm_5_5_6_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_6" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.6")
+  end
+end

spec/classes/fpm/php_fpm_5_5_7_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_7" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.7")
+  end
+end

spec/classes/fpm/php_fpm_5_5_8_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "php::fpm::5_5_8" do
+  let(:facts) { default_test_facts }
+
+  it do
+    should contain_php__fpm("5.5.8")
+  end
+end