Merge branch 'master' into ikulis_php

Author: videlalvaro

.gitignore

@@ -11,4 +11,6 @@ java/rabbitmq-java-client-bin*
 javascript-nodejs/node_modules
 php/lib/
 python-puka/venv
-ruby/gems/
+ruby*/gems/
+venv/*
+ruby*/rubygems*

.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm: "1.9.3"
+before_install: ./bin/travisci/before_install.sh
+script: make test-travisci
+services:
+  - rabbitmq
+notifications:
+  email: michael@rabbitmq.com
+branches:
+  only:
+    - master
+env:
+  - RUBY=ruby GEM=gem SLOWNESS=4

Makefile

@@ -16,7 +16,7 @@ all:
 # least (as tested on debian 5.0):
 #
 #     apt-get install python-virtualenv git-core php5-cli \
-#         ruby1.8 ruby1.8-dev rdoc1.8 unzip mono-gmcs sun-java5-jdk \
+#         ruby1.9 ruby1.9-dev rdoc1.9 unzip mono-gmcs sun-java5-jdk \
 #         cpan perl
 #
 #
@@ -31,16 +31,26 @@ all:
 #     make
 #     make install
 #
-test: dotnet/.ok erlang/.ok java/.ok python/.ok php/.ok ruby/.ok python-puka/.ok perl/.ok
-	RUBYVER=$(RUBYVER) python test.py
+setup: dotnet/.ok erlang/.ok java/.ok python/.ok php/.ok ruby-amqp/.ok ruby/.ok python-puka/.ok perl/.ok
 
-RABBITVER:=$(shell curl -s "http://www.rabbitmq.com/releases/rabbitmq-server/?C=N;O=D;F=0;V=1" | grep -oE '([0-9\.]{5,})' | head -n 1)
+setup-travisci: dotnet/.ok erlang/.ok java/.ok python/.ok ruby/.ok php/.ok
+
+test: setup
+	RUBY=$(RUBY) python test.py
+
+test-travisci: setup-travisci
+		SLOWNESS=4 RUBY=ruby python travisci.py
+
+RABBITVER:=$(shell curl -s "http://www.rabbitmq.com/releases/rabbitmq-server/" | grep -oE '([0-9\.]{5,})' | tail -n 1)
 R=http://www.rabbitmq.com/releases
 
+# Default value assumes CI environment
+RUBY?=ruby1.9.1
+
 DVER=$(RABBITVER)
 dotnet/.ok:
 	(cd dotnet && \
-		mkdir lib && \
+		mkdir -p lib && \
 		cd lib && \
 		wget -qc $(R)/rabbitmq-dotnet-client/v$(DVER)/rabbitmq-dotnet-client-$(DVER)-dotnet-3.0.zip && \
 		unzip -q rabbitmq-dotnet-client-$(DVER)-dotnet-3.0.zip && \
@@ -92,30 +102,32 @@ clean::
 
 php/.ok:
 	(cd php && \
-		git clone http://github.com/tnc/php-amqplib.git lib/php-amqplib && \
+		mkdir -p ./bin && \
+		curl -sS https://getcomposer.org/installer | php -- --install-dir=bin && \
+		php ./bin/composer.phar install && \
 		touch .ok)
 clean::
 	(cd php && \
 		rm -rf .ok lib)
 
-RUBYVER:=1.8
-GEMSVER=1.8.5
+GEM?=gem1.9.1
 TOPDIR:=$(PWD)
-RVER="0.8.0"
 ruby/.ok:
 	(cd ruby && \
-		wget -qc http://production.cf.rubygems.org/rubygems/rubygems-$(GEMSVER).tgz && \
-		tar xzf rubygems-$(GEMSVER).tgz && \
-		cd rubygems-$(GEMSVER) && \
-		ruby$(RUBYVER) setup.rb --prefix=$(TOPDIR)/ruby/gems && \
-		cd .. && \
-		rm -r rubygems-$(GEMSVER).tgz rubygems-$(GEMSVER) && \
-		GEM_HOME=gems/gems RUBYLIB=gems/lib gems/bin/gem$(RUBYVER) install amqp --version $(RVER) && \
+		GEM_HOME=gems/gems RUBYLIB=gems/lib $(GEM) install bunny --version ">= 0.9.4" --no-ri --no-rdoc && \
 		touch .ok)
 clean::
 	(cd ruby && \
 		rm -rf .ok gems)
 
+ruby-amqp/.ok:
+	(cd ruby-amqp && \
+		GEM_HOME=gems/gems RUBYLIB=gems/lib $(GEM) install amqp --no-ri --no-rdoc && \
+		touch .ok)
+clean::
+	(cd ruby-amqp && \
+		rm -rf .ok gems)
+
 python-puka/.ok:
 	(cd python-puka && \
 		virtualenv venv && \
@@ -125,8 +137,8 @@ python-puka/.ok:
 
 perl/.ok:
 	(cd perl && \
-		cpan -i Net::RabbitFoot && \
-		cpan -i UUID::Tiny && \
+		PERL_MM_USE_DEFAULT=1 cpan -i -f Net::RabbitFoot && \
+		PERL_MM_USE_DEFAULT=1 cpan -i -f UUID::Tiny && \
 		touch .ok)
 
 clean::

bin/travisci/before_install.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+sudo apt-get update
+
+sudo apt-get install -y mercurial make xsltproc zip unzip ant ed curl
+
+# Mono
+sudo apt-get install -y mono-gmcs mono-xbuild mono-devel mono-runtime
+
+# Python
+sudo apt-get install -y python-virtualenv
+
+# PHP
+sudo apt-get install -y php5-cli

php/.gitignore

@@ -0,0 +1,4 @@
+bin/*
+vendor/*
+composer.lock
+

php/README.md

@@ -12,12 +12,13 @@ Additionally you need `PHP 5.3` and `php-amqplib`. To get these
 dependencies on Ubuntu type:
 
     sudo apt-get install git-core php5-cli
-    git clone http://github.com/videlalvaro/php-amqplib.git lib/php-amqplib
 
-Since the tutorials are tested with `php-amqplib` v1.0 you might want to checkout the `v1.0` tag as well:
+Then you can install `php-amqplib` using [Composer](http://getcomposer.org).
 
-    cd lib/php-amqplib/
-    git checkout v1.0
+To do that install Composer and add it to your path, then run the following command
+inside this project folder:
+
+    composer.phar install
 
 ## Code
 

php/composer.json

@@ -0,0 +1,5 @@
+{
+    "require": {
+        "videlalvaro/php-amqplib": "v2.1.0"
+    }
+}

php/emit_log.php

@@ -1,6 +1,8 @@
 <?php
 
-require_once(__DIR__ . '/lib/php-amqplib/amqp.inc');
+require_once __DIR__ . '/vendor/autoload.php';
+use PhpAmqpLib\Connection\AMQPConnection;
+use PhpAmqpLib\Message\AMQPMessage;
 
 $connection = new AMQPConnection('localhost', 5672, 'guest', 'guest');
 $channel = $connection->channel();

php/new_task.php

@@ -1,6 +1,8 @@
 <?php
 
-require_once(__DIR__ . '/lib/php-amqplib/amqp.inc');
+require_once __DIR__ . '/vendor/autoload.php';
+use PhpAmqpLib\Connection\AMQPConnection;
+use PhpAmqpLib\Message\AMQPMessage;
 
 $connection = new AMQPConnection('localhost', 5672, 'guest', 'guest');
 $channel = $connection->channel();

php/receive.php

@@ -1,6 +1,7 @@
 <?php
 
-require_once(__DIR__ . '/lib/php-amqplib/amqp.inc');
+require_once __DIR__ . '/vendor/autoload.php';
+use PhpAmqpLib\Connection\AMQPConnection;
 
 $connection = new AMQPConnection('localhost', 5672, 'guest', 'guest');
 $channel = $connection->channel();