Merge pull request #19 from Cheppers/upgrade-robo

Upgrade consolidation/robo to 1.0.0-RC3

Author: Sweetchuck

.gitignore

@@ -1,6 +1,7 @@
 
-/fixtures/project-template/*/vendor/
 
+/bin/
+/fixtures/project-template/*/vendor/
 /vendor/
 
 /cheppers-git-hooks-*.tar

.travis.yml

@@ -14,12 +14,12 @@ matrix:
       language: 'php'
       php: '7.0'
       env:
-        - COMPOSER_NO_INTERACTION=1 COMPOSER_DISABLE_XDEBUG_WARN=1
+        - 'COMPOSER_NO_INTERACTION=1 COMPOSER_DISABLE_XDEBUG_WARN=1'
     -
       os: 'osx'
       language: 'generic'
       env:
-        - _PHP=php70 COMPOSER_NO_INTERACTION=1 COMPOSER_DISABLE_XDEBUG_WARN=1
+        - '_PHP=php70 COMPOSER_NO_INTERACTION=1 COMPOSER_DISABLE_XDEBUG_WARN=1'
 
 before_install:
   - 'src-dev/scripts/travis/before_install.sh'
@@ -28,5 +28,5 @@ install:
   - 'src-dev/scripts/travis/install.sh'
 
 script:
-  - './vendor/bin/robo lint'
-  - './vendor/bin/robo test'
+  - 'bin/robo lint'
+  - 'bin/robo test'

RoboFile.php

@@ -75,74 +75,72 @@ public function __construct()
         }
     }
 
+    /**
+     * @return null|\Robo\Task\Filesystem\FilesystemStack
+     */
     public function deployGitHooks()
     {
-        $task = $this->getTaskDeployGitHooks();
-        if ($task) {
-            $task
-                ->run()
-                ->stopOnFail();
-        }
+        return $this->getTaskDeployGitHooks();
     }
 
+    /**
+     * @return \Robo\Collection\CollectionBuilder
+     */
     public function test()
     {
-        $this->stopOnFail();
+        /** @var \Robo\Collection\CollectionBuilder $cb */
+        $cb = $this->collectionBuilder();
 
-        /** @var \Robo\Collection\Collection $c */
-        $c = $this->collection();
-        $c
-            ->add($this->getTaskBehatRun())
-            ->run();
+        return $cb
+            ->addTaskList([
+                'test.behat' => $this->getTaskBehatRun(),
+            ]);
     }
 
+    /**
+     * @return \Robo\Task\Base\Exec
+     */
     public function behat()
     {
-        $this
-            ->getTaskBehatRun()
-            ->run()
-            ->stopOnFail();
+        return $this->getTaskBehatRun();
     }
 
+    /**
+     * @return \Robo\Task\Base\Exec
+     */
     public function composerValidate()
     {
-        $this
-            ->getTaskComposerValidate()
-            ->run()
-            ->stopOnFail();
+        return $this->getTaskComposerValidate();
     }
 
+    /**
+     * @return \Robo\Collection\CollectionBuilder
+     */
     public function lint()
     {
-        $this->stopOnFail();
-
-        /** @var \Robo\Collection\Collection $c */
-        $c = $this->collection();
-        $c
-            ->add($this->getTaskPhpcsLint())
-            ->add($this->getTaskComposerValidate())
-            ->run();
-    }
+        /** @var \Robo\Collection\CollectionBuilder $cb */
+        $cb = $this->collectionBuilder();
 
-    public function lintPhpcs()
-    {
-        $this
-            ->getTaskPhpcsLint()
-            ->run()
-            ->stopOnFail();
+        return $cb->addTaskList([
+            'lint.composer.validate' => $this->getTaskComposerValidate(),
+            'lint.phpcs.psr2' => $this->getTaskPhpcsLint(),
+        ]);
     }
 
+    /**
+     * @return \Robo\Collection\CollectionBuilder
+     */
     public function githookPreCommit()
     {
-        $this->lint();
+        return $this->lint();
     }
 
     /**
      * @return \Robo\Task\Base\Exec
      */
     protected function getTaskPhpcsLint()
     {
-        $cmd_pattern = '%s --standard=%s --ignore=%s %s %s %s %s';
+        $cmd_pattern = '%s --colors --standard=%s --ignore=%s %s %s %s %s';
         $cmd_args = [
             escapeshellcmd("{$this->binDir}/phpcs"),
             escapeshellarg('PSR2'),

composer.json

@@ -2,12 +2,16 @@
     "name": "cheppers/git-hooks",
     "description": "Provide a bridge between Git hooks and scripts under VCS.",
     "license": "GPL-2.0",
+    "config": {
+        "bin-dir": "bin",
+        "sort-packages": true
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {},
     "require-dev": {
         "behat/behat": "~3.1",
-        "consolidation/robo": "dev-master#6af485e",
+        "consolidation/robo": "~1.0",
         "pear/archive_tar": "~1.4",
         "phpunit/phpunit": "~4.5",
         "squizlabs/php_codesniffer": "~2.6",