Added dokumentation for tests, gitlab and deployments

.gitlab-ci.yml

@@ -95,7 +95,7 @@ deploy_staging:
     - *deployment_ssh
     - *deployment_dependencies
     # Deploy to server
-    - ./deploy.sh -h "${STAGING_REMOTE}" -p "${STAGING_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}"
+    - ./deploy.sh -r "${STAGING_REMOTE}" -p "${STAGING_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}"
 
 deploy_production:
   <<: *deploy_definition
@@ -112,4 +112,4 @@ deploy_production:
     - *deployment_ssh
     - *deployment_dependencies
     # Deploy to server
-    - ./deploy.sh -h "${PRODUCTION_REMOTE}" -p "${PRODUCTION_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}"
+    - ./deploy.sh -r "${PRODUCTION_REMOTE}" -p "${PRODUCTION_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}"

README.md

@@ -5,19 +5,30 @@
 
 Please visit https://engelsystem.de for a feature list.
 
+To report bugs use [engelsystem/issues](https://github.com/engelsystem/engelsystem/issues)
+
 ## Installation
 
 ### Requirements:
  * PHP >= 7.0.0
- * MySQL-Server >= 5.5.x
+ * MySQL-Server >= 5.5 or MariaDB-Server >= 5.5 
  * Webserver, i.e. lighttpd, nginx, or Apache
 
 ### Directions:
  * Clone the master branch: `git clone https://github.com/engelsystem/engelsystem.git`
  * Install [Composer](https://getcomposer.org/download/)
- * Install project dependencies: `composer install`
+ * Install project dependencies:
- * Webserver must have write access to the 'import' directory and read access for all other directories
+     ```bash
- * Webserver must point to the public directory.
+     composer install
+     ```
+    On production systems it is recommended to use
+    ```bash
+    composer install --no-dev
+    composerdump-autoload --optimize
+    ```
+    to install the engelsystem
+ * The webserver must have write access to the 'import' directory and read access for all other directories
+ * The webserver must point to the public directory.
 
  * Recommended: Directory Listing should be disabled.
  * There must a be MySQL database created with a user who has full rights to that database.
@@ -31,12 +42,41 @@ Engelsystem can now be used.
  * Make sure the config allows for sessions.
  * Both Apache and Nginx allow for different VirtualHost configurations.
 
-Report Bugs: https://github.com/engelsystem/engelsystem/issues
-
 ## Development
 Since the engelsystem is open source, you can help to improve the system. We really love to get pull requests containing fixes or implementations of our Github issues.
 
 Please create single pull requests for every feature instead of creating one big monster of pull request containing a complete rewrite.
 
+### Testing
+To run the unit tests use
+```bash
+vendor/bin/phpunit --testsuite Unit
+``` 
+
+If a database is configured and the engelsystem is allowed to mess around with some files, you can run feature tests. The tests can potentially delete some database entries, so they should never be run on a production system!
+```bash
+vendor/bin/phpunit --testsuite Feature
+# or for unit- and feature tests:
+vendor/bin/phpunit
+``` 
+
+### CI & Build Pipeline
+The engelsystem can be tested and automatically deployed to a testing/staging/production environment.
+This functionality requires a [GitLab](https://about.gitlab.com/) server with a running docker minion.
+
+To use the deployment features the following secret variables need to be defined (if undefined the step will be skipped):
+```bash
+SSH_PRIVATE_KEY         # The ssh private key
+STAGING_REMOTE          # The staging server, e.g. user@remote.host
+STAGING_REMOTE_PATH     # The psth on the remote server, e.g. /var/www/engelsystem
+PRODUCTION_REMOTE       # Same as STAGING_REMOTE but for the production environment
+PRODUCTION_REMOTE_PATH  # Same as STAGING_REMOTE_PATH but for the production environment
+```
+
+#### deploy.sh
+The `deploy.sh` script can be used to deploy the engelsystem. It uses rsync to deploy the application to a server over ssh.
+
+For usage see `./deploy.sh -h`
+
 ### Codestyle
 Please ensure that your pull requests follow [PSR-2](http://www.php-fig.org/psr/psr-2/) and [PSR-4](http://www.php-fig.org/psr/psr-4/).

deploy.sh

@@ -6,9 +6,24 @@ remote_host=
 remote_path=
 deploy_id=
 
-while getopts ":h:p:i:" opt; do
+show_help(){
+    echo "Usage: $0 [OPTION]..." >&2
+    echo "Deploys a software with rsync over ssh" >&2
+    echo "The options -i, -p and -r are required" >&2
+    echo "" >&2
+    echo "  -h          Display this help screen" >&2
+    echo "  -i <id>     Sets the id, a unique name for the deployment" >&2
+    echo "  -p <path>   Define the base path on the server" >&2
+    echo "  -r <host>   The remote server name and user" >&2
+}
+
+while getopts ":hi:p:r:" opt; do
     case ${opt} in
         h)
+            show_help
+            exit 1
+            ;;
+        r)
             remote_host="$OPTARG"
             ;;
         p)
@@ -29,7 +44,7 @@ while getopts ":h:p:i:" opt; do
 done
 
 if [ -z "${remote_host}" ] || [ -z "${remote_path}" ] || [ -z "${deploy_id}" ]; then
-    echo "Please specify -h[remote host], -p[remote path] and -i[deploy id]" >&2
+    show_help
     exit 1
 fi
 
@@ -48,8 +63,7 @@ ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${remote_hos
     fi
 
     echo \"Changing symlink\"
-    unlink \"${remote_path}/current\"
+    unlink \"${remote_path}/current\" && ln -s \"${remote_path}/${deploy_id}\" \"${remote_path}/current\"
-    ln -s \"${remote_path}/${deploy_id}\" \"${remote_path}/current\"
 
     if [[ -f \"${deploy_id}-config.php\" ]]; then
         echo \"Restoring config\"