diff options
| -rw-r--r-- | composer.json | 16 | ||||
| l--------- | makesrc.sh | 1 | ||||
| -rwxr-xr-x | php-clue-block-react-get-source.sh | 74 | ||||
| -rw-r--r-- | php-clue-block-react.spec | 92 |
4 files changed, 144 insertions, 39 deletions
diff --git a/composer.json b/composer.json index ce437a3..ddfc6c8 100644 --- a/composer.json +++ b/composer.json @@ -7,19 +7,23 @@ "authors": [ { "name": "Christian Lück", - "email": "christian@lueck.tv" + "email": "christian@clue.engineering" } ], "autoload": { - "files": [ "src/functions.php" ] + "files": [ "src/functions_include.php" ] + }, + "autoload-dev": { + "psr-4": { "Clue\\Tests\\React\\Block\\": "tests/" } }, "require": { - "php": ">=5.3", - "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5", - "react/promise": "^2.7 || ^1.2.1", + "php": ">=5.3", + "react/event-loop": "^1.2", + "react/promise": "^3.0 || ^2.7 || ^1.2.1", "react/promise-timer": "^1.5" }, "require-dev": { - "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35" + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35", + "react/http": "^1.4" } } diff --git a/makesrc.sh b/makesrc.sh new file mode 120000 index 0000000..c44e961 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1 @@ +php-clue-block-react-get-source.sh
\ No newline at end of file diff --git a/php-clue-block-react-get-source.sh b/php-clue-block-react-get-source.sh new file mode 100755 index 0000000..8b02c4f --- /dev/null +++ b/php-clue-block-react-get-source.sh @@ -0,0 +1,74 @@ +#/bin/sh + +GIT=`which git` +RPM=`which rpm` + +if [ -z "$GIT" ] +then + echo "ERROR: 'git' command not found" 1>&2 + exit 1 +elif [ -z "$RPM" ] +then + echo "ERROR: 'rpm' command not found" 1>&2 + exit 1 +fi + +function print { + echo -e "\e[0;33m>>>>> ${1}\e[0m" +} + +if [ -x "$1" ] +then + SPEC=$1 +else + SPEC=`ls *.spec | head -1` +fi + +SPEC_DIR=`pwd` + +print "SPEC_DIR = $SPEC_DIR" + +NAME=`echo $SPEC | sed 's#\.spec##'` +VERSION=`egrep '%global\s*github_version' $SPEC | awk '{print $3}'` + +print "SPEC = $SPEC" +print "NAME = $NAME" + +GIT_OWNER=`egrep '%global\s*github_owner' $SPEC | awk '{print $3}'` +GIT_NAME=`egrep '%global\s*github_name' $SPEC | awk '{print $3}'` +GIT_COMMIT=`egrep '%global\s*github_commit' $SPEC | awk '{print $3}'` +GIT_REPO=https://github.com/${GIT_OWNER}/${GIT_NAME} +GIT_DIR=`echo $GIT_REPO | sed 's#.*/##'` + +print "GIT_OWNER = $GIT_OWNER" +print "GIT_NAME = $GIT_NAME" +print "GIT_COMMIT = $GIT_COMMIT" +print "GIT_REPO = $GIT_REPO" +print "GIT_DIR = $GIT_DIR" + +TEMP_DIR=$(mktemp --dir) + +pushd $TEMP_DIR + print "Cloning git repo..." + $GIT clone $GIT_REPO + + pushd $GIT_DIR + print "Checking out commit..." + $GIT checkout $GIT_COMMIT + cp composer.json ${SPEC_DIR}/ + popd + + TAR_DIR=${GIT_NAME}-${GIT_COMMIT} + print "TAR_DIR = $TAR_DIR" + + mv $GIT_DIR $TAR_DIR + + TAR_FILE=${SPEC_DIR}/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz + print "TAR_FILE = $TAR_FILE" + + [ -e $TAR_FILE ] && rm -f $TAR_FILE + tar --exclude-vcs -czf $TAR_FILE $TAR_DIR + chmod 0644 $TAR_FILE +popd + +rm -rf $TEMP_DIR diff --git a/php-clue-block-react.spec b/php-clue-block-react.spec index 3031045..f35aef2 100644 --- a/php-clue-block-react.spec +++ b/php-clue-block-react.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-clue-block-react # -# Copyright (c) 2017-2018 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2017-2021 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,26 +12,28 @@ %global github_owner clue %global github_name reactphp-block -%global github_version 1.3.0 -%global github_commit a4a5cd64ded3b15affa168a2419fa4eda08b96aa +%global github_version 1.5.0 +%global github_commit 718b0571a94aa693c6fffc72182e87257ac900f3 %global composer_vendor clue %global composer_project block-react # "php": ">=5.3" %global php_min_ver 5.3 -# "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5" -%global react_event_loop_min_ver 0.3.5 +# "react/event-loop": "^1.2" +%global react_event_loop_min_ver 1.2 %global react_event_loop_max_ver 2.0 -# "react/promise": "^2.7 || ^1.2.1" +# "react/promise": "^3.0 || ^2.7 || ^1.2.1" %global react_promise_min_ver 1.2.1 -%global react_promise_max_ver 3.0 +%global react_promise_max_ver 4 # "react/promise-timer": "^1.5" %global react_promise_timer_min_ver 1.5 %global react_promise_timer_max_ver 2.0 +# "react/http": "^1.0" in require-dev but only used in examples + # Build using "--without tests" to disable tests -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests %{!?phpdir: %global phpdir %{_datadir}/php} @@ -40,30 +42,35 @@ Version: %{github_version} Release: 1%{?github_release}%{?dist} Summary: Integrate async React PHP components into your blocking environment -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} -Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz + +# GitHub export does not include tests +# Run php-clue-block-react-get-source.sh to create full source +Source0: %{name}-%{github_version}-%{github_commit}.tar.gz +Source1: %{name}-get-source.sh BuildArch: noarch # Tests -%if %{with_tests} +%if %{with tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(phpunit/phpunit) +# "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35" +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.3 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver}) BuildRequires: (php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} with php-composer(react/promise-timer) < %{react_promise_timer_max_ver}) BuildRequires: (php-composer(react/promise) >= %{react_promise_min_ver} with php-composer(react/promise) < %{react_promise_max_ver}) %else -BuildRequires: php-composer(react/event-loop) < %{react_event_loop_max_ver} -BuildRequires: php-composer(react/event-loop) >= %{react_event_loop_min_ver} -BuildRequires: php-composer(react/promise-timer) < %{react_promise_timer_max_ver} -BuildRequires: php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} -BuildRequires: php-composer(react/promise) < %{react_promise_max_ver} -BuildRequires: php-composer(react/promise) >= %{react_promise_min_ver} +BuildRequires: php-react-event-loop < %{react_event_loop_max_ver} +BuildRequires: php-react-event-loop >= %{react_event_loop_min_ver} +BuildRequires: php-react-promise-timer < %{react_promise_timer_max_ver} +BuildRequires: php-react-promise-timer >= %{react_promise_timer_min_ver} +BuildRequires: php-react-promise < %{react_promise_max_ver} +BuildRequires: php-react-promise >= %{react_promise_min_ver} %endif -## phpcompatinfo (computed from version 1.3.0) +## phpcompatinfo (computed from version 1.4.0) BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -76,14 +83,14 @@ Requires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} wi Requires: (php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} with php-composer(react/promise-timer) < %{react_promise_timer_max_ver}) Requires: (php-composer(react/promise) >= %{react_promise_min_ver} with php-composer(react/promise) < %{react_promise_max_ver}) %else -Requires: php-composer(react/event-loop) < %{react_event_loop_max_ver} -Requires: php-composer(react/event-loop) >= %{react_event_loop_min_ver} -Requires: php-composer(react/promise-timer) < %{react_promise_timer_max_ver} -Requires: php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} -Requires: php-composer(react/promise) < %{react_promise_max_ver} -Requires: php-composer(react/promise) >= %{react_promise_min_ver} +Requires: php-react-event-loop < %{react_event_loop_max_ver} +Requires: php-react-event-loop >= %{react_event_loop_min_ver} +Requires: php-react-promise-timer < %{react_promise_timer_max_ver} +Requires: php-react-promise-timer >= %{react_promise_timer_min_ver} +Requires: php-react-promise < %{react_promise_max_ver} +Requires: php-react-promise >= %{react_promise_min_ver} %endif -# phpcompatinfo (computed from version 1.3.0) +# phpcompatinfo (computed from version 1.4.0) Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -115,7 +122,7 @@ cat <<'AUTOLOAD' | tee src/autoload.php require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required(array( - __DIR__.'/functions.php', + __DIR__.'/functions_include.php', '%{phpdir}/React/EventLoop/autoload.php', '%{phpdir}/React/Promise/autoload.php', '%{phpdir}/React/Promise/Timer/autoload.php', @@ -129,17 +136,21 @@ cp -rp src %{buildroot}%{phpdir}/Clue/React/Block %check -%if %{with_tests} +%if %{with tests} : Mock Composer autoloader mkdir vendor -ln -s %{buildroot}%{phpdir}/Clue/React/Block/autoload.php vendor/autoload.php +cat <<'AUTOLOAD' | tee vendor/autoload.php +<?php +require_once '%{buildroot}%{phpdir}/Clue/React/Block/autoload.php'; +\Fedora\Autoloader\Autoload::addPsr4('Clue\\Tests\\React\\Block\\', dirname(__DIR__).'/tests'); +AUTOLOAD : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php54 php55} php70 php71 php72 php73; do - if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then - $PHP_EXEC $PHPUNIT --verbose \ +for CMDARG in "php %{phpunit}" php73 php74 php80 php81; do + if which $CMDARG; then + set $CMDARG + $1 ${2:-%{_bindir}/phpunit9} --verbose \ || RETURN_CODE=1 fi done @@ -160,6 +171,21 @@ exit $RETURN_CODE %changelog +* Thu Oct 21 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1 +- update to 1.5.0 +- raise dependency on react/event-loop 1.2 +- allow react/promise 3.0 + +* Tue Nov 3 2020 Remi Collet <remi@remirepo.net> - 1.4.0-1 +- update to 1.4.0 +- switch to phpunit9 + +* Sat Dec 14 2019 Shawn Iwinski <shawn@iwin.ski> - 1.3.1-3 +- Use PHPUnit 6 + +* Fri May 10 2019 Shawn Iwinski <shawn@iwin.ski> - 1.3.1-1 +- Update to 1.3.1 (RHBZ #1697987) + * Sun Jul 01 2018 Shawn Iwinski <shawn@iwin.ski> - 1.3.0-1 - Update to 1.3.0 (RHBZ #1591266) - Add range version dependencies for Fedora >= 27 || RHEL >= 8 |