Handle dev version of drupal/core, throw exception on non-zero exit codes (drupal-composer#41)

Author: webflo

.travis.yml

@@ -6,6 +6,9 @@ php:
 
 sudo: false
 
+git:
+ depth: 10000
+
 before_install:
   - phpenv config-rm xdebug.ini
   - composer --verbose self-update

src/Handler.php

@@ -109,8 +109,13 @@ public function downloadScaffold() {
     $dispatcher = new EventDispatcher($this->composer, $this->io);
     $dispatcher->dispatch(self::PRE_DRUPAL_SCAFFOLD_CMD);
 
+    $version = $drupalCorePackage->getPrettyVersion();
+    if ($drupalCorePackage->getStability() == 'dev' && substr($version, -4) == '-dev') {
+      $version = substr($version, 0, -4);
+    }
+
     $fetcher = new FileFetcher(new RemoteFilesystem($this->io), $options['source'], $files);
-    $fetcher->fetch($drupalCorePackage->getPrettyVersion(), $webroot);
+    $fetcher->fetch($version, $webroot);
 
     // Call post-scaffold scripts.
     $dispatcher->dispatch(self::POST_DRUPAL_SCAFFOLD_CMD);

tests/PluginTest.php

@@ -76,15 +76,17 @@ public function testComposerInstallAndUpdate() {
     $this->composer('drupal-scaffold');
     $this->assertFileExists($exampleScaffoldFile, 'Scaffold file should be installed by "drupal-scaffold" command.');
 
-    // We touch a scaffold file, so we can check the file was modified after
-    // the scaffold update.
-    touch($exampleScaffoldFile);
-    $mtime_touched = filemtime($exampleScaffoldFile);
-    // Requiring a newer version triggers "composer update"
-    $this->composer('require drupal/core:"8.0.1"');
-    clearstatcache();
-    $mtime_after = filemtime($exampleScaffoldFile);
-    $this->assertNotEquals($mtime_after, $mtime_touched, 'Scaffold file was modified by composer update.');
+    foreach (['8.0.1', '8.1.x-dev'] as $version) {
+      // We touch a scaffold file, so we can check the file was modified after
+      // the scaffold update.
+      touch($exampleScaffoldFile);
+      $mtime_touched = filemtime($exampleScaffoldFile);
+      // Requiring a newer version triggers "composer update"
+      $this->composer('require --update-with-dependencies drupal/core:"' . $version .'"');
+      clearstatcache();
+      $mtime_after = filemtime($exampleScaffoldFile);
+      $this->assertNotEquals($mtime_after, $mtime_touched, 'Scaffold file was modified by composer update. (' . $version . ')');
+    }
 
     // We touch a scaffold file, so we can check the file was modified after
     // the custom commandscaffold update.
@@ -149,7 +151,10 @@ protected function composerJSONDefaults() {
    */
   protected function composer($command) {
     chdir($this->tmpDir);
-    passthru(escapeshellcmd($this->rootDir . '/vendor/bin/composer ' . $command));
+    passthru(escapeshellcmd($this->rootDir . '/vendor/bin/composer ' . $command), $exit_code);
+    if ($exit_code !== 0) {
+      throw new \Exception('Composer returned a non-zero exit code');
+    }
   }
 
   /**
@@ -160,7 +165,10 @@ protected function composer($command) {
    */
   protected function git($command) {
     chdir($this->rootDir);
-    passthru(escapeshellcmd('git ' . $command));
+    passthru(escapeshellcmd('git ' . $command), $exit_code);
+    if ($exit_code !== 0) {
+      throw new \Exception('Git returned a non-zero exit code');
+    }
   }
 
   /**