Issue LionsAd#38: Restructured drupal_ti_ensure_drupal and sub functi…

…ons for backward compatibility.

environments/drupal-7.sh

@@ -7,11 +7,6 @@ function drupal_ti_download_drupal() {
 }
 
 function drupal_ti_install_drupal() {
-	if [ ! -f install.php ]
-	then
-		return -1
-	fi
-
 	php -d sendmail_path=$(which true) ~/.composer/vendor/bin/drush.php --yes site-install "$DRUPAL_TI_INSTALL_PROFILE" --db-url="$DRUPAL_TI_DB_URL"
 	drush use $(pwd)#default
 }

environments/drupal-8.sh

@@ -9,10 +9,6 @@ function drupal_ti_download_drupal() {
 }
 
 function drupal_ti_install_drupal() {
-	if [ ! -f install.php ]
-	then
-		return -1
-	fi
 	php -d sendmail_path=$(which true) ~/.composer/vendor/bin/drush.php --yes -v site-install "$DRUPAL_TI_INSTALL_PROFILE" --db-url="$DRUPAL_TI_DB_URL"
 	drush use $(pwd)#default
 }

functions/drupal.sh

@@ -3,9 +3,9 @@
 # Common functionality for common tasks.
 
 #
-# Ensures that the right Drupal version exists.
+# Ensures that the right Drupal version is downloaded.
 #
-function drupal_ti_ensure_drupal() {
+function drupal_ti_ensure_drupal_download() {
 	# This function is re-entrant.
 	if [ -d "$DRUPAL_TI_DRUPAL_DIR" ]
 	then
@@ -30,16 +30,24 @@ function drupal_ti_ensure_drupal() {
 }
 
 #
-# Ensures that Drupal is installed.
+# Ensures that the right Drupal version is installed.
 #
-function drupal_ti_ensure_drupal_installed() {
-	drupal_ti_ensure_drupal
+function drupal_ti_ensure_drupal() {
+	# This function is re-entrant.
+	drupal_ti_ensure_drupal_download
+
+	# @todo Maybe use a different check for Drupal installed.
+	if [ -r "$TRAVIS_BUILD_DIR/../drupal_ti-drupal-installed" ]
+	then
+		return
+	fi
 
 	# Create database and install Drupal.
 	mysql -e "create database $DRUPAL_TI_DB"
 
-	cd drupal
+	cd "$DRUPAL_TI_DRUPAL_DIR"
 	drupal_ti_install_drupal
+	touch "$TRAVIS_BUILD_DIR/../drupal_ti-drupal-installed"
 }
 
 #
@@ -91,15 +99,9 @@ function drupal_ti_run_server() {
 
 	# Use hhvm_serve for PHP 5.3 fcgi and hhvm fcgi
 	PHP_VERSION=$(phpenv version-name)
-	if [ "$PHP_VERSION" = "5.3" -o "$PHP_VERSION" = "hhvm" ]
-	then
-		export GOPATH="$DRUPAL_TI_DIST_DIR/go"
-		export DRUPAL_TI_WEBSERVER_HOST=$(echo "$DRUPAL_TI_WEBSERVER_URL" | sed 's,http://,,')
-		{ "$GOPATH/bin/hhvm-serve" -listen="$DRUPAL_TI_WEBSERVER_HOST:$DRUPAL_TI_WEBSERVER_PORT" 2>&1 | drupal_ti_log_output "webserver" ; } &
-	else
-		# start a web server on port 8080, run in the background; wait for initialization
-		{ drush runserver "$DRUPAL_TI_WEBSERVER_URL:$DRUPAL_TI_WEBSERVER_PORT" 2>&1 | drupal_ti_log_output "webserver" ; } &
-	fi
+	export DRUPAL_TI_WEBSERVER_HOST=$(echo "$DRUPAL_TI_WEBSERVER_URL" | sed 's,http://,,')
+    export GOPATH="$DRUPAL_TI_DIST_DIR/go"
+    { "$GOPATH/bin/hhvm-serve" -listen="$DRUPAL_TI_WEBSERVER_HOST:$DRUPAL_TI_WEBSERVER_PORT" 2>&1 | drupal_ti_log_output "webserver" ; } &
 
 	# Wait until drush server has been started.
 	drupal_ti_wait_for_service_port "$DRUPAL_TI_WEBSERVER_PORT"
@@ -188,6 +190,8 @@ function drupal_ti_ensure_php_for_drush_webserver() {
 		return
 	fi
 
+	drupal_ti_ensure_hhvm_serve
+
 	# install php packages required for running a web server from drush on php 5.3
 	PHP_VERSION=$(phpenv version-name)
 	if [ "$PHP_VERSION" != "5.3" -a "$PHP_VERSION" != "hhvm" ]
@@ -201,7 +205,6 @@ function drupal_ti_ensure_php_for_drush_webserver() {
 		drupal_ti_ensure_php_fpm
 	fi
 
-	drupal_ti_ensure_hhvm_serve
 	touch "$TRAVIS_BUILD_DIR/../drupal_ti-php-for-webserver-installed"
 }
 

runners/behat/before_script.sh

@@ -4,7 +4,7 @@
 set -e $DRUPAL_TI_DEBUG
 
 # Ensure the right Drupal version is installed.
-drupal_ti_ensure_drupal_installed
+drupal_ti_ensure_drupal
 
 # Ensure the module is linked into the code base and enabled.
 drupal_ti_ensure_module

runners/phpunit-core/before_script.sh

@@ -4,10 +4,7 @@
 set -e $DRUPAL_TI_DEBUG
 
 # Ensure the right Drupal version is downloaded.
-drupal_ti_ensure_drupal
-
-# Change directory to Drupal core directory.
-cd drupal
+drupal_ti_ensure_drupal_download
 
 # Ensure the module is linked into the code base.
 drupal_ti_ensure_module_linked

runners/simpletest/before_script.sh

@@ -4,7 +4,7 @@
 set -e $DRUPAL_TI_DEBUG
 
 # Ensure the right Drupal version is installed.
-drupal_ti_ensure_drupal_installed
+drupal_ti_ensure_drupal
 
 # Enable simpletest module.
 cd "$DRUPAL_TI_DRUPAL_DIR"