From a80fde97d525ac0747f0352a507b86a0c06e4a4f Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 24 Feb 2014 19:22:32 +0100 Subject: [PATCH] Make the github driver behave like git if "no-api" is specified. --- doc/05-repositories.md | 5 ++++ src/Composer/Repository/Vcs/GitHubDriver.php | 26 ++++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/doc/05-repositories.md b/doc/05-repositories.md index fdb7ce1a2..a4e92d7ed 100644 --- a/doc/05-repositories.md +++ b/doc/05-repositories.md @@ -292,6 +292,11 @@ The VCS driver to be used is detected automatically based on the URL. However, should you need to specify one for whatever reason, you can use `git`, `svn` or `hg` as the repository type instead of `vcs`. +If you set the `no-api` key to `true` on a github repository it will clone the +repository as it would with any other git repository instead of using the +GitHub API. But unlike using the `git` driver directly, composer will still +attempt to use github's zip files. + #### Subversion Options Since Subversion has no native concept of branches and tags, Composer assumes diff --git a/src/Composer/Repository/Vcs/GitHubDriver.php b/src/Composer/Repository/Vcs/GitHubDriver.php index 3cf2befb5..67ce43551 100644 --- a/src/Composer/Repository/Vcs/GitHubDriver.php +++ b/src/Composer/Repository/Vcs/GitHubDriver.php @@ -52,6 +52,11 @@ class GitHubDriver extends VcsDriver $this->originUrl = !empty($match[1]) ? $match[1] : $match[2]; $this->cache = new Cache($this->io, $this->config->get('cache-repo-dir').'/'.$this->originUrl.'/'.$this->owner.'/'.$this->repository); + if (isset($this->repoConfig['no-api']) && $this->repoConfig['no-api']) { + $this->setupGitDriver(); + return; + } + $this->fetchRootIdentifier(); } @@ -405,14 +410,7 @@ class GitHubDriver extends VcsDriver // GitHub returns 404 for private repositories) and we // cannot ask for authentication credentials (because we // are not interactive) then we fallback to GitDriver. - $this->gitDriver = new GitDriver( - array('url' => $this->generateSshUrl()), - $this->io, - $this->config, - $this->process, - $this->remoteFilesystem - ); - $this->gitDriver->initialize(); + $this->setupGitDriver(); return; } catch (\RuntimeException $e) { @@ -422,4 +420,16 @@ class GitHubDriver extends VcsDriver throw $e; } } + + protected function setupGitDriver() + { + $this->gitDriver = new GitDriver( + array('url' => $this->generateSshUrl()), + $this->io, + $this->config, + $this->process, + $this->remoteFilesystem + ); + $this->gitDriver->initialize(); + } }