Merge branch 'feature/codecov' into develop

.gitignore

@@ -11,3 +11,4 @@ coverage/
 bower_components/
 config.yml
 docs/
+clover.xml

.travis.yml

@@ -3,3 +3,5 @@ install:
     - composer install --no-dev
 before_install:
     - composer selfupdate
+after_success:
+    - bash <(curl -s https://codecov.io/bash)

classes/Config.php

@@ -65,12 +65,14 @@ class Config
      */
     public $curl_params = array();
 
+    private $configFile;
+
     /**
      * Config constructor
      */
-    private function __construct()
+    private function __construct($yamlfile)
     {
-        $yamlfile = __DIR__.'/../config.yml';
+        $this->file = $yamlfile;
         if (is_file($yamlfile)) {
             $yaml = Yaml::parse(file_get_contents($yamlfile));
             if (isset($yaml) && is_array($yaml)) {
@@ -91,10 +93,11 @@ class Config
      *
      * @return Config
      */
-    public static function getInstance()
+    public static function getInstance($yamlfile = 'config.yml')
     {
-        if (is_null(self::$instance)) {
+        $yamlfile = __DIR__.'/../'.$yamlfile;
-            self::$instance = new Config();
+        if (is_null(self::$instance) || self::$instance->file != $yamlfile) {
+            self::$instance = new Config($yamlfile);
         }
         return self::$instance;
     }

config_test.yml

@@ -0,0 +1 @@
+convert: false

phpunit.xml

@@ -11,5 +11,6 @@
     </testsuites>
     <logging>
         <log type="coverage-html" target="coverage/" />
+        <log type="coverage-clover" target="clover.xml" />
     </logging>
 </phpunit>

tests/ConfigTest.php

@@ -12,21 +12,34 @@ use Alltube\Config;
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
 
+    private $config;
+
+    protected function setUp()
+    {
+        $this->config = Config::getInstance('config_test.yml');
+    }
+
     /**
      * Test the getInstance function
      *
      * @return void
      */
     public function testGetInstance()
+    {
+        $this->assertEquals($this->config->convert, false);
+        $this->assertInternalType('array', $this->config->curl_params);
+        $this->assertInternalType('array', $this->config->params);
+        $this->assertInternalType('string', $this->config->youtubedl);
+        $this->assertInternalType('string', $this->config->python);
+        $this->assertInternalType('string', $this->config->avconv);
+        $this->assertInternalType('string', $this->config->rtmpdump);
+    }
+
+    public function testGetInstanceWithEnv()
     {
         putenv('CONVERT=1');
-        $config = Config::getInstance();
+        Config::destroyInstance();
+        $config = Config::getInstance('config_test.yml');
         $this->assertEquals($config->convert, true);
-        $this->assertInternalType('array', $config->curl_params);
-        $this->assertInternalType('array', $config->params);
-        $this->assertInternalType('string', $config->youtubedl);
-        $this->assertInternalType('string', $config->python);
-        $this->assertInternalType('string', $config->avconv);
-        $this->assertInternalType('string', $config->rtmpdump);
     }
 }