lobot 2.0.0pre → 2.1.0

data/chef/travis-cookbooks/ci_environment/php/attributes/default.rb

@@ -1,2 +1,40 @@
-default[:php][:multi][:versions] = ["5.2.17", "5.3.3", "5.3.17", "5.4.7"]
-default[:php][:multi][:aliases]  = {"5.2" => "5.2.17", "5.3" => "5.3.17", "5.4" => "5.4.7"}
+default[:php][:multi][:versions] = ["5.2.17", "5.3.3", "5.3.22", "5.4.12", "5.5.0alpha4"]
+default[:php][:multi][:aliases]  = {"5.2" => "5.2.17", "5.3" => "5.3.22", "5.4" => "5.4.12", "5.5" => "5.5.0alpha4"}
+
+default[:php][:multi][:extensions] = {
+  'apc'       => {
+    'versions' => default[:php][:multi][:versions].reject { |version| version.start_with?("5.5") }
+  },
+  'memcache'  => {
+    'versions' => default[:php][:multi][:versions].reject { |version| version.start_with?("5.5") }
+  },
+  'memcached' => {
+    'versions'        => default[:php][:multi][:versions].reject { |version| version.start_with?("5.5") },
+    'before_packages' => %w(libevent-dev libcloog-ppl0),
+    'before_script'   => <<-EOF
+      wget https://launchpad.net/libmemcached/1.0/1.0.16/+download/libmemcached-1.0.16.tar.gz
+      tar xzf libmemcached-1.0.16.tar.gz
+      cd libmemcached-1.0.16
+      ./configure && make && make install
+    EOF
+  },
+  'mongo'     => {
+    'versions' => default[:php][:multi][:versions].reject { |version| version.start_with?("5.5") }
+  },
+  'amqp'      => {
+    'versions'      => default[:php][:multi][:versions].reject { |version| version.start_with?("5.5") },
+    'before_script' => <<-EOF
+      git clone git://github.com/alanxz/rabbitmq-c.git
+      cd rabbitmq-c
+      git submodule init
+      git submodule update
+      autoreconf -i && ./configure && make && make install
+    EOF
+  },
+  'pear.zero.mq/zmq-beta' => {
+    'versions'        => default[:php][:multi][:versions].reject { |version| version.start_with?("5.5") },
+    'before_recipes'  => %w(zeromq::ppa),
+    'before_packages' => %w(libzmq3-dev),
+    'channel'         => 'pear.zero.mq'
+  }
+}

data/chef/travis-cookbooks/ci_environment/php/providers/pecl.rb

@@ -0,0 +1,73 @@
+action :install do
+  new_resource = @new_resource
+  extension    = new_resource.extension
+  versions     = new_resource.versions
+
+  new_resource.before_recipes.each do |recipe|
+    @run_context.include_recipe recipe
+  end
+
+  new_resource.before_packages.each do |pkg|
+    package pkg do
+      action :install
+    end
+  end
+
+  bash "before installing PECL extension #{extension} script" do
+    user    "root"
+    cwd     "/tmp"
+    code    new_resource.before_script
+    only_if do
+      new_resource.before_script && !new_resource.before_script.empty?
+    end
+  end
+
+  versions.each do |php_version|
+    bash "install PECL extension #{extension} for PHP #{php_version}" do
+      user        new_resource.owner
+      group       new_resource.group
+      environment Hash["HOME" => node.travis_build_environment.home]
+      code        <<-EOF
+        source /etc/profile.d/phpenv.sh
+        phpenv global #{php_version}
+
+        if [ ! -z "#{new_resource.channel}" ]; then
+          pear channel-discover #{new_resource.channel}
+        fi
+
+        pecl info #{extension}
+        return=$?
+        if [ $return = 0 ]; then
+          echo "Extension #{extension} was already installed for PHP #{php_version}."
+        elif [ $return = 1 ]; then
+          result=$(pecl install #{extension} | tail -1)
+          if [[ "$result" =~ ^ERROR: ]]; then
+            echo "There was an error installing extension #{extension} for PHP #{php_version}:"
+            echo "$result"
+            exit 1
+          fi
+          echo "Extension #{extension} successfully installed for PHP #{php_version}."
+        else
+          echo "There was an error installing extension #{extension} for PHP #{php_version}."
+          exit 1
+        fi
+      EOF
+    end
+  end
+end
+
+action :uninstall do
+  new_resource = @new_resource
+  extension    = new_resource.extension
+  versions     = new_resource.versions
+
+  versions.each do |php_version|
+    bash "uninstall PECL extension #{extension} for PHP #{php_version}" do
+      user  new_resource.owner
+      group new_resource.group
+      code  <<-EOF
+      pecl uninstall #{extension}
+      EOF
+    end
+  end
+end

data/chef/travis-cookbooks/ci_environment/php/recipes/extensions.rb

@@ -0,0 +1,25 @@
+include_recipe "phpenv"
+include_recipe "phpbuild"
+
+node.php.multi.extensions.each do |php_extension, options|
+  php_pecl php_extension do
+    channel         options['channel']
+    versions        options['versions'] || node.php.multi.versions
+    before_recipes  options['before_recipes']
+    before_packages options['before_packages']
+    before_script   options['before_script']
+    owner           node.travis_build_environment.user
+    group           node.travis_build_environment.group
+
+    action          :install
+  end
+end
+
+node.php.multi.versions.each do |php_version|
+  bash "disable preinstalled PECL extensions for PHP #{php_version}" do
+    user        node.travis_build_environment.user
+    group       node.travis_build_environment.group
+    environment Hash["HOME" => node.travis_build_environment.home]
+    code        "sed -i '/^extension=/d' $HOME/.phpenv/versions/#{php_version}/etc/php.ini"
+  end
+end

data/chef/travis-cookbooks/ci_environment/php/recipes/multi.rb

@@ -5,11 +5,11 @@ phpbuild_path = "#{node.travis_build_environment.home}/.php-build"
 phpenv_path   = "#{node.travis_build_environment.home}/.phpenv"
 
 node.php.multi.versions.each do |php_version|
-
   phpbuild_build "#{phpenv_path}/versions" do
-    version php_version
-    owner   node.travis_build_environment.user
-    group   node.travis_build_environment.group
+    version   php_version
+    with_pear !php_version.start_with?('5.5')
+    owner     node.travis_build_environment.user
+    group     node.travis_build_environment.group
 
     action  :create
   end
@@ -22,4 +22,5 @@ node.php.multi.aliases.each do |short_version, target_version|
   end
 end
 
+include_recipe "php::extensions"
 include_recipe "composer"

data/chef/travis-cookbooks/ci_environment/php/resources/pecl.rb

@@ -0,0 +1,10 @@
+actions :install, :uninstall
+
+attribute :extension,       :kind_of => String, :name_attribute => true
+attribute :channel,         :kind_of => String
+attribute :versions,        :kind_of => Array
+attribute :before_recipes,  :kind_of => Array,  :default => []
+attribute :before_packages, :kind_of => Array,  :default => []
+attribute :before_script,   :kind_of => String
+attribute :owner,           :regex => Chef::Config[:user_valid_regex]
+attribute :group,           :regex => Chef::Config[:group_valid_regex]

data/chef/travis-cookbooks/ci_environment/phpbuild/attributes/default.rb

@@ -1,12 +1,12 @@
 default[:phpbuild] = {
   :git => {
     :repository => "git://github.com/CHH/php-build.git",
-    :revision   => "30c5486d1a33bec9b104c93504888e78c27753b2"
+    :revision   => "970ce028f44f5c1f82fa7bec78d783e1d173bd72"
   },
   :phpunit_plugin => {
     :git => {
       :repository => "git://github.com/CHH/php-build-plugin-phpunit.git",
-      :revision   => "a6a5ce4a5126b90a02dd473b63f660515de7d183"
+      :revision   => "2ee717c0e783809458f3073258c63f42500d1298"
     }
   },
   :custom => {

data/chef/travis-cookbooks/ci_environment/phpbuild/files/default/after-install.d/phpunit.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+set -e
+
+if [ -n "$PHP_BUILD_DEBUG" ]; then
+    set -x
+fi
+
+pyrus="$PREFIX/bin/pyrus"
+pear="$PREFIX/bin/pear"
+
+use_pear() {
+    "$pear" upgrade pear
+
+    "$pear" channel-discover components.ez.no
+    "$pear" channel-discover pear.symfony-project.com
+    "$pear" channel-discover pear.phpunit.de
+
+    if "$PREFIX/bin/php" -v | grep "PHP 5.2"; then
+        "$pear" install "phpunit/File_Iterator-1.3.2"
+        "$pear" install "phpunit/Text_Template-1.1.2"
+        "$pear" install "phpunit/PHP_Timer-1.0.3"
+        "$pear" install "phpunit/PHPUnit-3.6.12"
+    else
+        "$pear" install "phpunit/PHPUnit"
+    fi
+}
+
+use_pyrus() {
+    # ezComponents' PEAR Channel somehow not works with Pyrus
+    # so manually download and install the package files.
+    _ezcomponents_hack() {
+        local base_url="http://components.ez.no/get/$package"
+        local ezcBase="$base_url/Base-1.8.tgz"
+        local ezcConsoleTools="$base_url/ConsoleTools-1.6.1.tgz"
+
+        "$pyrus" install "$ezcBase" "$ezcConsoleTools"
+    }
+
+    # Set up the required channels
+    "$pyrus" channel-discover "components.ez.no"
+    "$pyrus" channel-discover "pear.symfony-project.com"
+    "$pyrus" channel-discover "pear.phpunit.de"
+
+    _ezcomponents_hack
+
+    "$pyrus" install "phpunit/PHPUnit"
+}
+
+if [ -f "$pyrus" ]; then
+    use_pyrus
+else
+    if [ -f "$pear" ]; then
+        use_pear
+    else
+        echo "Neither pear nor pyrus found in $PREFIX/bin. Aborting" >&3
+    fi
+fi

data/chef/travis-cookbooks/ci_environment/phpbuild/files/default/definitions/5.2.17

@@ -5,6 +5,8 @@ configure_option "--with-mime-magic"
 configure_option "--with-libdir=lib"
 
 configure_option -D "--with-openssl"
+configure_option -D "--enable-fpm"
+configure_option -D "--with-gmp"
 
 configure_option -R "--with-mysql"
 configure_option -R "--with-mysqli"
@@ -13,4 +15,4 @@ configure_option -R "--with-pdo-mysql"
 with_pear
 
 install_package "http://museum.php.net/php5/php-5.2.17.tar.bz2"
-install_xdebug "2.1.3"
+install_xdebug "2.1.4"

data/chef/travis-cookbooks/ci_environment/phpbuild/files/default/definitions/5.3.3

@@ -1,5 +1,6 @@
 configure_option -D "--with-openssl"
+configure_option -D "--enable-fpm"
 
 install_package "http://museum.php.net/php5/php-5.3.3.tar.bz2"
 install_pyrus
-install_xdebug "2.1.3"
+install_xdebug "2.1.4"

data/chef/travis-cookbooks/ci_environment/phpbuild/providers/build.rb

@@ -16,7 +16,7 @@ action :create do
       cwd         "#{phpbuild_path}/bin"
       ini_suffix  = version < '5.3' ? 'dist' : 'development'
       code <<-EOF
-      ./php-build -i #{ini_suffix} #{pear_option} #{version} #{target_path}
+      PHP_VERSION=#{version} ./php-build -i #{ini_suffix} #{pear_option} #{version} #{target_path}
       EOF
     end
 

data/chef/travis-cookbooks/ci_environment/phpbuild/recipes/default.rb

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: phpbuild
 # Recipe:: default
-# Copyright 2011-2012, Travis CI development team
+# Copyright 2011-2013, Travis CI Development Team <contact@travis-ci.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -44,8 +44,8 @@ when "ubuntu", "debian"
   end
 
   if node[:platform_version].to_f >= 12.04
-    link "/usr/lib/libmysqlclient.so" do
-      to "/usr/lib/#{node.phpbuild.arch}-linux-gnu/libmysqlclient.so"
+    link "/usr/lib/libmysqlclient_r.so" do
+      to "/usr/lib/#{node.phpbuild.arch}-linux-gnu/libmysqlclient_r.so"
     end
   end
 
@@ -98,14 +98,12 @@ directory "#{phpbuild_path}/tmp" do
   action :create
 end
 
-bash "install php-build plugins" do
-  user   node.travis_build_environment.user
+cookbook_file "#{phpbuild_path}/share/php-build/after-install.d/phpunit" do
+  owner  node.travis_build_environment.user
   group  node.travis_build_environment.group
-  code <<-EOF
-  cp /tmp/php-build-plugin-phpunit/share/php-build/after-install.d/phpunit #{phpbuild_path}/share/php-build/after-install.d
-  rm -rf /tmp/php-build-plugin-phpunit
-  EOF
-  not_if "test -f #{phpbuild_path}/share/php-build/after-install.d/phpunit"
+  mode   "0755"
+
+  source "after-install.d/phpunit.sh"
 end
 
 template "#{phpbuild_path}/share/php-build/default_configure_options" do

data/chef/travis-cookbooks/ci_environment/phpbuild/templates/default/default_configure_options.erb

@@ -36,3 +36,7 @@
 --with-bz2
 --enable-bcmath
 --enable-calendar
+--with-libdir=lib
+--enable-fpm
+--enable-maintainer-zts
+--with-gmp

data/chef/travis-cookbooks/ci_environment/phpenv/attributes/default.rb

@@ -0,0 +1,6 @@
+default[:phpenv] = {
+  :git => {
+    :repository => "git://github.com/CHH/phpenv.git",
+    :revision   => "a3091e84de6dd2c61ea1bdb96cf3053c62740a3f"
+  }
+}

data/chef/travis-cookbooks/ci_environment/phpenv/recipes/default.rb

@@ -1,21 +1,25 @@
 include_recipe "git"
+phpenv_path = "#{node.travis_build_environment.home}/.phpenv"
 
-remote_file "/tmp/phpenv-install.sh"  do
-  source "https://raw.github.com/CHH/phpenv/master/bin/phpenv-install.sh"
-  mode "0755"
+git "/tmp/phpenv" do
+  user       node.travis_build_environment.user
+  group      node.travis_build_environment.group
+  repository node[:phpenv][:git][:repository]
+  revision   node[:phpenv][:git][:revision]
+  action     :checkout
 end
 
 bash "install phpenv" do
   user  node.travis_build_environment.user
   group node.travis_build_environment.group
-  environment Hash["HOME" => node.travis_build_environment.home]
   code <<-EOF
-  . /tmp/phpenv-install.sh
+  PHPENV_ROOT="#{phpenv_path}" . /tmp/phpenv/bin/phpenv-install.sh
+  cp /tmp/phpenv/extensions/rbenv-config-add /tmp/phpenv/extensions/rbenv-config-rm "#{phpenv_path}/libexec"
   EOF
-  not_if "test -f #{node.travis_build_environment.home}/.phpenv/bin/phpenv"
+  not_if "test -f #{phpenv_path}/bin/phpenv"
 end
 
-directory "#{node.travis_build_environment.home}/.phpenv/versions" do
+directory "#{phpenv_path}/versions" do
   owner  node.travis_build_environment.user
   group  node.travis_build_environment.group
   mode   "0755"

data/chef/travis-cookbooks/ci_environment/postgresql/recipes/server_on_ramfs.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: postgresql
 # Recipe:: server_on_ramfs
 #
-# Copyright 2011, Travis CI Development Team
+# Copyright 2011-2013, Travis CI Development Team <contact@travis-ci.org>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 include_recipe "ramfs"
 
-node[:postgresql][:data_dir] = "#{node[:ramfs][:dir]}/postgresql"
+node.set[:postgresql][:data_dir] = "#{node[:ramfs][:dir]}/postgresql"
 
 include_recipe "postgresql::server"
 

data/chef/travis-cookbooks/ci_environment/python/attributes/default.rb

@@ -18,5 +18,5 @@
 # limitations under the License.
 #
 
-default['python']['multi']['pythons'] = %w(python2.5 python2.6 python2.7 python3.1 python3.2 pypy)
-default['python']['pip']['packages']  = %w(nose pytest mock)
+default['python']['multi']['pythons'] = %w(python2.5 python2.6 python2.7 python3.2 python3.3 pypy)
+default['python']['pip']['packages']  = %w(nose pytest mock numpy)

data/chef/travis-cookbooks/ci_environment/python/recipes/multi.rb

@@ -1,7 +1,7 @@
 #
 # Cookbook Name:: python::dead_snakes_ppa
 # Recipe:: default
-# Copyright 2011, Michael S. Klishin & Travis CI development team
+# Copyright 2011, Michael S. Klishin & Travis CI Development Team
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -92,6 +92,13 @@ node.python.multi.pythons.each do |py|
     end
   end
 
+  packages = if ["python3.3", "3.3", "python3.2", "3.2", "pypy"].include?(py.to_s.downcase)
+               # some versions fail to install NumPy. MK.
+               node.python.pip.packages.reject { |p| p =~ /numpy/ }
+             else
+               node.python.pip.packages
+             end
+
   script "preinstall pip packages for virtualenv set 1 (#{py})" do
     interpreter "bash"
     user        node.travis_build_environment.user
@@ -99,7 +106,7 @@ node.python.multi.pythons.each do |py|
 
     cwd node.travis_build_environment.home
     code <<-EOH
-    #{installation_root}/#{py}/bin/pip install --quiet #{node.python.pip.packages.join(' ')} --use-mirrors
+    #{installation_root}/#{py}/bin/pip install --quiet #{packages.join(' ')} --use-mirrors
     EOH
 
     environment({ "VIRTUAL_ENV_DISABLE_PROMPT" => "true" })
@@ -114,7 +121,7 @@ node.python.multi.pythons.each do |py|
 
     cwd node.travis_build_environment.home
     code <<-EOH
-    #{installation_root}/#{py}_with_system_site_packages/bin/pip install --quiet #{node.python.pip.packages.join(' ')} --use-mirrors
+    #{installation_root}/#{py}_with_system_site_packages/bin/pip install --quiet #{packages.join(' ')} --use-mirrors
     EOH
 
     environment({ "VIRTUAL_ENV_DISABLE_PROMPT" => "true" })

data/chef/travis-cookbooks/ci_environment/rabbitmq/attributes/default.rb

@@ -6,3 +6,6 @@ default[:rabbitmq][:logdir] = nil
 default[:rabbitmq][:mnesiadir] = nil
 
 default[:rabbitmq][:high_memory_watermark]  = 0.04
+
+default[:rabbitmq][:service][:enabled]      = false
+