Pass the correct environment string.

Author: Danack

src/Configurator/CliRunner.php

@@ -8,7 +8,7 @@
 use Danack\Console\Command\Command;
 use Danack\Console\Input\InputArgument;
 use Auryn\Injector;
-
+use Configurator\ConfiguratorException;
 
 /**
  *
@@ -186,6 +186,10 @@ function execute() {
         try {
             $parsedCommand = $this->console->parseCommandLine();
         }
+        catch(ConfiguratorException $ce) {
+            echo "Problem running configuration: ".$ce->getMessage();
+            exit(-1);
+        }
         catch(\Exception $e) {
             //@TODO change to just catch parseException when that's implemented 
             $output = new BufferedOutput();

src/Configurator/Configurator.php

@@ -174,7 +174,7 @@ public function addPHPConfig($filename)
         }
 
         if (isset($evaluate) == true) {
-            $calculatedValues = $evaluate($this->getConfig(), $environment);
+            $calculatedValues = $evaluate($this->getConfig(), $this->environment);
             $this->addConfigOverride($calculatedValues);
         }
     }