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

Fix issues with deployer REPO_URL and SLACK_HOOK_URL
CottaCush · Sep 16, 2016 · c6ffc1d · c6ffc1d
2 parents cf4e2d6 + cf1ad20
commit c6ffc1d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+#### 1.3.1
+
+* Fix issues with deployer REPO_URL and SLACK_HOOK_URL *2016-09-16*
+
+
 #### 1.3.0
 
 * Fix issues with deployer script *2016-09-16*

diff --git a/composer.json b/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.3.0",
+    "version": "1.3.1",
     "type": "project",
     "license": "MIT",
     "minimum-stability": "stable",

diff --git a/deploy.php b/deploy.php
@@ -12,12 +12,10 @@
 set('shared', ['app/runtime']);
 
 // TODO Add repository url for project
-set('repository', env('REPO_URL'));
+set('repository', '');
 
 env('composer_options', 'install --prefer-dist --optimize-autoloader --no-progress --no-interaction');
 
-$slackHookUrl = env('SLACK_HOOK_URL');
-
 /**
  * Run migrations
  */
@@ -98,15 +96,19 @@
 
 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'));
+    $slackHookUrl = env('SLACK_HOOK_URL');
+    if (!empty($slackHookUrl)) {
+        runLocally('curl -s -S -X POST --data-urlencode payload="{\"channel\": \"#' . env('SLACK_CHANNEL_NAME') .
+            '\", \"username\": \"Release Bot\", \"text\": \"' . $message . '\"}"' . env('SLACK_HOOK_URL'));
+    } else {
+        write('Configure the SLACK_HOOK_URL to post to slack');
+    }
 }
 
 /**
  * Post to slack if the slack hook URL is not empty
  */
-if (!empty($slackHookUrl)) {
-    before('deploy:run_migrations', 'slack:before_migrate');
-    after('deploy:run_migrations', 'slack:after_migrate');
-    before('deploy', 'slack:before_deploy');
-    after('deploy', 'slack:after_deploy');
-}
+before('deploy:run_migrations', 'slack:before_migrate');
+after('deploy:run_migrations', 'slack:after_migrate');
+before('deploy', 'slack:before_deploy');
+after('deploy', 'slack:after_deploy');
diff --git a/deploy/servers.sample.yml b/deploy/servers.sample.yml
@@ -17,6 +17,5 @@ staging:
     DB_USERNAME: "root"
     DB_PASSWORD: ""
     APPLICATION_ENV: "staging"
-    REPO_URL: ""
     SLACK_HOOK_URL: ""
     SLACK_CHANNEL_NAME: ""