Merge branch 'develop-v4' into master-v4

Author: mbtamuli

README.md

@@ -28,53 +28,50 @@ chmod +x /usr/local/bin/ee
 
 ## Usage
 
-## Basic Commands
+To get started with EasyEngine and create a wordpress site, run
 
-### create
-Runs the site creation.
-
-```bash
-ee site create example.com --wp                 # install wordpress without any page caching
-ee site create example.com --wpredis            # install wordpress + redis caching
-ee site create example.com --wpsubir            # install wpmu-subdirectory without any page caching
-ee site create example.com --wpsubir --wpredis  # install wpmu-subdirectory + redis caching
-ee site create example.com --wpsubdom           # install wpmu-subdomain without any page caching
-ee site create example.com --wpsubdom --wpredis # install wpmu-subdomain + redis caching
+```
+ee site create example.com
 ```
 
-### delete
-Deletes an existing EasyEngine site.
+Need a wordpress site with caching? Try
 
-```bash
-ee site delete example.com
+```
+ee site create example.com --wpredis
 ```
 
-### disable
-Disables a website. It will stop and remove the docker containers of the website if they are running.
+Need a wordpress multi-site with page cache?
+```
+ee site create example.com --wpsubdir --wpredis
+```
 
-```bash
-ee site disable example.com
+Want to play around with your new site?
+```
+ee shell example.com
 ```
 
-### enable
-Enables a website. It will start the docker containers of the website if they are stopped.
+Want to know more? Checkout readme of these commands -
+ * [site command](https://github.com/EasyEngine/site-command/)
+ * [shell command](https://github.com/EasyEngine/shell-command/)
 
-```bash
-ee site enable example.com
-```
+Note: :warning: EasyEngine will currently only run with root privileges. You can run `ee help`, `ee help site` and `ee help site create` to get all the details about the various commands and subcommands that you can run.
 
-### info
-Display all the relevant site information, credentials and useful links.
+## Development
 
-```bash
-ee site info example.com
-```
+Development of easyengine is done entirely on GitHub.
 
-### list
-Lists the created websites.
+We've used [wp-cli](https://github.com/wp-cli/wp-cli/) framework as a base and built EasyEngine on top of it.
 
-```bash
-ee site list
-```
+This repo contains main core of easyengine (the framework). 
+All top level commands(except `ee cli`) i.e. `ee site`, `ee shell` have their own repos.
+
+Currently we have following commands which are bundled by default in EasyEngine:
+
+* [site command](https://github.com/EasyEngine/site-command/)
+* [shell command](https://github.com/EasyEngine/shell-command/)
+
+In future, community will be able to make their own packages and commands!
+
+## Contributing
 
-EasyEngine will currently only run with root privileges. You can run `ee help`, `ee help site` and `ee help site create` to get all the details about the various commands and subcommands that you can run.
+We warmheartedly welcome all contributions however and in whatever capacity you can either through Pull Requests or by reporting Issues. You can contribute here or in any of the above mentioned commands repo.

VERSION

@@ -1 +1 @@
-4.0.0-beta.1
+4.0.0-beta.2

ci/prepare.sh

@@ -2,4 +2,11 @@
 
 # called by Travis CI
 
+if [[ "$TRAVIS_BRANCH" == "develop-v4" ]]; then
+    version=$(head -n 1 VERSION)
+    version="$(echo $version | xargs)"
+    version+="-nightly"
+    echo $version > VERSION
+fi
+
 php -dphar.readonly=0 ./utils/make-phar.php easyengine.phar --quite  > /dev/null

composer.json

@@ -27,7 +27,8 @@
         "php": ">=5.3.29",
         "composer/composer": "^1.2.0",
         "composer/semver": "~1.0",
-        "easyengine/site-command": "dev-master",
+        "easyengine/site-command": "v1.0.0-beta.2",
+        "easyengine/shell-command": "v1.0.0-beta.1",
         "justinrainbow/json-schema": "~5.2.5",
         "monolog/monolog": "^1.23",
         "mustache/mustache": "~2.4",
@@ -48,7 +49,7 @@
         "wp-cli/php-cli-tools": "~0.11.2"
     },
     "require-dev": {
-        "behat/behat": "2.5.*",
+        "behat/behat": "3.4.*",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3",
         "phpunit/phpunit": "3.7.*",
         "roave/security-advisories": "dev-master",