From 7245b351a0c262e2915a624ed763e9da915c1517 Mon Sep 17 00:00:00 2001
From: Steve Kamerman <stevekamerman@gmail.com>
Date: Sun, 19 May 2013 01:47:41 -0400
Subject: [PATCH 1/3] Implemented environment plugin

---
 PHPCI/Builder.php    |  8 ++++++++
 PHPCI/Plugin/Env.php | 46 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 PHPCI/Plugin/Env.php

diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php
index 34c934b3..5a26be8d 100644
--- a/PHPCI/Builder.php
+++ b/PHPCI/Builder.php
@@ -246,6 +246,14 @@ class Builder
         $buildId            = 'project' . $this->build->getProject()->getId() . '-build' . $this->build->getId();
         $this->ciDir        = realpath(dirname(__FILE__) . '/../') . '/';
         $this->buildPath    = $this->ciDir . 'build/' . $buildId . '/';
+        
+        // Setup environment vars that will be accessible during exec()
+        putenv("PHPCI=1");
+        putenv("PHPCI_COMMIT=".$commitId);
+        putenv("PHPCI_PROJECT=".$this->build->getProject()->getId());
+        putenv("PHPCI_BUILD=".$this->build->getId());
+        putenv("PHPCI_PROJECT_TITLE=".$this->build->getProject()->getTitle());
+        putenv("PHPCI_BUILD_PATH=".$this->buildPath);
 
         // Create a working copy of the project:
         if (!$this->build->createWorkingCopy($this, $this->buildPath)) {
diff --git a/PHPCI/Plugin/Env.php b/PHPCI/Plugin/Env.php
new file mode 100644
index 00000000..e052ef6f
--- /dev/null
+++ b/PHPCI/Plugin/Env.php
@@ -0,0 +1,46 @@
+<?php
+/**
+* PHPCI - Continuous Integration for PHP
+*
+* @copyright    Copyright 2013, Block 8 Limited.
+* @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
+* @link         http://www.phptesting.org/
+*/
+
+namespace PHPCI\Plugin;
+
+/**
+* Environment variable plugin
+* @author       Steve Kamerman <stevekamerman@gmail.com>
+* @package      PHPCI
+* @subpackage   Plugins
+*/
+class Env implements \PHPCI\Plugin
+{
+    protected $phpci;
+    protected $env_vars;
+
+    public function __construct(\PHPCI\Builder $phpci, array $options = array())
+    {
+        $this->phpci    = $phpci;
+        $this->env_vars = $options;
+    }
+
+    /**
+    * Adds the specified environment variables to the builder environment
+    */
+    public function execute()
+    {
+        $success = true;
+        foreach ($this->env_vars as $key => $value) {
+            // This allows the developer to specify env vars like " - FOO=bar" or " - FOO: bar"
+            $env_var = is_array($value)? key($value).'='.current($value): $value;
+            
+            if (!putenv($env_var)) {
+                $success = false;
+                $this->phpci->logFailure("Unable to set environment variable");
+            }
+        }
+        return $success;
+    }
+}

From 3b72e124915b501b854ed63ae75e96a439c75911 Mon Sep 17 00:00:00 2001
From: Steve Kamerman <stevekamerman@gmail.com>
Date: Sun, 19 May 2013 11:28:27 -0400
Subject: [PATCH 2/3] Removed unused local var

---
 PHPCI/Plugin/Env.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Plugin/Env.php b/PHPCI/Plugin/Env.php
index e052ef6f..4984d100 100644
--- a/PHPCI/Plugin/Env.php
+++ b/PHPCI/Plugin/Env.php
@@ -32,7 +32,7 @@ class Env implements \PHPCI\Plugin
     public function execute()
     {
         $success = true;
-        foreach ($this->env_vars as $key => $value) {
+        foreach ($this->env_vars as $value) {
             // This allows the developer to specify env vars like " - FOO=bar" or " - FOO: bar"
             $env_var = is_array($value)? key($value).'='.current($value): $value;
             

From e04e49bb32dc9a0bec60fee2cb86900ff61853e0 Mon Sep 17 00:00:00 2001
From: Steve Kamerman <stevekamerman@gmail.com>
Date: Sun, 19 May 2013 16:54:35 -0400
Subject: [PATCH 3/3] Added support for standard YAML key/value pairs

---
 PHPCI/Plugin/Env.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/PHPCI/Plugin/Env.php b/PHPCI/Plugin/Env.php
index 4984d100..1de016fb 100644
--- a/PHPCI/Plugin/Env.php
+++ b/PHPCI/Plugin/Env.php
@@ -32,9 +32,14 @@ class Env implements \PHPCI\Plugin
     public function execute()
     {
         $success = true;
-        foreach ($this->env_vars as $value) {
-            // This allows the developer to specify env vars like " - FOO=bar" or " - FOO: bar"
-            $env_var = is_array($value)? key($value).'='.current($value): $value;
+        foreach ($this->env_vars as $key => $value) {
+            if (is_numeric($key)) {
+                // This allows the developer to specify env vars like " - FOO=bar" or " - FOO: bar"
+                $env_var = is_array($value)? key($value).'='.current($value): $value;
+            } else {
+                // This allows the standard syntax: "FOO: bar"
+                $env_var = "$key=$value";
+            }
             
             if (!putenv($env_var)) {
                 $success = false;