diff --git a/AGENTS.md b/AGENTS.md index 0a48918..196b7aa 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -20,7 +20,7 @@ ## General - There should be Button in the Top Bar, to refresh the Data from the CTS API and a timestamp with the latest refresh. - LoggedIn User should be visible in the Top Bar - every action should be immediately persistent, no separate "save" button required, unless explicitly described. -- ProPresenter `.pro` file parser/generator is implemented as a separate composer package (`bussnet/propresenter7-php-api`) linked via path repository +- ProPresenter `.pro` file parser/generator is implemented as a separate composer package (`bussnet/propresenter7-php-lib`) linked via a composer vcs repository ## The Plan @@ -246,7 +246,7 @@ ## Repository Structure | **pp-planer** | `/Users/thorsten/AI/pp-planer` | `cts-presenter-app` | Laravel app (main codebase) | | **propresenter** | `/Users/thorsten/AI/propresenter` | `propresenter-parser` | ProPresenter .pro/.proplaylist parser (composer path dependency) | -The parser is linked via `composer.json` path repository: `"url": "../propresenter"`. +The parser is consumed via a `composer.json` vcs repository: `"url": "https://git.stadtmission-butzbach.de/public/propresenter7-php-lib.git"` (a local `"../propresenter"` path repository can be enabled for development via `use_local_pp_lib.sh`). ## Build, Test, Lint Commands diff --git a/update-prod.sh b/update-prod.sh index 061c76a..e7fff5c 100755 --- a/update-prod.sh +++ b/update-prod.sh @@ -16,13 +16,13 @@ git fetch --all --prune # und database/ gitignored sind und nicht angefasst werden. git reset --hard origin/master -# Die bussnet/propresenter7-php-api-Version wird ausschliesslich ueber die eingecheckte +# Die bussnet/propresenter7-php-lib-Version wird ausschliesslich ueber die eingecheckte # composer.lock gepinnt (Standard-Composer-Praxis). Der Dockerfile-Schritt # "composer install" deployt exakt diesen Lock-Stand; "COPY composer.json # composer.lock" bricht die Composer-Layer automatisch, sobald sich die Lock # aendert. WICHTIG: composer.lock committen, wenn der Parser fortschreitet. # (Kein "composer update" hier: master des Parsers wurde umbenannt zu -# bussnet/propresenter7-php-api, ein Re-Resolve von dev-master schlaegt fehl.) +# bussnet/propresenter7-php-lib, ein Re-Resolve von dev-master schlaegt fehl.) echo "[deploy] Baue Image (inkl. aktualisierter Basis-Images) ..." $DC build --pull diff --git a/use_local_pp_lib.sh b/use_local_pp_lib.sh index 0462ac7..2e4e4cf 100755 --- a/use_local_pp_lib.sh +++ b/use_local_pp_lib.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Toggle bussnet/propresenter7-php-api between remote VCS and local path repository. +# Toggle bussnet/propresenter7-php-lib between remote VCS and local path repository. # # Usage: # ./use_local_pp_lib.sh — Switch to local checkout (symlinked) @@ -39,13 +39,13 @@ switch_to_remote() { file_put_contents("composer.json", json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n"); ' - if [[ -L "vendor/bussnet/propresenter7-php-api" ]] || [[ -d "vendor/bussnet/propresenter7-php-api" ]]; then - rm -rf vendor/bussnet/propresenter7-php-api + if [[ -L "vendor/bussnet/propresenter7-php-lib" ]] || [[ -d "vendor/bussnet/propresenter7-php-lib" ]]; then + rm -rf vendor/bussnet/propresenter7-php-lib fi - composer update bussnet/propresenter7-php-api + composer update bussnet/propresenter7-php-lib echo "" - echo "bussnet/propresenter7-php-api wird jetzt vom Remote-Repository geladen." + echo "bussnet/propresenter7-php-lib wird jetzt vom Remote-Repository geladen." } switch_to_local() { @@ -63,8 +63,8 @@ switch_to_local() { local PKG_NAME PKG_NAME=$(php -r "echo json_decode(file_get_contents('$LOCAL_PATH/composer.json'), true)['name'] ?? '';") - if [[ "$PKG_NAME" != "bussnet/propresenter7-php-api" ]]; then - echo "Error: Package in $LOCAL_PATH ist '$PKG_NAME', erwartet 'bussnet/propresenter7-php-api'." >&2 + if [[ "$PKG_NAME" != "bussnet/propresenter7-php-lib" ]]; then + echo "Error: Package in $LOCAL_PATH ist '$PKG_NAME', erwartet 'bussnet/propresenter7-php-lib'." >&2 exit 1 fi @@ -88,13 +88,13 @@ switch_to_local() { file_put_contents("composer.json", json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\n"); ' -- "$REL_PATH" - if [[ -L "vendor/bussnet/propresenter7-php-api" ]] || [[ -d "vendor/bussnet/propresenter7-php-api" ]]; then - rm -rf vendor/bussnet/propresenter7-php-api + if [[ -L "vendor/bussnet/propresenter7-php-lib" ]] || [[ -d "vendor/bussnet/propresenter7-php-lib" ]]; then + rm -rf vendor/bussnet/propresenter7-php-lib fi - composer update bussnet/propresenter7-php-api + composer update bussnet/propresenter7-php-lib echo "" - echo "bussnet/propresenter7-php-api ist jetzt mit $REL_PATH verlinkt (Symlink)." + echo "bussnet/propresenter7-php-lib ist jetzt mit $REL_PATH verlinkt (Symlink)." echo "Aenderungen in $REL_PATH sind sofort verfuegbar." }