Clean unused code

brainsonic · Jun 28, 2014 · 328e621 · 328e621
1 parent db5602c
commit 328e621
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 192 deletions.
diff --git a/Deployment/Composer/DeploymentListener.php b/Deployment/Composer/DeploymentListener.php
diff --git a/Deployment/WebsitesFileCopyTask.php b/Deployment/WebsitesFileCopyTask.php
diff --git a/...private/websites/app/php/ext/LICENSE_APCU → ...ebsites/app/websites/php/ext/LICENSE_APCU b/...private/websites/app/php/ext/LICENSE_APCU → ...ebsites/app/websites/php/ext/LICENSE_APCU
diff --git a/...websites/app/php/ext/SQLSrv_Driver_Source → ...app/websites/php/ext/SQLSrv_Driver_Source b/...websites/app/php/ext/SQLSrv_Driver_Source → ...app/websites/php/ext/SQLSrv_Driver_Source
diff --git a/...private/websites/app/php/ext/php_apcu.dll → ...ebsites/app/websites/php/ext/php_apcu.dll b/...private/websites/app/php/ext/php_apcu.dll → ...ebsites/app/websites/php/ext/php_apcu.dll
diff --git a/...tes/app/php/ext/php_pdo_sqlsrv_55_nts.dll → ...ebsites/php/ext/php_pdo_sqlsrv_55_nts.dll b/...tes/app/php/ext/php_pdo_sqlsrv_55_nts.dll → ...ebsites/php/ext/php_pdo_sqlsrv_55_nts.dll
diff --git a/...ebsites/app/php/ext/php_sqlsrv_55_nts.dll → ...pp/websites/php/ext/php_sqlsrv_55_nts.dll b/...ebsites/app/php/ext/php_sqlsrv_55_nts.dll → ...pp/websites/php/ext/php_sqlsrv_55_nts.dll
diff --git a/Resources/private/websites/app/php/php.ini → ...private/websites/app/websites/php/php.ini b/Resources/private/websites/app/php/php.ini → ...private/websites/app/websites/php/php.ini
diff --git a/Resources/private/websites/deploy.sh b/Resources/private/websites/deploy.sh
@@ -25,18 +25,6 @@ echo Validating prerequisites
 hash node 2>/dev/null
 exitWithMessageOnError "Missing node.js executable, please install node.js, if already installed make sure it can be reached from current environment."
 
-# Check composer is there
-if [ ! -f composer.phar ];
-then
-  echo "Downloading Composer"
-  curl -sS https://getcomposer.org/installer | php -- --quiet
-  exitWithMessageOnError "Composer download failed"
-else
-  echo "Updating Composer"
-  php composer.phar self-update
-  exitWithMessageOnError "Composer self-update failed"
-fi
-
 # Setup
 # -----
 echo Setup env variables
@@ -85,16 +73,39 @@ fi
 # ----------
 echo Initializing PHP
 
-export PHP_INI_SCAN_DIR=$DEPLOYMENT_SOURCE/app/website/php
-export PHP_BASE_CUSTOM_EXTENSIONS_DIR=$DEPLOYMENT_SOURCE/app/website/php/ext
+export PHP_INI_SCAN_DIR=$DEPLOYMENT_SOURCE/app/websites/php
+export PHP_BASE_CUSTOM_EXTENSIONS_DIR=$DEPLOYMENT_SOURCE/app/websites/php/ext
 
 echo Initializing Symfony project
-export SYMFONY_ENV=prod
+export SYMFONY_ENV=azure
 
 cd "$DEPLOYMENT_SOURCE"
-# Invoke Composer, but without the scripts section because subprocesses don't have the correct user and permissions
-php composer.phar install --prefer-dist -v --optimize-autoloader --no-dev --no-interaction
-exitWithMessageOnError "Composer install failed"
+# Run composer install only if there is a difference between the new composer.lock and the previous one
+diff composer.lock "$DEPLOYMENT_TARGET/composer.lock"
+
+if [ ! $? -eq 0 ]; then
+  # Check composer is there
+  if [ ! -f composer.phar ];
+  then
+    echo "Downloading Composer"
+    curl -sS https://getcomposer.org/installer | php -- --quiet
+    exitWithMessageOnError "Composer download failed"
+  else
+    echo "Updating Composer"
+    php composer.phar self-update
+    exitWithMessageOnError "Composer self-update failed"
+  fi
+
+  php composer.phar install --prefer-dist -v --no-interaction --optimize-autoloader
+  exitWithMessageOnError "Composer install failed"
+else
+  echo No need to run composer install
+  php app/console cache:clear
+
+  php app/console assets:install web
+fi
+
+php app/console assetic:dump
 
 # 1. KuduSync
 if [[ "$IN_PLACE_DEPLOYMENT" -ne "1" ]]; then
@@ -114,7 +125,7 @@ if [[ -n "$POST_DEPLOYMENT_ACTION" ]]; then
   exitWithMessageOnError "post deployment action failed"
 fi
 
-echo "Clearing Production cache by deleting $TEMP/cache/prod"
-rm -Rf "$TEMP/cache/prod"
+echo "Clearing Production cache by deleting $TEMP/cache/azure"
+rm -Rf "$TEMP/cache/azure"
 
-echo "Finished successfully."
+echo "Finished successfully."
diff --git a/Tests/Deployment/ComposerDeploymentListenerTest.php b/Tests/Deployment/ComposerDeploymentListenerTest.php
diff --git a/composer.json b/composer.json
@@ -1,25 +1,35 @@
 {
-    "name": "brainsonic/azure-distribution-bundle",
-    "description": "Integration of Windows Azure SDK and workflows into Symfony applications.",
-    "license": "MIT",
-    "type": "symfony-bundle",
-    "authors": [
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Stéphane Escandell", "email": "stephane.escandell@gmail.com"}
-    ],
-    "require": {
-        "symfony/symfony": "~2.3",
-        "microsoft/windowsazure": "0.4.*"
-    },
-    "repositories": [
-        {
-            "type": "pear",
-            "url": "http://pear.php.net"
-        }
-    ],
-    "autoload": {
-        "psr-0": { "WindowsAzure\\DistributionBundle":"" }
-    },
-    "target-dir": "WindowsAzure/DistributionBundle"
-}
-
+	"name" : "brainsonic/azure-distribution-bundle",
+	"description" : "Integration of Windows Azure SDK and workflows into Symfony applications.",
+	"license" : "MIT",
+	"type" : "symfony-bundle",
+	"authors" : [{
+			"name" : "Benjamin Eberlei",
+			"email" : "kontakt@beberlei.de"
+		}, {
+			"name" : "Stéphane Escandell",
+			"email" : "stephane.escandell@gmail.com"
+		}
+	],
+	"require" : {
+		"symfony/symfony" : "~2.3",
+		"microsoft/windowsazure" : "dev-dev@dev",
+		"pear-pear.php.net/http_request2" : "*",
+		"pear-pear.php.net/mail_mime" : "*",
+		"pear-pear.php.net/mail_mimedecode" : "*"
+	},
+	"require-dev": {
+	    "phpunit/phpunit": "4.1.*"
+	},
+	"repositories" : [{
+			"type" : "pear",
+			"url" : "http://pear.php.net"
+		}
+	],
+	"autoload" : {
+		"psr-0" : {
+			"WindowsAzure\\DistributionBundle" : ""
+		}
+	},
+	"target-dir" : "WindowsAzure/DistributionBundle"
+}