Merge pull request #16 from uWaterloo/set-core-and-package

Allow setting core and package keys

Author: jhedstrom

src/DrupalInfo.php

@@ -120,7 +120,12 @@ public function rollbackRewrite(Event $event)
     protected function doWriteInfoFiles(PackageInterface $package)
     {
         if ($writer = $this->getWriter($package)) {
-            $writer->rewrite($this->findVersion($package), $this->findTimestamp($package));
+            $writer->rewrite(
+                $this->findVersion($package),
+                $this->findTimestamp($package),
+                $this->findCore($package),
+                $this->findPackage($package)
+            );
         } elseif ($this->io->isVerbose()) {
             $this->io->write(
                 '<info>No info files found for ' .$package->getPrettyName() . '</info>'
@@ -195,6 +200,46 @@ protected function findTimestamp(PackageInterface $package)
         return time();
     }
 
+    /**
+     * Find the Drupal core version this package is for.
+     *
+     * @param PackageInterface $package
+     *
+     * @return string|null
+     *   Drupal core version, such as "8.x". NULL if unable to determine.
+     */
+    protected function findCore(PackageInterface $package)
+    {
+        // Attempt to determine from getExtra().
+        $extra = $package->getExtra();
+        if (isset($extra['drupal']['core'])) {
+            return $extra['drupal']['core'];
+        }
+
+        // Attempt to determine from version number.
+        $version = $this->findVersion($package);
+        if (preg_match('/^(\d+\.x)-/', $version, $backref)) {
+            return $backref[1];
+        }
+    }
+
+    /**
+     * Find the name of the packge.
+     *
+     * @param PackageInterface $package
+     *
+     * @return string|null
+     *   The package name. NULL if unable to determine.
+     */
+    protected function findPackage(PackageInterface $package)
+    {
+        // Attempt to determine from getExtra().
+        $extra = $package->getExtra();
+        if (isset($extra['drupal']['package'])) {
+            return $extra['drupal']['package'];
+        }
+    }
+
     /**
      * Determine if this package should be processed.
      *

src/Writer/Drupal.php

@@ -30,13 +30,13 @@ public function set(array $paths)
     /**
      * {@inheritdoc}
      */
-    public function rewrite($version, $timestamp)
+    public function rewrite($version, $timestamp, $core = null, $project = null)
     {
         foreach ($this->paths as $info_file) {
             // Don't write to files that already contain version information.
             if (!$this->hasVersionInfo($info_file)) {
                 $file = fopen($info_file, 'a+');
-                fwrite($file, $this->formatInfo($version, $timestamp));
+                fwrite($file, $this->formatInfo($version, $timestamp, $core, $project));
                 fclose($file);
             }
         }
@@ -58,17 +58,25 @@ public function rollback()
     /**
      * Format version and timestamp into YAML.
      */
-    protected function formatInfo($version, $timestamp)
+    protected function formatInfo($version, $timestamp, $core = null, $project = null)
     {
         $date = gmdate('c', $timestamp);
-        $info = <<<EOL
-
-# Information added by drupal-composer/info-rewrite on $date.
-version: '$version'
-datestamp: $timestamp
+        $info = array();
+        // Always start with EOL character.
+        $info[] = '';
+        $info[] = "# Information added by drupal-composer/info-rewrite on $date.";
+        $info[] = "version: '$version'";
+        if ($core) {
+            $info[] = "core: '$core'";
+        }
+        if ($project) {
+            $info[] = "project: '$project'";
+        }
+        $info[] = "datestamp: $timestamp";
+        // Always end with EOL character.
+        $info[] = '';
 
-EOL;
-        return $info;
+        return implode("\n", $info);
     }
 
     /**

src/Writer/Drupal7.php

@@ -15,14 +15,24 @@ class Drupal7 extends Drupal
     /**
      * Format version and timestamp into INI format.
      */
-    protected function formatInfo($version, $timestamp)
+    protected function formatInfo($version, $timestamp, $core = null, $project = null)
     {
         $date = gmdate('c', $timestamp);
-        $info = <<<EOL
-; Information added by drupal-composer/info-rewrite on $date.
-version = "$version"
-timestamp = "$timestamp"
+        $info = array();
+        // Always start with EOL character.
+        $info[] = '';
+        $info[] = "; Information added by drupal-composer/info-rewrite on $date.";
+        $info[] = "version = \"$version\"";
+        if ($core) {
+            $info[] = "core = \"$core\"";
+        }
+        if ($project) {
+            $info[] = "project = \"$project\"";
+        }
+        $info[] = "datestamp = \"$timestamp\"";
+        // Always end with EOL character.
+        $info[] = '';
 
-EOL;
+        return implode("\n", $info);
     }
 }

src/Writer/WriterInterface.php

@@ -22,7 +22,7 @@ public function set(array $paths);
      * @param  string $timestamp
      * @return
      */
-    public function rewrite($version, $timestamp);
+    public function rewrite($version, $timestamp, $core = null, $project = null);
 
     /**
      * Rollback the info files to their download/unprocessed state.