Merge pull request #399 from symfony-cmf/an_other_try

An other try

Author: ElectricMaxxx

.platform.app.yaml

@@ -45,13 +45,7 @@ web:
 cron:
     symfony:
         spec: '* */2 * * *'
-        cmd: |
-          # force clearing the cache
-          rm -rf var/cache/prod
-          bin/console --env=prod doctrine:phpcr:init:dbal --drop --force
-          bin/console --env=prod doctrine:phpcr:repository:init
-          bin/console --env=prod doctrine:phpcr:fixtures:load -n
-          bin/console --env=prod cache:warmup -n --no-debug
+        cmd: ./bin/reloadFixtures.sh $PWD
 
 # The size of the persistent disk of the application (in MB).
 disk: 2048
@@ -64,18 +58,16 @@ mounts:
 # The hooks that will be performed when the package is deployed.
 hooks:
     build: |
-      rm web/app_dev.php
+      if [ "$PLATFORM_BRANCH" = master ]; then
+        rm web/app_dev.php
+      else
+        echo "only remove app_dev.php on master"
+      fi
       # place sqlite file into /tmp so that we can write to it during deploy
       sed -i 's@%kernel.root_dir%/../var/app.sqlite@/tmp/app.sqlite@' app/config/parameters.yml
       bin/console --env=prod assets:install -n --no-debug
       bin/console --env=prod assetic:dump -n --no-debug
-    deploy: |
-      # force clearing the cache
-      rm -rf var/cache/prod
-      bin/console --env=prod doctrine:phpcr:init:dbal --drop --force -n
-      bin/console --env=prod doctrine:phpcr:repository:init -n
-      bin/console --env=prod doctrine:phpcr:fixtures:load -n
-      bin/console --env=prod cache:warmup -n --no-debug
+    deploy: ./bin/reloadFixtures.sh $PWD
 
 runtime:
   extensions:

bin/reloadFixtures.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+DIR=$1
+run () {
+    comment="+++ "$1" +++"
+    command=$2
+    echo ${comment}
+    echo "Command: "${command}
+    ${command}
+    OUT=$?
+    if [ ${OUT} -eq 0 ];then
+       echo "+++ DONE +++"
+       echo
+    else
+       echo "+++ Errors +++"
+       exit ${OUT}
+    fi
+}
+
+CACHE_DIR=${DIR}var/cache/prod
+#run  "Remove cache directory:" "rm -rf ${CACHE_DIR}"
+run "Drop and init dbal:" "php ${DIR}bin/console --env=prod doctrine:phpcr:init:dbal --drop --force -n"
+run "Init repositories:" "php ${DIR}bin/console --env=prod doctrine:phpcr:repository:init -n"
+run "Load date fixtures:" "php ${DIR}bin/console --env=prod doctrine:phpcr:fixtures:load -n"
+run "Warm up cache:" "php ${DIR}bin/console --env=prod cache:warmup -n --no-debug"

web/reload-fixtures.php

@@ -1,29 +1,30 @@
-<pre>
 <?php
 
-function runCommand($command, $shouldHaveOutput = true)
+function outputNice($output)
 {
-    $output = $return_var = null;
-    echo "Running: $command\n";
-    exec($command, $output, $return_var);
-
-    if (!$shouldHaveOutput) {
-        return;
+    if (is_array($output)) {
+        foreach ($output as $line) {
+            printf("<pre><code>%s</code>", $line);
+        }
+    } else {
+        printf("<pre><code>%s</code>", $output);
     }
+}
 
-    if (empty($output) || !is_array($output)) {
-        echo 'Fixtures could not be loaded: '.var_export($return_var, true);
-        exit(1);
-    }
-    echo PHP_EOL;
-    echo "Output:\n";
-    foreach ($output as $line) {
-        echo $line."\n";
-    }
+$commandFile = __DIR__.'/../bin/reloadFixtures.sh';
+if (!file_exists($commandFile)) {
+    outputNice('File not found at: '.$commandFile);
 }
 
-runCommand('rm -rf var/cache/prod', false);
-runCommand(__DIR__.'/../bin/console --env=prod doctrine:phpcr:init:dbal --drop --force');
-runCommand(__DIR__.'/../bin/console --env=prod doctrine:phpcr:repository:init');
-runCommand(__DIR__.'/../bin/console -v --env=prod doctrine:phpcr:fixtures:load -n');
-runCommand(__DIR__.'/../bin/console --env=prod cache:warmup -n --no-debug');
+$returnValue = null;
+$output = [];
+exec($commandFile.' '.__DIR__.'/../', $output, $returnValue);
+
+if (0 !== (int) $returnValue) {
+    outputNice('Errors on Execution:');
+    outputNice($output);
+    exit($returnValue);
+} else {
+    outputNice($output);
+    outputNice('Success');
+}