Skip to content

Commit

Permalink
Merge branch 'master' into imp_6_2
Browse files Browse the repository at this point in the history 
Conflicts:
	imp/package.xml
  • Loading branch information
@slusarz
slusarz committed Oct 16, 2013
2 parents 4cec321 + 227e171 commit 9a87baa
Show file tree
Hide file tree
Showing 182 changed files with 6,224 additions and 818 deletions.
70 changes: 70 additions & 0 deletions ansel/composer.json
View file
@@ -0,0 +1,70 @@
{
"name": "horde/ansel",
"description": "Photo management application",
"type": "library",
"homepage": "http://pear.horde.org",
"license": "GPL-2.0",
"authors": [
{
"name": "Chuck Hagenbuch",
"email": "chuck@horde.org",
"role": "lead"
},
{
"name": "Jan Schneider",
"email": "jan@horde.org",
"role": "lead"
},
{
"name": "Michael J Rubinsky",
"email": "mrubinsk@horde.org",
"role": "lead"
}
],
"version": "3.0.1",
"time": "2013-08-22",
"repositories": [
{
"type": "pear",
"url": "http://pear.horde.org"
}
],
"require": {
"php": ">=5.3.0",
"pear-pear.horde.org/content": ">=2.0.3@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/horde": ">=5.0.0@stable,<=6.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Auth": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Autoloader": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Core": ">=2.6.1@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Date": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Db": ">=2.0.3@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Exception": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Form": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Group": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Image": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Mime": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Nls": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Perms": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Prefs": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Serialize": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Share": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Support": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Text_Filter": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Url": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Util": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_View": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Vfs": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"ext-gettext": "*",
"ext-hash": "*"
},
"suggest": {
"pear-pear.horde.org/Horde_Service_UrlShortener": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Service_Twitter": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"pear-pear.horde.org/Horde_Service_Facebook": ">=2.0.0@stable,<=3.0.0alpha1@stable",
"ext-gd": "*",
"ext-imagick": "*",
"ext-libpuzzle": "*",
"ext-opencv": "*",
"ext-php-facedetect": "*"
}
}
26 changes: 26 additions & 0 deletions beatnik/composer.json
View file
@@ -0,0 +1,26 @@
{
"name": "horde/beatnik",
"description": "DNS record management for Horde",
"type": "library",
"homepage": "http://pear.horde.org",
"license": "GPL",
"authors": [
{
"name": "Ben Klang",
"email": "bklang@horde.org",
"role": "lead"
}
],
"version": "1.0.0alpha1",
"time": "2013-06-05",
"repositories": [
{
"type": "pear",
"url": "http://pear.horde.org"
}
],
"require": {
"php": ">=5.3.0",
"pear-pear.horde.org/horde": ">=5.0.0,<=6.0.0alpha1"
}
}
30 changes: 30 additions & 0 deletions chora/composer.json
View file
@@ -0,0 +1,30 @@
{
"name": "horde/chora",
"description": "TODO",
"type": "library",
"homepage": "http://pear.horde.org",
"license": "TODO",
"authors": [
{
"name": "Chuck Hagenbuch",
"email": "chuck@horde.org",
"role": "lead"
},
{
"name": "Jan Schneider",
"email": "jan@horde.org",
"role": "lead"
}
],
"version": "1.0.0alpha1",
"time": "2013-06-22",
"repositories": [
{
"type": "pear",
"url": "http://pear.horde.org"
}
],
"require": {
"php": ">=5.3.0"
}
}
45 changes: 45 additions & 0 deletions components/composer.json
View file
@@ -0,0 +1,45 @@
{
"name": "horde/components",
"description": "A package for dealing with Horde components",
"type": "library",
"homepage": "http://pear.horde.org",
"license": "LGPL-2.1",
"authors": [
{
"name": "Gunnar Wrobel",
"email": "p@rdus.de",
"role": "lead"
}
],
"version": "0.99.1",
"time": "2013-02-13",
"repositories": [
{
"type": "pear",
"url": "http://pear.horde.org"
}
],
"require": {
"php": ">=5.2.1",
"pear-pear.horde.org/Horde_Autoloader": "*",
"pear-pear.horde.org/Horde_Argv": "*",
"pear-pear.horde.org/Horde_Cli": "*",
"pear-pear.horde.org/Horde_Cli_Modular": "*",
"pear-pear.horde.org/Horde_Http": "*",
"pear-pear.horde.org/Horde_Pear": "*",
"pear-pear.horde.org/Horde_Role": "*",
"pear-pear.horde.org/Horde_Text_Diff": "*",
"pear-pear.horde.org/Horde_Util": "*",
"pear-pear.horde.org/Horde_Injector": "*",
"pear-pear.horde.org/Horde_Release": "*"
},
"suggest": {
"pear-pear.horde.org/Horde_Test": "*",
"pear-pear.php.net/PHP_CodeSniffer": "*",
"pear-pear.phpunit.de/PHPUnit": "*",
"pear-pear.phpunit.de/phpcpd": "*",
"pear-pear.phpunit.de/phpdcd": "*",
"pear-pear.phpunit.de/phploc": "*",
"pear-pear.phpmd.org/PHP_PMD": "*"
}
}
11 changes: 10 additions & 1 deletion components/lib/Components/Component.php
View file
Expand Up @@ -184,6 +184,15 @@ public function changed(
*/
public function timestampAndSync($options);

/**
* Updates the composer.json file.
*
* @param array $options Options for the operation.
*
* @return string The success message.
*/
public function updateComposer($options);

/**
* Add the next version to the package.xml.
*
Expand Down Expand Up @@ -284,4 +293,4 @@ public function installChannel(
public function install(
Components_Pear_Environment $env, $options = array(), $reason = ''
);
}
}
16 changes: 15 additions & 1 deletion components/lib/Components/Component/Base.php
View file
Expand Up @@ -290,6 +290,20 @@ public function timestampAndSync($options)
);
}

/**
* Updates the composer.json file.
*
* @param array $options Options for the operation.
*
* @return string The success message.
*/
public function updateComposer($options)
{
throw new Components_Exception(
'Updating composer.json is not supported!'
);
}

/**
* Add the next version to the package.xml.
*
Expand Down Expand Up @@ -476,4 +490,4 @@ protected function _hasCi()
}
return $response->code != 404;
}
}
}
26 changes: 26 additions & 0 deletions components/lib/Components/Component/Source.php
View file
Expand Up @@ -264,6 +264,32 @@ public function timestampAndSync($options)
return $result;
}

/**
* Updates the composer.json file.
*
* @param array $options Options for the operation.
*
* @return string The success message.
*/
public function updateComposer($options)
{
if (empty($options['pretend'])) {
$composer = new Components_Helper_Composer();
$composer->generateComposeJson(
$this->getPackageXmlPath()
);
$result = 'Updated composer.json.';
} else {
$result = 'Would update composer.json now.';
}
if (!empty($options['commit'])) {
$options['commit']->add(
$this->_directory . '/composer.json', $this->_directory
);
}
return $result;
}

/**
* Set the version in the package.xml
*
Expand Down
38 changes: 10 additions & 28 deletions components/lib/Components/Helper/Composer.php
View file
Expand Up @@ -23,45 +23,27 @@
class Components_Helper_Composer
{
/**
* The output handler.
* Updates the composer.json file.
*
* @param Component_Output
* @param string $package Path to the package.xml file.
* @param array $options The set of options for the operation.
*/
private $_output;

/**
* Constructor.
*
* @param Component_Output $output The output handler.
*/
public function __construct(Components_Output $output)
{
$this->_output = $output;
}

/**
* Updates the component information in the horde-web repository.
*
* @param Components_Component $component The data of this component will
* be updated.
* @param array $options The set of options for the
* operation.
*/
public function generateComposeJson(Components_Component $component,
$options)
public function generateComposeJson($package, array $options = array())
{
require_once __DIR__ . '/../../Conductor/PEARPackageFilev2.php';
require_once __DIR__ . '/../../Conductor/Package2XmlToComposer.php';

$converter = new Package2XmlToComposer($component->getPackageXmlPath());
$converter = new Package2XmlToComposer($package);
$converter->setRepositories(array(
array('pear', 'http://pear.horde.org')
));
$converter->convert();

$this->_output->ok(
'Created composer.json file.'
);
if (isset($options['logger'])) {
$options['logger']->ok(
'Created composer.json file.'
);
}
}

}
1 change: 1 addition & 0 deletions components/lib/Components/Module/Release.php
View file
Expand Up @@ -164,6 +164,7 @@ public function getHelp($action)
The available tasks are:
- timestamp : Timestamp the package.xml and sync the change log.
- composer : Update the composer.json file.
- sentinel : Update the sentinels in docs/CHANGES and lib/Application.php.
- commit : Commit any changes with an automated message.
- package : Prepare a *.tgz package.
Expand Down

0 comments on commit 9a87baa

Please sign in to comment.