Make sure github driver is used for all github urls

composer · May 12, 2012 · c293302 · c293302
1 parent 160d2e0
commit c293302
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php
@@ -129,9 +129,16 @@ protected function runCommand($commandCallable, $url, $path = null)
                     if (0 === $this->process->execute($command, $handler)) {
                         return;
                     }
+                    if (null !== $path) {
+                        $this->filesystem->removeDirectory($path);
+                    }
                     $retrying = true;
                 } while (--$retries);
             }
+
+            if (null !== $path) {
+                $this->filesystem->removeDirectory($path);
+            }
             $this->throwException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput(), $url);
         }
     }

diff --git a/src/Composer/Repository/Vcs/GitHubDriver.php b/src/Composer/Repository/Vcs/GitHubDriver.php
@@ -43,7 +43,7 @@ class GitHubDriver extends VcsDriver
      */
     public function initialize()
     {
-        preg_match('#^(?:https?|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $this->url, $match);
+        preg_match('#^(?:(?:https?|git)://github\.com/|git@github\.com:)([^/]+)/(.+?)(?:\.git)?$#', $this->url, $match);
         $this->owner = $match[1];
         $this->repository = $match[2];
         $this->originUrl = 'github.com';
@@ -177,7 +177,7 @@ public function getBranches()
      */
     public static function supports(IOInterface $io, $url, $deep = false)
     {
-        if (!preg_match('#^(?:https?|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $url)) {
+        if (!preg_match('#^((?:https?|git)://github\.com/|git@github\.com:)([^/]+)/(.+?)(?:\.git)?$#', $url)) {
             return false;
         }