From ce744778991c68a43c3bb13fbf1a83ad419ce788 Mon Sep 17 00:00:00 2001 From: Michal Gebauer Date: Thu, 3 Dec 2015 14:30:07 +0100 Subject: [PATCH] Configuration of GitLab driver --- res/composer-schema.json | 12 ++++++++++++ src/Composer/Command/ConfigCommand.php | 18 +++++++++++++++--- src/Composer/Config.php | 3 ++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/res/composer-schema.json b/res/composer-schema.json index 9dc285ddf..df1fe8290 100644 --- a/res/composer-schema.json +++ b/res/composer-schema.json @@ -136,6 +136,11 @@ "description": "A hash of domain name => github API oauth tokens, typically {\"github.com\":\"\"}.", "additionalProperties": true }, + "gitlab-oauth": { + "type": "object", + "description": "A hash of domain name => gitlab API oauth tokens, typically {\"gitlab.com\":\"\"}.", + "additionalProperties": true + }, "http-basic": { "type": "object", "description": "A hash of domain name => {\"username\": \"...\", \"password\": \"...\"}.", @@ -221,6 +226,13 @@ "type": "boolean", "description": "Defaults to true. If set to false, the OAuth tokens created to access the github API will have a date instead of the machine hostname." }, + "gitlab-domains": { + "type": "array", + "description": "A list of domains to use in gitlab mode. This is used for custom GitLab setups, defaults to [\"gitlab.com\"].", + "items": { + "type": "string" + } + }, "archive-format": { "type": "string", "description": "The default archiving format when not provided on cli, defaults to \"tar\"." diff --git a/src/Composer/Command/ConfigCommand.php b/src/Composer/Command/ConfigCommand.php index bffd7c8ee..c81f0de01 100644 --- a/src/Composer/Command/ConfigCommand.php +++ b/src/Composer/Command/ConfigCommand.php @@ -164,7 +164,7 @@ EOT } if ($input->getOption('global') && !$this->authConfigFile->exists()) { touch($this->authConfigFile->getPath()); - $this->authConfigFile->write(array('http-basic' => new \ArrayObject, 'github-oauth' => new \ArrayObject)); + $this->authConfigFile->write(array('http-basic' => new \ArrayObject, 'github-oauth' => new \ArrayObject, 'gitlab-oauth' => new \ArrayObject)); @chmod($this->authConfigFile->getPath(), 0600); } @@ -358,6 +358,18 @@ EOT return $vals; }, ), + 'gitlab-domains' => array( + function ($vals) { + if (!is_array($vals)) { + return 'array expected'; + } + + return true; + }, + function ($vals) { + return $vals; + }, + ), ); foreach ($uniqueConfigValues as $name => $callbacks) { @@ -433,7 +445,7 @@ EOT } // handle github-oauth - if (preg_match('/^(github-oauth|http-basic)\.(.+)/', $settingKey, $matches)) { + if (preg_match('/^(github-oauth|gitlab-oauth|http-basic)\.(.+)/', $settingKey, $matches)) { if ($input->getOption('unset')) { $this->authConfigSource->removeConfigSetting($matches[1].'.'.$matches[2]); $this->configSource->removeConfigSetting($matches[1].'.'.$matches[2]); @@ -441,7 +453,7 @@ EOT return; } - if ($matches[1] === 'github-oauth') { + if ($matches[1] === 'github-oauth' || $matches[1] === 'gitlab-oauth') { if (1 !== count($values)) { throw new \RuntimeException('Too many arguments, expected only one token'); } diff --git a/src/Composer/Config.php b/src/Composer/Config.php index 05ef8bc70..936586338 100644 --- a/src/Composer/Config.php +++ b/src/Composer/Config.php @@ -51,6 +51,7 @@ class Config 'archive-dir' => '.', // valid keys without defaults (auth config stuff): // github-oauth + // gitlab-oauth // http-basic ); @@ -111,7 +112,7 @@ class Config // override defaults with given config if (!empty($config['config']) && is_array($config['config'])) { foreach ($config['config'] as $key => $val) { - if (in_array($key, array('github-oauth', 'http-basic')) && isset($this->config[$key])) { + if (in_array($key, array('github-oauth', 'gitlab-oauth', 'http-basic')) && isset($this->config[$key])) { $this->config[$key] = array_merge($this->config[$key], $val); } else { $this->config[$key] = $val;