From: Christian Weiske Date: Mon, 15 Mar 2021 19:30:19 +0000 (+0100) Subject: Support dependency installation via composer X-Git-Tag: v0.6.2~3 X-Git-Url: https://git.cweiske.de/bdrem.git/commitdiff_plain/16f9c3c10d96b02f9ae63d04c08a8089c73558a5 Support dependency installation via composer --- diff --git a/.gitignore b/.gitignore index 17e3ba1..2512199 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /lib /bin/phar-bdrem.php /README.html +vendor/ diff --git a/README.rst b/README.rst index 29e8bda..81a729d 100644 --- a/README.rst +++ b/README.rst @@ -41,9 +41,9 @@ After configuration_, you can test and use *bdrem* via command line:: ----------------------------------------------------------- Days Age Name Event Date Day ----------------------------------------------------------- - 0 32 Foo Bar Birthday 20.03.1982 Do - 1 33 Andrea Milestone Birthday 21.03.1981 Fr - 7 32 Hugh Success Birthday 27.03.1982 Do + 0 32 Foo Bar Birthday 20.03.1982 Do + 1 33 Andrea Milestone Birthday 21.03.1981 Fr + 7 32 Hugh Success Birthday 27.03.1982 Do 12 Welt Scherztag 01.04.???? Di Help @@ -53,7 +53,7 @@ To find out about all supported command line options, use ``--help``:: Usage: ./bin/bdrem.php [options] ./bin/bdrem.php [options] [options] - + Options: -n NUM, --next=NUM Show NUM days after date -p NUM, --prev=NUM Show NUM days before date @@ -66,7 +66,7 @@ To find out about all supported command line options, use ``--help``:: --no-color Do not output ANSI color codes -h, --help show this help message and exit -v, --version show the program version and exit - + Commands: readme Show README.rst file config Extract configuration file @@ -132,8 +132,8 @@ Configure your source as follows:: $source = array('Bdf', '/path/to/birthday.bdf'); -__ http://cweiske.de/birthday.htm -__ http://cweiske.de/birthday3.htm +__ http://cweiske.de/birthday.htm +__ http://cweiske.de/birthday3.htm CSV file @@ -176,7 +176,7 @@ Configuration options Default: ``array('name' => 0, 'event' => 1, 'date' => 2)`` - + ``defaultEvent`` Text to use as event if there is no event column. @@ -278,6 +278,10 @@ Dependencies Note that the ``.phar`` file already includes all dependencies; you do not need to install anything. +When running from a git checkout, install the dependencies with composer:: + + $ composer install + ======= License diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..3941d41 --- /dev/null +++ b/composer.json @@ -0,0 +1,9 @@ +{ + "require": { + "pear/console_color2": "^0.1.2", + "pear/console_commandline": "^1.2", + "pear/console_table": "^1.3", + "pear/mail_mime": "^1.10", + "pear/net_ldap2": "^2.2" + } +} diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..87c160a --- /dev/null +++ b/composer.lock @@ -0,0 +1,442 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "3c1f0b1522a2c5b6d68ba625069b424a", + "packages": [ + { + "name": "pear/console_color2", + "version": "0.1.2", + "source": { + "type": "git", + "url": "https://github.com/pear/Console_Color2.git", + "reference": "cab2b886aa55cc9e23464d1f49edf97bee9f5a63" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Console_Color2/zipball/cab2b886aa55cc9e23464d1f49edf97bee9f5a63", + "reference": "cab2b886aa55cc9e23464d1f49edf97bee9f5a63", + "shasum": "" + }, + "require": { + "php": ">=5.0.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Console_Color2": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniel O'Connor", + "email": "daniel.oconnor@gmail.com", + "role": "Pear Developer" + }, + { + "name": "Stefan Walk", + "email": "et@php.net" + }, + { + "name": "Scott Mattocks", + "email": "scottmattocks@php.net" + } + ], + "description": "This Class allows you to easily use ANSI console colors in your application.", + "homepage": "https://github.com/pear/Console_Color2", + "keywords": [ + "console" + ], + "support": { + "source": "https://github.com/pear/Console_Color2/tree/0.1.2" + }, + "time": "2012-10-23T11:52:18+00:00" + }, + { + "name": "pear/console_commandline", + "version": "v1.2.3", + "source": { + "type": "git", + "url": "https://github.com/pear/Console_CommandLine.git", + "reference": "331b295d00c9fa2dae30fe14538d430d72d954c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Console_CommandLine/zipball/331b295d00c9fa2dae30fe14538d430d72d954c6", + "reference": "331b295d00c9fa2dae30fe14538d430d72d954c6", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xml": "*", + "pear/pear_exception": "^1.0.0", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "type": "library", + "autoload": { + "psr-0": { + "Console": "./" + }, + "exclude-from-classmap": [ + "tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "" + ], + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Richard Quadling", + "email": "rquadling@gmail.com" + }, + { + "name": "David Jean Louis", + "email": "izimobil@gmail.com" + } + ], + "description": "A full featured command line options and arguments parser.", + "homepage": "https://github.com/pear/Console_CommandLine", + "keywords": [ + "console" + ], + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_CommandLine", + "source": "https://github.com/pear/Console_CommandLine" + }, + "time": "2020-04-16T15:04:15+00:00" + }, + { + "name": "pear/console_getopt", + "version": "v1.4.3", + "source": { + "type": "git", + "url": "https://github.com/pear/Console_Getopt.git", + "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0", + "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-0": { + "Console": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Andrei Zmievski", + "email": "andrei@php.net", + "role": "Lead" + }, + { + "name": "Stig Bakken", + "email": "stig@php.net", + "role": "Developer" + }, + { + "name": "Greg Beaver", + "email": "cellog@php.net", + "role": "Helper" + } + ], + "description": "More info available on: http://pear.php.net/package/Console_Getopt", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_Getopt", + "source": "https://github.com/pear/Console_Getopt" + }, + "time": "2019-11-20T18:27:48+00:00" + }, + { + "name": "pear/console_table", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/pear/Console_Table.git", + "reference": "1930c11897ca61fd24b95f2f785e99e0f36dcdea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Console_Table/zipball/1930c11897ca61fd24b95f2f785e99e0f36dcdea", + "reference": "1930c11897ca61fd24b95f2f785e99e0f36dcdea", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "suggest": { + "pear/Console_Color2": ">=0.1.2" + }, + "type": "library", + "autoload": { + "classmap": [ + "Table.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Jan Schneider", + "homepage": "http://pear.php.net/user/yunosh" + }, + { + "name": "Tal Peer", + "homepage": "http://pear.php.net/user/tal" + }, + { + "name": "Xavier Noguer", + "homepage": "http://pear.php.net/user/xnoguer" + }, + { + "name": "Richard Heyes", + "homepage": "http://pear.php.net/user/richard" + } + ], + "description": "Library that makes it easy to build console style tables.", + "homepage": "http://pear.php.net/package/Console_Table/", + "keywords": [ + "console" + ], + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_Table", + "source": "https://github.com/pear/Console_Table" + }, + "time": "2018-01-25T20:47:17+00:00" + }, + { + "name": "pear/mail_mime", + "version": "1.10.10", + "source": { + "type": "git", + "url": "https://github.com/pear/Mail_Mime.git", + "reference": "ede6128af4c1474394a65f44bf20358c0bf1977f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/ede6128af4c1474394a65f44bf20358c0bf1977f", + "reference": "ede6128af4c1474394a65f44bf20358c0bf1977f", + "shasum": "" + }, + "require": { + "pear/pear-core-minimal": "*", + "php": ">=5.2.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Mail": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "BSD-3-clause" + ], + "authors": [ + { + "name": "Cipriano Groenendal", + "email": "cipri@php.net", + "role": "Lead" + }, + { + "name": "Aleksander Machniak", + "email": "alec@php.net", + "role": "Lead" + } + ], + "description": "Mail_Mime provides classes to create MIME messages", + "homepage": "http://pear.php.net/package/Mail_Mime", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail_Mime", + "source": "https://github.com/pear/Mail_Mime" + }, + "time": "2021-01-17T08:30:22+00:00" + }, + { + "name": "pear/net_ldap2", + "version": "v2.2.0", + "source": { + "type": "git", + "url": "https://github.com/pear/Net_LDAP2.git", + "reference": "38f1b22a96dfbd7ec53852f0e1e7ec1a9a5eb0e8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Net_LDAP2/zipball/38f1b22a96dfbd7ec53852f0e1e7ec1a9a5eb0e8", + "reference": "38f1b22a96dfbd7ec53852f0e1e7ec1a9a5eb0e8", + "shasum": "" + }, + "require": { + "ext-ldap": "*", + "pear/pear-core-minimal": "^1.10.1" + }, + "type": "library", + "autoload": { + "classmap": [ + "Net/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "." + ], + "license": [ + "LGPL-3.0" + ], + "description": "Object oriented interface for searching and manipulating LDAP-entries", + "homepage": "http://pear.php.net/package/Net_LDAP2", + "keywords": [ + "PEAR", + "ldap" + ], + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_LDAP2", + "source": "https://github.com/pear/Net_LDAP2" + }, + "time": "2015-10-30T20:34:22+00:00" + }, + { + "name": "pear/pear-core-minimal", + "version": "v1.10.10", + "source": { + "type": "git", + "url": "https://github.com/pear/pear-core-minimal.git", + "reference": "625a3c429d9b2c1546438679074cac1b089116a7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7", + "reference": "625a3c429d9b2c1546438679074cac1b089116a7", + "shasum": "" + }, + "require": { + "pear/console_getopt": "~1.4", + "pear/pear_exception": "~1.0" + }, + "replace": { + "rsky/pear-core-min": "self.version" + }, + "type": "library", + "autoload": { + "psr-0": { + "": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "src/" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Christian Weiske", + "email": "cweiske@php.net", + "role": "Lead" + } + ], + "description": "Minimal set of PEAR core files to be used as composer dependency", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", + "source": "https://github.com/pear/pear-core-minimal" + }, + "time": "2019-11-19T19:00:24+00:00" + }, + { + "name": "pear/pear_exception", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/pear/PEAR_Exception.git", + "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7", + "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7", + "shasum": "" + }, + "require": { + "php": ">=4.4.0" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "type": "class", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "PEAR/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "." + ], + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Helgi Thormar", + "email": "dufuz@php.net" + }, + { + "name": "Greg Beaver", + "email": "cellog@php.net" + } + ], + "description": "The PEAR Exception base class.", + "homepage": "https://github.com/pear/PEAR_Exception", + "keywords": [ + "exception" + ], + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR_Exception", + "source": "https://github.com/pear/PEAR_Exception" + }, + "time": "2019-12-10T10:24:42+00:00" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [], + "plugin-api-version": "2.0.0" +} diff --git a/src/bdrem/Autoloader.php b/src/bdrem/Autoloader.php index cebd0eb..e3884d9 100644 --- a/src/bdrem/Autoloader.php +++ b/src/bdrem/Autoloader.php @@ -52,6 +52,10 @@ class Autoloader get_include_path() . PATH_SEPARATOR . __DIR__ . '/../' ); spl_autoload_register(array(new self(), 'load')); + + if (file_exists(__DIR__ . '/../../vendor/autoload.php')) { + require_once __DIR__ . '/../../vendor/autoload.php'; + } } } -?> \ No newline at end of file +?>