Special handling for composer-based workflows

README.md

@@ -41,7 +41,8 @@ This project is built on the tools of the Grunt community to provide scripted
 automation of a number of PHP & Drupal tasks. Here are a few examples of what it
 provides:
 
-* Drush make-based build workflow
+* Composer workflow
+  * Drush make-based build workflow (for Drupal 7.x)
 * CI portability (used with Jenkins so far)
 * Opt-in for a number of great enhancements:
   * Composer dependency management for PHP

bootstrap.js

@@ -39,25 +39,36 @@ module.exports = function(grunt) {
     tasksDefault.push('validate');
   }
 
-  // If build/html exists, but is empty, skip the newer check.
-  // This facilitates situations where the build/html is generated as a mounted
-  // directory point with a newer timestamp than the Drush Makefiles.
-  //
-  // We do not use the grunt-newer .cache with drushmake so skipping newer for
-  // any one run does not impact later behavior.
-  if (grunt.file.exists(grunt.config.get('config.buildPaths.html') + '/index.php')) {
-    tasksDefault.push('newer:drushmake:default');
-  }
-  else {
-    tasksDefault.push('drushmake:default');
+  // Process .make files if configured.
+  if (grunt.config.get('config.srcPaths.make')) {
+    // If build/html exists, but is empty, skip the newer check.
+    // This facilitates situations where the build/html is generated as a mounted
+    // directory point with a newer timestamp than the Drush Makefiles.
+    //
+    // We do not use the grunt-newer .cache with drushmake so skipping newer for
+    // any one run does not impact later behavior.
+    if (grunt.file.exists(grunt.config.get('config.buildPaths.html') + '/index.php')) {
+      tasksDefault.push('newer:drushmake:default');
+    }
+    else {
+      tasksDefault.push('drushmake:default');
+    }
   }
 
   // Wire up the generated docroot to our custom code.
   tasksDefault.push('scaffold');
 
-  if (grunt.config.get(['composer', 'install'])) {
+  if (grunt.file.exists('./composer.lock') && grunt.config.get(['composer', 'install'])) {
+    // Manually run `composer drupal-scaffold` since this is only automatically run on update.
+    tasksDefault.unshift('composer:drupal-scaffold');
+    // Run `composer install` if there is already a lock file. Updates should be explicit once this file exists.
     tasksDefault.unshift('composer:install');
   }
+  else if (grunt.config.get(['composer', 'update'])) {
+    // Run `composer update` if no lock file exists. This forces `composer drupal-scaffold` to run.
+    tasksDefault.unshift('composer:update');
+  }
+
   if (grunt.task.exists('bundle-install')) {
     tasksDefault.unshift('bundle-install');
   }

example/composer.json

@@ -1,14 +1,53 @@
 {
-    "name": "client/project",
-    "description": "{Project} drupal codebase for {client}.",
-    "require-dev": {
-        "behat/mink-zombie-driver": "~1.2",
-        "drupal/drupal-extension": "~3.0",
-        "drush/drush": "^8",
-        "drupal/coder": "^8.2",
-        "phpmd/phpmd": "~2.1"
-    },
-    "require": {
-        "roave/security-advisories": "dev-master"
+  "name": "client/project",
+  "description": "{Project} drupal codebase for {client}.",
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://packages.drupal.org/8"
     }
+  ],
+  "require": {
+    "composer/installers": "^1.0.20",
+    "drupal-composer/drupal-scaffold": "^2.0.1",
+    "cweagans/composer-patches": "~1.0",
+    "drupal/core": "~8.1",
+    "roave/security-advisories": "dev-master"
+  },
+  "require-dev": {
+    "behat/mink-zombie-driver": "~1.2",
+    "drupal/drupal-extension": "~3.0",
+    "drush/drush": "~8.0",
+    "drupal/console": "~0.10",
+    "phpmd/phpmd": "~2.1",
+    "phpunit/phpunit": "~4.8",
+    "drupal/coder": "^8.2"
+  },
+  "conflict": {
+    "drupal/drupal": "*"
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "scripts": {
+    "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
+  },
+  "extra": {
+    "installer-paths": {
+      "build/html/core": [
+        "type:drupal-core"
+      ],
+      "build/html/modules/contrib/{$name}": [
+        "type:drupal-module"
+      ],
+      "build/html/profiles/contrib/{$name}": [
+        "type:drupal-profile"
+      ],
+      "build/html/themes/contrib/{$name}": [
+        "type:drupal-theme"
+      ],
+      "drush/contrib/{$name}": [
+        "type:drupal-drush"
+      ]
+    }
+  }
 }

tasks/composer.js

@@ -20,6 +20,16 @@ module.exports = function(grunt) {
         ],
       }
     });
+    grunt.config(['composer', 'update'], {
+      options: {
+        flags: [
+          'no-interaction',
+          'no-progress',
+          'prefer-dist'
+        ],
+      }
+    });
+    grunt.config(['composer', 'drupal-scaffold'], {});
 
     Help.add({
       task: 'composer',

test/test_assets_d8/composer.json → test/test_assets/composer.json

@@ -5,11 +5,8 @@
         "behat/mink-zombie-driver": "~1.2",
         "drupal/drupal-extension": "~3.0",
         "drush/drush": "^8",
-        "phpmd/phpmd": "~2.1",
         "drupal/coder": "^8.2",
-        "guzzlehttp/guzzle" : "^6.0@dev",
-        "symfony/dependency-injection": "2.7.*",
-        "symfony/event-dispatcher": "2.7.*"
+        "phpmd/phpmd": "~2.1"
     },
     "require": {
         "roave/security-advisories": "dev-master"

test/test_assets_d8/Gruntconfig.json

@@ -1,7 +1,6 @@
 {
   "domain": "http://127.0.0.1:8080",
   "srcPaths": {
-    "make": "src/project.make",
     "drupal": "src"
   },
   "siteUrls": {

test/test_assets_d8/src/modules/gdt_test/tests/src/Unit/PassTest.php

@@ -1,9 +1,4 @@
 <?php
-/**
- * @file
- * Contains \Drupal\Tests\gdt_test\Unit\PassTest
- */
-
 namespace Drupal\Tests\gdt_test\Unit;
 
 use Drupal\Tests\UnitTestCase;

test/test_assets_d8/src/modules/test.php

@@ -1,4 +1,7 @@
 <?php
+/**
+ * @file
+ * A doc comment for coding standards.
+ */
 
 $x = 10;
-