From 5b3a86da57a47a723f89d8dd64ce484002b8e4bb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 09 May 2016 03:52:57 -0400
Subject: [PATCH] Merge pull request #5184 from guitarmanusa/compose_focus
---
bin/package2composer.sh | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/bin/package2composer.sh b/bin/package2composer.sh
index 165018d..c615a17 100755
--- a/bin/package2composer.sh
+++ b/bin/package2composer.sh
@@ -36,9 +36,10 @@
$data = array(
'name' => $vendor . '/' . strval($package->name),
'type' => 'roundcube-plugin',
- 'description' => trim(strval($package->summary) . '; ' . strval($package->description), ';- '),
+ 'description' => trim(strval($package->description), '- ') ? trim(strval($package->description)) : trim(strval($package->summary)),
'homepage' => strval($package->uri),
'license' => 'GPLv3+',
+ 'version' => strval($package->version->release),
'authors' => array(),
'repositories' => array(
array('type' => 'composer', 'url' => 'http://plugins.roundcube.net'),
@@ -54,18 +55,20 @@
}
if ($package->lead) {
- $data['authors'][] = array(
- 'name' => strval($package->lead->name),
- 'email' => strval($package->lead->email),
- 'role' => 'Lead',
- );
+ foreach ($package->lead as $lead) {
+ if (strval($lead->active) == 'no') {
+ continue;
+ }
+ $data['authors'][] = array(
+ 'name' => strval($lead->name),
+ 'email' => strval($lead->email),
+ 'role' => 'Lead',
+ );
+ }
}
if ($devs = $package->developer) {
- if (!is_array($devs)) {
- $devs = array($package->developer);
- }
- foreach ($devs as $dev) {
+ foreach ($package->developer as $dev) {
$data['authors'][] = array(
'name' => strval($dev->name),
'email' => strval($dev->email),
@@ -74,6 +77,12 @@
}
}
+if ($package->dependencies->required->extension) {
+ foreach ($package->dependencies->required->extension as $ext) {
+ $data['require']['ext-' . strval($ext->name)] = '*';
+ }
+}
+
// remove empty values
$data = array_filter($data);
--
Gitblit v1.9.1