Merge pull request #3 from CottaCush/fixes/deployer-update

Deployer updates, added yii2-utils and other bug fixes

Author: goke-epapa

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+#### 1.3.0
+
+* Fix issues with deployer script *2016-09-16*
+* Add yii2 composer config task *2016-09-16*
+* Create sample server.yml for deployer *2016-09-16*
+* Remove deploy settings from env file *2016-09-16*
+* Add yii2-utils as composer dependency *2016-09-16*
+
+
 #### 1.2.1
 
 * Fix issue with postCreateProject directories in composer.json *2016-07-23*

app/env/.env.sample

@@ -11,9 +11,4 @@ SMTP_PASSWORD=""
 DB_HOST=""
 DB_USERNAME=""
 DB_PASSWORD=""
-DB_NAME=""
-
-# Deploy Settings
-REPO_URL=""
-SLACK_HOOK_URL=""
-SLACK_CHANNEL_NAME=""
+DB_NAME=""

composer.json

@@ -2,7 +2,7 @@
     "name": "cottacush/yii2-base-project",
     "description": "A Yii 2 Base Project Template",
     "keywords": ["yii2", "framework", "basic", "project template", "improved"],
-    "version": "1.2.1",
+    "version": "1.3.0",
     "type": "project",
     "license": "MIT",
     "minimum-stability": "stable",
@@ -26,10 +26,12 @@
         "phpmd/phpmd" : "@stable",
         "sebastian/phpcpd": "*",
         "theseer/phpdox": "*",
-        "phpunit/phpunit": "4.8"
+        "phpunit/phpunit": "4.8",
+        "cottacush/yii2-utils": "~1.0.0"
     },
     "config": {
-        "process-timeout": 1800
+        "process-timeout": 1800,
+        "discard-changes" : true
     },
     "scripts": {
         "post-create-project-cmd": [

deploy.php

@@ -8,9 +8,15 @@
 
 serverList('deploy/servers.yml');
 
-set('writable_dirs', ['runtime', 'web/assets']);
+set('writable_dirs', ['app/runtime', 'app/web/assets']);
+set('shared', ['app/runtime']);
 
-env('composer_options', 'install --verbose --prefer-dist --optimize-autoloader --no-progress --no-interaction');
+// TODO Add repository url for project
+set('repository', env('REPO_URL'));
+
+env('composer_options', 'install --prefer-dist --optimize-autoloader --no-progress --no-interaction');
+
+$slackHookUrl = env('SLACK_HOOK_URL');
 
 /**
  * Run migrations
@@ -45,7 +51,14 @@
  * Upload env file
  */
 task('deploy:upload_environments_file', function () {
-    upload(env('local_path') . '/env/.env.{{APPLICATION_ENV}}', '{{release_path}}/env/.env');
+    upload(__DIR__ . '/app/env/.env.{{APPLICATION_ENV}}', '{{release_path}}/app/env/.env');
+});
+
+/** Yii2 composer setup */
+task('deploy:yii2_composer_config', function () {
+    // TODO Replace <GITHUB_TOKEN> with valid github token
+    run('composer config -g github-oauth.github.com <GITHUB_TOKEN>');
+    run('composer global require "fxp/composer-asset-plugin:~1.1.1"');
 });
 
 /** Slack Tasks Begin */
@@ -74,6 +87,7 @@
     'deploy:release',
     'deploy:update_code',
     'deploy:shared',
+    'deploy:yii2_composer_config',
     'deploy:vendors',
     'deploy:upload_environments_file',
     'deploy:run_migrations',
@@ -82,9 +96,6 @@
     'deploy:cleanup',
 ])->desc('Deploy Project');
 
-$repositoryUrl = env('REPO_URL');
-set('repository', $repositoryUrl);
-
 function postToSlack($message)
 {
     runLocally('curl -s -S -X POST --data-urlencode payload="{\"channel\": \"#' . env('SLACK_CHANNEL_NAME') . '\", \"username\": \"Release Bot\", \"text\": \"' . $message . '\"}"' . env('SLACK_HOOK_URL'));

deploy/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!.env.sample

deploy/servers.sample.yml

@@ -0,0 +1,22 @@
+# deploy/servers.yml
+# Create a copy of this file as servers.yml and replace the values appropriately
+
+# This is the staging stage, you can add more stages
+staging:
+    host:   <server_host>
+    user:   demo_user
+    stage:  development
+    identity_file:
+        public_key:  "~/.ssh/id_rsa.pub"
+        private_key: "~/.ssh/id_rsa.pem"
+        password: "key-password"
+    deploy_path:   "/var/www/html/yii2-base-project"
+    branch:        develop
+    DB_HOST: "localhost"
+    DB_NAME: "yii2_base"
+    DB_USERNAME: "root"
+    DB_PASSWORD: ""
+    APPLICATION_ENV: "staging"
+    REPO_URL: ""
+    SLACK_HOOK_URL: ""
+    SLACK_CHANNEL_NAME: ""