added python coverage uploading

hiqdev · Oct 17, 2016 · 19ab2e4 · 19ab2e4
1 parent e7d04bc
commit 19ab2e4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/src/config/hidev.php b/src/config/hidev.php
@@ -26,10 +26,16 @@
                 ],
             ],
             'binaries' => [
-                'ocular' => [
+                'python-ocular' => [
+                    'name' => 'ocular',
                     'class' => \hidev\base\BinaryPython::class,
                     'package' => 'scrutinizer-ocular',
                 ],
+                'php-ocular' => [
+                    'name' => 'ocular',
+                    'class' => \hidev\base\BinaryPhp::class,
+                    'download' => 'https://scrutinizer-ci.com/ocular.phar',
+                ],
             ],
         ],
     ],

diff --git a/src/controllers/ScrutinizerController.php b/src/controllers/ScrutinizerController.php
@@ -16,38 +16,20 @@
  */
 class ScrutinizerController extends \hidev\controllers\CommonController
 {
-    public function getLanguage()
-    {
-        return $this->takeGoal('.travis.yml')->getItem('language');
-    }
-
     public function actionUploadCoverage()
     {
-        $lang = $this->getLanguage();
-        return $this->runActions(["get-ocular-$lang", "run-ocular-$lang"]);
-    }
+        $lang = $this->takePackage()->getLanguage();
 
-    public function actionGetOcularPhp()
-    {
-        if (file_exists('ocular.phar')) {
-            return 0;
-        }
-
-        return $this->passthru('wget', 'https://scrutinizer-ci.com/ocular.phar');
-    }
-
-    public function actionRunOcularPhp()
-    {
-        return $this->passthru('ocular', ['code-coverage:upload', '--format=php-clover', 'coverage.clover']);
+        return $this->runActions(["upload-$lang-coverage"]);
     }
 
-    public function actionGetOcularPython()
+    public function actionUploadPhpCoverage()
     {
-        return null;
+        return $this->passthru('php-ocular', ['code-coverage:upload', '--format=php-clover', 'coverage.clover']);
     }
 
-    public function actionRunOcularPython()
+    public function actionUploadPythonCoverage()
     {
-        return $this->passthru('ocular', ['--data-file', '.coverage']);
+        return $this->passthru('python-ocular', ['--data-file', '.coverage']);
     }
 }