Merge pull request #96 from aequasi/96-allow-profile-inheritance

Allow Profile Inheritance

Author: cryptiklemur

.bldr.yml.dist

@@ -5,6 +5,3 @@ imports:
 bldr:
     name: bldr-io/bldr
     description: The PHP Task Runner you've been waiting for
-
-#blocks:
-#    - Bldr\Block\Watch\WatchBlock

.bldr/tasks.yml

@@ -75,18 +75,16 @@ bldr:
                     seconds: 1
                 -
                     type: filesystem:remove
+                    failOnError: false
                     files: [build/coverage, build/logs]
                 -
                     type: filesystem:mkdir
-                    failOnError: true
                     files: [build/coverage, build/logs]
                 -
                     type: filesystem:touch
-                    failOnError: true
                     files: [build/coverage/index.html]
                 -
                     type: exec
-                    failOnError: true
                     executable: composer
                     arguments: [install, --prefer-dist]
                 -
@@ -97,7 +95,6 @@ bldr:
             calls:
                 -
                     type: apply
-                    failOnError: true
                     src:
                         - { path: [src, tests], files: *.php, recursive: true }
                     output: /dev/null
@@ -131,7 +128,6 @@ bldr:
             calls:
                 -
                     type: exec
-                    failOnError: true
                     executable: php
                     arguments:
                         - bin/phpunit

docs/usage.rst

@@ -17,14 +17,29 @@ Create a ``.bldr.yml(.dist)`` file:
                 description: Gets ran when `./bldr.phar build someTask` is called
                 tasks:
                     - foo
+            someOtherTask:
+                tasks:
+                    - bar
+            inheritanceExample:
+                description: Will run the tasks from `someTask` and then `someOtherTask`.
+                uses:
+                    before: [someTask]
+                    after: [someOtherTask]
         tasks:
             foo:
-                description: FooBar task
+                description: Foo task
                 calls:
                     -
                         type: exec
                         executable: echo
                         arguments: [Hello World]
+            bar:
+                description: Bar task
+                calls:
+                    -
+                        type: exec
+                        executable: sleep
+                        arguments: [1]
 
 To view a list of available call types, run:
 

src/Block/Core/Configuration.php

@@ -58,6 +58,16 @@ private function getProfilesNode()
                     ->scalarNode('description')
                         ->defaultValue('')
                     ->end()
+                    ->arrayNode('uses')
+                        ->children()
+                            ->arrayNode('before')
+                                ->prototype('scalar')->end()
+                            ->end()
+                            ->arrayNode('after')
+                                ->prototype('scalar')->end()
+                            ->end()
+                        ->end()
+                    ->end()
                     ->arrayNode('tasks')
                         ->prototype('scalar')->end()
                     ->end()

src/Command/BuildCommand.php

@@ -128,7 +128,7 @@ private function doExecute($profileName = null, array $tasks = [])
                 ]
             );
 
-            $this->fetchTasks($profileName);
+            $this->fetchTasks($profile);
             $this->addEvent(Event::PRE_PROFILE, new Events\ProfileEvent($this, true));
         } else {
             $this->buildTasks($tasks);
@@ -157,12 +157,23 @@ private function formatBlock($output, $background, $foreground)
     }
 
     /**
-     * @param string $profileName
+     * @param array $profile
      */
-    private function fetchTasks($profileName)
+    private function fetchTasks(array $profile)
     {
-        $profile = $this->container->getParameter('profiles')[$profileName];
+        if (!empty($profile['uses']) && !empty($profile['uses']['before'])) {
+            foreach ($profile['uses']['before'] as $name) {
+                $this->buildTasks($this->getProfile($name));
+            }
+        }
+
         $this->buildTasks($profile['tasks']);
+
+        if (!empty($profile['uses']) && !empty($profile['uses']['after'])) {
+            foreach ($profile['uses']['after'] as $name) {
+                $this->buildTasks($this->getProfile($name));
+            }
+        }
     }
 
     /**

src/Command/Task/InfoCommand.php

@@ -52,11 +52,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $service = $this->findService($input->getArgument('task'));
 
+        $description = ($service->getDescription() !== '' ? $service->getDescription() : 'No Description');
         $output->writeln(
             [
                 "",
                 '<fg=green>Task Name</fg=green>: '.$service->getName(),
-                '<fg=green>Task Description</fg=green>: '.($service->getDescription() !== '' ? $service->getDescription() : 'No Description'),
+                '<fg=green>Task Description</fg=green>: '.$description,
                 "",
                 "<fg=green>Options:</fg=green>"
             ]

tests/Model/CallTest.php

@@ -24,7 +24,7 @@ public function testConstructor()
 
         $this->assertEquals('mock', $call->getType());
         $this->assertEmpty($call->getOptions());
-        $this->assertFalse($call->getFailOnError());
+        $this->assertTrue($call->getFailOnError());
         $this->assertEquals([0], $call->getSuccessCodes());
     }
 }