[WIP] Version 2.0.x

.gitignore

@@ -0,0 +1 @@
+/rabbitmq-cli-consumer

.travis.yml

@@ -0,0 +1,10 @@
+language: go
+
+go:
+  - 1.4
+  - 1.5
+  - tip
+
+matrix:
+  allow_failures:
+    - go: tip

README.md

@@ -1,6 +1,8 @@
 RabbitMQ cli consumer
 ---------------------
 
+[![Build Status](https://travis-ci.org/ricbra/rabbitmq-cli-consumer.svg)](https://travis-ci.org/ricbra/rabbitmq-cli-consumer)
+
 If you are a fellow PHP developer just like me you're probably aware of the following fact:
 PHP really SUCKS in long running tasks.
 
@@ -103,7 +105,60 @@ Run without arguments or with <code>--help</code> switch to show the helptext:
        --help, -h		show help
        --version, -v	print the version
 
-## Configuration
+## Fanout
+
+Todo.
+
+## Remote Procedure Call
+
+No special configuration is required for enabling RPC mode. You should be aware
+that any output on STDOUT will be returned as reply to the requesting client. To
+demonstrate how RPC works, we'll implement [the example](https://www.rabbitmq.com/tutorials/tutorial-six-php.html) on the RabbitMQ site
+using rabbitmq-cli-consumer.
+
+We don't change the <code>rpc_client.php</code>, only the <code>rpc_server.php</code>:
+
+```php
+<?php
+
+function fib($n) {
+    if ($n == 0)
+        return 0;
+    if ($n == 1)
+        return 1;
+    return fib($n-1) + fib($n-2);
+}
+
+echo fib(base64_decode($argv[1]));
+// Return exit(1); if something goes wrong, msg will be requeued
+exit(0);
+```
+
+Configuration for the consumer:
+
+```ini
+[rabbitmq]
+...
+
+[prefetch]
+count=1
+global=Off
+
+[queue]
+name=rpc_queue
+durable=On
+autodelete=Off
+exclusive=Off
+nowait=Off
+
+[exchange]
+name=rpc_queue
+autodelete=Off
+type=direct
+durable=On
+```
+
+# Configuration
 
 A configuration file is required. Example:
 
@@ -114,9 +169,11 @@ username = username-of-rabbitmq-user
 password = secret
 vhost=/your-vhost
 port=5672
-queue=name-of-queue
 compression=Off
 
+[queue]
+nane=your-queue-name
+
 [logs]
 error = /location/to/error.log
 info = /location/to/info.log
@@ -130,10 +187,27 @@ Run without <code>-V</code> to get rid of the output:
 
     $ rabbitmq-cli-consumer -e "/path/to/your/app argument --flag" -c /path/to/your/configuration.conf
 
+## Configuration inheritance
+
+By default rabbitmq-cli-consumer looks for configuration files in the following
+order:
+
+1. /etc/rabbitmq-cli-consumer/rabbitmq-cli-consumer.conf
+2. ~/.rabbitmq-cli-consumer.conf
+3. location passed in via <code>-c</code> option
+
+## Override options on the command line:
+
+Every option in the configuration file can be overwritten by passing them on the
+cli. Use <code>On</code> and <code>Off</code> for <code>true</code> and <code>false</code>
+respectively. Example:
+
+    $ rabbitmq-cli-consumer -c /you/config.conf -e "/path/to/executble" --queue-key=custom-key
+
 ### Prefetch count
 
 It's possible to configure the prefetch count and if you want set it as global. Add the following section to your
-configuration to confol these values:
+configuration to control these values:
 
 ```ini
 [prefetch]
@@ -154,6 +228,43 @@ type=direct
 durable=On
 ```
 
+### Configuring the queue
+
+All queue options are configurable. Full example:
+
+```ini
+[queue]
+name=rpc_queue
+durable=On
+autodelete=Off
+exclusive=Off
+nowait=Off
+```
+
+If you want to define a TTL for your queue:
+
+```ini
+[queue]
+name=rpc_queue
+durable=On
+autodelete=Off
+exclusive=Off
+nowait=Off
+ttl=1200
+```
+
+When you want to configure the routing key:
+
+```ini
+[queue]
+name=rpc_queue
+durable=On
+autodelete=Off
+exclusive=Off
+nowait=Off
+key=your-routing-key
+```
+
 ## The executable
 
 Your executable receives the message as the last argument. So consider the following:
@@ -274,8 +385,42 @@ exit(1);
 
 ```
 
+## Log rotation
+
+To close and reopen the logs send the USR1 signal:
+
+    $  kill -s USR1 pid_of_process
+
 # Developing
 
 Missing anything? Found a bug? I love to see your PR.
 
+## Setup development environment
+
+It can be quite difficult to get an development environment up & running. I'll hope to
+expand the instructions a bit in the future.
+
+### Go and gvm
+
+Todo.
+
+### RabbitMQ
+
+Start by installing docker.
+
+Then:
+
+    $ docker run -d -P -e RABBITMQ_NODENAME=rabbitmq-cli-consumer --name rabbitmq-cli-consumer rabbitmq:3-management
+
+To see which ports are available:
+
+    $ docker port rabbitmq-cli-consumer
+
+You can login with <code>guest</code> / <code>guest</code>.
+If you want stop the container:
+
+    $ docker stop rabbitmq-cli-consumer
+
+And to restart the container:
 
+    # docker start rabbitmq-cli-consumer

command/command_executer.go

@@ -1,34 +1,45 @@
 package command
 
 import (
+	"fmt"
 	"log"
-	"os/exec"
 )
 
+type Executer interface {
+	Execute(cmd Command) (result []byte, err error)
+}
+
 type CommandExecuter struct {
 	errLogger *log.Logger
 	infLogger *log.Logger
 }
 
+type Command interface {
+	CombinedOutput() (out []byte, err error)
+	Output() (out []byte, err error)
+}
+
 func New(errLogger, infLogger *log.Logger) *CommandExecuter {
 	return &CommandExecuter{
 		errLogger: errLogger,
 		infLogger: infLogger,
 	}
 }
 
-func (me CommandExecuter) Execute(cmd *exec.Cmd) bool {
+func (me CommandExecuter) Execute(cmd Command) (result []byte, err error) {
 	me.infLogger.Println("Processing message...")
-	out, err := cmd.CombinedOutput()
+
+	out, err := cmd.Output()
 
 	if err != nil {
 		me.infLogger.Println("Failed. Check error log for details.")
 		me.errLogger.Printf("Failed: %s\n", string(out[:]))
 		me.errLogger.Printf("Error: %s\n", err)
-		return false
+
+		return out, fmt.Errorf("Error occured during execution of command: %s", err)
 	}
 
 	me.infLogger.Println("Processed!")
 
-	return true
+	return out, nil
 }

command/command_executer_test.go

@@ -0,0 +1,41 @@
+package command
+
+import (
+	"bytes"
+	"log"
+	"testing"
+
+	"github.com/stretchr/testify/mock"
+)
+
+func TestExecutesCommand(t *testing.T) {
+	var b bytes.Buffer
+	errLogger := log.New(&b, "", 0)
+	infLogger := log.New(&b, "", 0)
+
+	cmd := new(TestCommand)
+
+	cmd.On("Output").Return(make([]byte, 0), nil).Once()
+
+	executer := New(errLogger, infLogger)
+	executer.Execute(cmd)
+
+	cmd.AssertExpectations(t)
+
+}
+
+type TestCommand struct {
+	mock.Mock
+}
+
+func (t *TestCommand) CombinedOutput() (out []byte, err error) {
+	argsT := t.Called()
+
+	return argsT.Get(0).([]byte), argsT.Error(1)
+}
+
+func (t *TestCommand) Output() (out []byte, err error) {
+	argsT := t.Called()
+
+	return argsT.Get(0).([]byte), argsT.Error(1)
+}

command/command_factory.go

@@ -1,8 +1,6 @@
 package command
 
-import (
-	"os/exec"
-)
+import "os/exec"
 
 type CommandFactory struct {
 	Cmd  string