Merge branch 'develop'

* develop: Restore state after unit test. Fix tests. Fix tests. Fix theme settings. Fix unsupported operand types. Code style fix. Fix unsupported operand types. Fix unsupported operand types. Code style fix. Code style fix. Code style fix. Fixes #6: Add source files folder. Trigger ci tools after robo-digipolis-package release. Fixes #3: Rename cleanMirrorDir to prepareMirrorDir.
district09 · May 2, 2017 · b9742c2 · b9742c2
2 parents 5b44bef + 6ce579f
commit b9742c2
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "require": {
         "consolidation/robo": "~1.0",
         "php": ">=5.5.0",
-        "digipolisgent/robo-digipolis-package": "^0.1"
+        "digipolisgent/robo-digipolis-package": "^0.1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.4",

diff --git a/src/PackageDrupal8.php b/src/PackageDrupal8.php
@@ -30,8 +30,9 @@ class PackageDrupal8 extends PackageProject
     /**
      * {@inheritdoc}
      */
-    protected function cleanMirrorDir()
+    protected function prepareMirrorDir()
     {
+        $this->printTaskInfo(sprintf('Preparing directory %s.', $this->tmpDir));
         // Only keep web, vendor and config folder.
         $folders = new Finder();
         $folders->in($this->tmpDir);

diff --git a/src/ThemesCleanDrupal8.php b/src/ThemesCleanDrupal8.php
@@ -10,6 +10,7 @@ class ThemesCleanDrupal8 extends BaseTask implements BuilderAwareInterface
 {
     use \Robo\TaskAccessor;
     use \DigipolisGent\Robo\Task\Package\loadTasks;
+    use \Robo\Task\Filesystem\loadTasks;
     use Utility\ThemeFinder;
 
     /**
@@ -97,17 +98,33 @@ public function finder(Finder $finder)
     public function run()
     {
         $themesFromConfig = $this->getConfig()->get('digipolis.themes.drupal8', false);
+        $themeNamesFromConfig = [];
         if ($themesFromConfig) {
-            $themesFromConfig = array_keys((array) $themesFromConfig);
+            $themeNamesFromConfig = array_keys((array) $themesFromConfig);
         }
         $themes = empty($this->themes)
-            ? $themesFromConfig
+            ? $themeNamesFromConfig
             : $this->themes;
         if (!$themes) {
             return \Robo\Result::success($this);
         }
         $collection = $this->collectionBuilder();
-        foreach ($this->getThemePaths($themes) as $path) {
+        foreach ($this->getThemePaths($themes) as $themeName => $path) {
+            $themeSettings = isset($themesFromConfig[$themeName])
+                ? $themesFromConfig[$themeName]
+                : [];
+            if (is_string($themeSettings)) {
+                // Backward compatibility.
+                $themeSettings = ['command' => $themeSettings];
+            }
+            $themeSettings = array_merge(
+                ['command' => 'build', 'sourcedir' => 'source'],
+                $themeSettings
+            );
+            if ($themeSettings['sourcedir'] && is_dir($path . '/' . $themeSettings['sourcedir'])) {
+                $collection->addTask($this->taskDeleteDir([$path . '/' . $themeSettings['sourcedir']]));
+                continue;
+            }
             $collection->addTask($this->taskThemeClean($path));
         }
         return $collection->run();

diff --git a/src/ThemesCompileDrupal8.php b/src/ThemesCompileDrupal8.php
@@ -106,8 +106,27 @@ public function run()
         }
         $collection = $this->collectionBuilder();
         foreach ($this->getThemePaths(array_keys($themes)) as $themeName => $path) {
-            $command = $themes[$themeName];
-            $collection->addTask($this->taskThemeCompile($path, $command));
+            $themeSettings = isset($themes[$themeName])
+                ? $themes[$themeName]
+                : [];
+            if (is_string($themeSettings)) {
+                // Backward compatibility.
+                $themeSettings = ['command' => $themeSettings];
+            }
+            $themeSettings = array_merge(
+                ['command' => 'build', 'sourcedir' => 'source'],
+                $themeSettings
+            );
+            $dir = $path;
+            if ($themeSettings['sourcedir'] && is_dir($path . '/' . $themeSettings['sourcedir'])) {
+                $dir = $path . '/' . $themeSettings['sourcedir'];
+            }
+            $collection->addTask(
+                $this->taskThemeCompile(
+                    $dir,
+                    $themeSettings['command']
+                )
+            );
         }
         return $collection->run();
     }

diff --git a/testfiles/themes/testtheme_source/source/Gruntfile.js b/testfiles/themes/testtheme_source/source/Gruntfile.js
@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = function (grunt) {
+  grunt.registerTask('build', function () {
+    grunt.file.write('../hello_grunt.txt', 'Hello world from grunt.');
+  });
+
+};
diff --git a/testfiles/themes/testtheme_source/source/package.json b/testfiles/themes/testtheme_source/source/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "robo-digipolis-testtheme_source",
+  "version": "1.0.0",
+  "dependencies": {},
+  "devDependencies": {
+    "grunt": "~0.4.0",
+    "grunt-shell": "~0.3.1"
+  },
+  "engines": {
+    "node": ">=0.8.0"
+  }
+}
diff --git a/testfiles/themes/testtheme_source/testtheme_source.info.yml b/testfiles/themes/testtheme_source/testtheme_source.info.yml
@@ -0,0 +1,2 @@
+## YAML Template.
+---
diff --git a/tests/ThemesCleanDrupal8Test.php b/tests/ThemesCleanDrupal8Test.php
@@ -28,6 +28,16 @@ public function setUp()
         $container = Robo::createDefaultContainer(null, new NullOutput());
         $this->setContainer($container);
         $this->setConfig(Robo::config());
+        // Backup testfiles.
+        $path = realpath(__DIR__ . '/..');
+        exec('cp -r ' . $path . '/testfiles' . ' ' . $path . '/testfiles_backup');
+    }
+
+    public function tearDown() {
+        // Restore testfiles backup.
+        $path = realpath(__DIR__ . '/..');
+        exec('rm -rf ' . $path . '/testfiles');
+        exec('mv ' . $path . '/testfiles_backup' . ' ' . $path . '/testfiles');
     }
 
     /**
@@ -49,6 +59,7 @@ public function testRun()
         $this->getConfig()->set('digipolis.root.project', realpath(__DIR__ . '/../testfiles'));
         $this->getConfig()->set('digipolis.themes.drupal8', [
             'testtheme' => 'build',
+            'testtheme_source' => 'build',
             'custom' => 'build',
         ]);
         $compileResult = $this->taskThemesCompileDrupal8()
@@ -74,5 +85,7 @@ public function testRun()
           $this->assertFileNotExists($themePath . '/node_modules');
         }
 
+        // Assert cleanup of source dir.
+        $this->assertFileNotExists(realpath(__DIR__ . '/../testfiles/themes/testtheme_source') . '/source');
     }
 }
diff --git a/tests/ThemesCompileDrupal8Test.php b/tests/ThemesCompileDrupal8Test.php
@@ -21,6 +21,7 @@ class ThemesCompileDrupal8Test extends \PHPUnit_Framework_TestCase implements Co
     use \Robo\Common\ConfigAwareTrait;
 
     protected $themePaths;
+    protected $sourceThemePath;
 
     /**
      * Set up the Robo container so that we can create tasks in our tests.
@@ -34,6 +35,7 @@ public function setUp()
             realpath(__DIR__ . '/../testfiles/themes/testtheme'),
             realpath(__DIR__ . '/../testfiles/themes/custom/customtheme'),
         ];
+        $this->sourceThemePath = realpath(__DIR__ . '/../testfiles/themes/testtheme_source');
     }
 
     public function tearDown()
@@ -49,6 +51,9 @@ public function tearDown()
                 exec('rm -rf ' . $themePath . $remove);
             }
         }
+        exec('rm -rf ' . $this->sourceThemePath . '/hello_grunt.txt');
+        exec('rm -rf ' . $this->sourceThemePath . '/source/node_modules');
+        exec('rm -rf ' . $this->sourceThemePath . '/source/vendor');
     }
 
     /**
@@ -70,6 +75,7 @@ public function testRun()
         $this->getConfig()->set('digipolis.root.project', realpath(__DIR__ . '/../testfiles'));
         $this->getConfig()->set('digipolis.themes.drupal8', [
             'testtheme' => 'build',
+            'testtheme_source' => 'build',
             'custom' => 'build',
         ]);
         $result = $this->taskThemesCompileDrupal8()
@@ -86,5 +92,11 @@ public function testRun()
             // Assert grunt build ran.
             $this->assertFileExists($themePath . '/hello_grunt.txt');
         }
+
+        // Assert node ran.
+        $this->assertFileExists($this->sourceThemePath . '/source/node_modules');
+
+        // Assert grunt build ran.
+        $this->assertFileExists($this->sourceThemePath . '/hello_grunt.txt');
     }
 }