Merge branch 'develop-v4' into master-v4 for v4.0.0-beta.4

Author: mbtamuli

.github/CONTRIBUTING.md

@@ -10,8 +10,8 @@ Please attach the output of following command when open a new support request.
 
 ```bash
 lsb_release -a
-ee -v
-ee info
+ee cli version
+ee cli info
 wp --allow-root --info
 ```
 

.github/ISSUE_TEMPLATE.md

@@ -4,6 +4,6 @@ If you feel the issue is a EasyEngine core specific issue, please attach the out
 
 System Information
 - [ ] lsb_release -a
-- [ ] ee -v
-- [ ] ee info
+- [ ] ee cli version
+- [ ] ee cli info
 - [ ] wp --allow-root --info

.travis.yml

@@ -18,9 +18,11 @@ before_install:
 
 install:
   - composer install --no-interaction
+  - sudo ./ci/test-env-install.sh
 
 before_script:
   - composer validate
+  - ./vendor/bin/behat
   - ./ci/prepare.sh
 
 jobs:

ci/test-env-install.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+function setup_test_requirements() {
+    # Adding software-properties-common for add-apt-repository.
+    apt-get install -y software-properties-common
+    # Adding ondrej/php repository for installing php, this works for all ubuntu flavours.
+    add-apt-repository -y ppa:ondrej/php
+    apt-get update
+    # Installing php-cli, which is the minimum requirement to run EasyEngine
+    apt-get -y install php7.2-cli
+
+    php_modules=( pcntl curl sqlite3 )
+    if command -v php > /dev/null 2>&1; then
+      # Reading the php version.
+      default_php_version="$(readlink -f /usr/bin/php | gawk -F "php" '{ print $2}')"
+      for module in "${php_modules[@]}"; do
+        if ! php -m | grep $module >> $LOG_FILE 2>&1; then
+          echo "$module not installed. Installing..."
+          apt install -y php$default_php_version-$module
+        else
+          echo "$module is already installed"
+        fi
+      done
+    fi
+}
+
+setup_test_requirements

composer.json

@@ -27,7 +27,8 @@
         "php": ">=5.3.29",
         "composer/composer": "^1.2.0",
         "composer/semver": "~1.0",
-        "easyengine/site-command": "v1.0.0-beta.3",
+        "easyengine/cron-command": "v1.0.0-beta.1",
+        "easyengine/site-command": "v1.0.0",
         "easyengine/shell-command": "v1.0.0-beta.1",
         "justinrainbow/json-schema": "~5.2.5",
         "monolog/monolog": "^1.23",

composer.lock

@@ -7,8 +7,7 @@
 use Behat\Behat\Hook\Scope\AfterFeatureScope;
 
 
-use Behat\Gherkin\Node\PyStringNode,
-	Behat\Gherkin\Node\TableNode;
+use Behat\Gherkin\Node\PyStringNode;
 
 class FeatureContext implements Context
 {
@@ -94,88 +93,23 @@ public function stdoutShouldReturnSomethingLike($output_stream, PyStringNode $ex
 	}
 
 	/**
-	 * @Then The :site db entry should be removed
+	 * @Then ee should be deleted
 	 */
-	public function theDbEntryShouldBeRemoved($site)
+	public function eeShouldBeDeleted()
 	{
-		$out = shell_exec("sudo bin/ee site list");
-		if (strpos($out, $site) !== false) {
-			throw new Exception("$site db entry not been removed!");
+		$result = EE::launch("docker ps -aqf label=org.label-schema.vendor=\"EasyEngine\" | wc -l", false, true);
+		if( trim($result->stdout) !== '0' ) {
+			throw new Exception("All containers have not been removed.");
 		}
-
-	}
-
-	/**
-	 * @Then The :site webroot should be removed
-	 */
-	public function theWebrootShouldBeRemoved($site)
-	{
-		if (file_exists(getenv('HOME') . "/ee-sites/" . $site)) {
-			throw new Exception("Webroot has not been removed!");
+		$home = getenv('HOME');
+		if(file_exists("$home/.ee/")){
+			throw new Exception("~/.ee/ has not been removed");
 		}
-	}
-
-	/**
-	 * @Then Following containers of site :site should be removed:
-	 */
-	public function followingContainersOfSiteShouldBeRemoved($site, TableNode $table)
-	{
-		$containers = $table->getHash();
-		$site_name = implode(explode('.', $site));
-
-		foreach ($containers as $container) {
-
-			$sevice = $container['container'];
-			$container_name = $site_name . '_' . $sevice . '_1';
-
-			exec("docker inspect -f '{{.State.Running}}' $container_name > /dev/null 2>&1", $exec_out, $return);
-			if (!$return) {
-				throw new Exception("$container_name has not been removed!");
-			}
+		if(file_exists("$home/ee-sites/")){
+			throw new Exception("~/ee-sites/ has not been removed");
 		}
-	}
-
-	/**
-	 * @Then The site :site should have webroot
-	 */
-	public function theSiteShouldHaveWebroot($site)
-	{
-		if (!file_exists(getenv('HOME') . "/ee-sites/" . $site)) {
-			throw new Exception("Webroot has not been created!");
-		}
-	}
-
-	/**
-	 * @Then The site :site should have WordPress
-	 */
-	public function theSiteShouldHaveWordpress($site)
-	{
-		if (!file_exists(getenv('HOME') . "/ee-sites/" . $site . "/app/src/wp-config.php")) {
-			throw new Exception("WordPress data not found!");
-		}
-	}
-
-	/**
-	 * @Then Request on :site should contain following headers:
-	 */
-	public function requestOnShouldContainFollowingHeaders($site, TableNode $table)
-	{
-		$url = 'http://' . $site;
-
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_HEADER, true);
-		curl_setopt($ch, CURLOPT_NOBODY, true);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		$headers = curl_exec($ch);
-		curl_close($ch);
-
-		$rows = $table->getHash();
-
-		foreach ($rows as $row) {
-			if (strpos($headers, $row['header']) === false) {
-				throw new Exception("Unable to find " . $row['header'] . "\nActual output is : " . $headers);
-			}
+		if(file_exists('/opt/easyengine/')){
+			throw new Exception("/opt/easyengine/ has not been removed");
 		}
 	}
 
@@ -184,7 +118,6 @@ public function requestOnShouldContainFollowingHeaders($site, TableNode $table)
 	 */
 	public static function cleanup(AfterFeatureScope $scope)
 	{
-		exec("sudo bin/ee site delete hello.test");
 		if(file_exists('ee.phar')) {
 			unlink('ee.phar');
 		}

features/bootstrap/FeatureContext.php

@@ -13,4 +13,8 @@ Feature: CLI Command
   Scenario: ee update works properly
     Given ee phar is generated
     When I run 'sudo php ee.phar cli update --yes'
-    Then return value should be 0
+    Then return value should be 0
+
+  Scenario: ee uninstall works properly
+    When I run 'sudo bin/ee cli self-uninstall --yes'
+    Then ee should be deleted