Merge branch 'master' into release

* master: (60 commits)
  Updated CHANGELOG
  Fixes #257 - Touch files when extracting to prevent warnings about timestamps
  Update README.md
  Added a note about a common error
  Updated ioredis
  Updated google2fa library
  Fixes #254
  Fixes #256 - Git tag names causing a fatal error if they are not valid version string
  Fixed gulpfile so that assets don't get removed before they are versioned
  Updated dependencies
  Updated dependencies
  Priority WS for optimal transport browser (#250)
  Ignore suggestions when installing Composer deps (#252)
  Fix style issue
  Revert "[Snyk Alert] Fix for 2 vulnerable dependency paths" (#245)
  fix: package.json & .snyk to reduce vulnerabilities (#244)
  Handling the timeout checking for an update on github, i.e. when I am at work behind a proxy
  Added a check to the updatre script to ensure npm install has been run
  Update dialog.blade.php (#239)
  Silence PHPMD
  ...

Author: REBELinBLUE

.bowerrc

@@ -7,7 +7,7 @@
 .vagrant
 phpunit.xml
 _ide_helper.php
-_ide_helper_models.php
+.phpstorm.meta.php
 
 # Composer files
 composer.phar
@@ -16,3 +16,4 @@ auth.json
 # Dependencies
 node_modules
 vendor
+bower_components

.gitignore

@@ -1,7 +1,37 @@
 # Change Log
 
-## [0.0.37](https://github.com/REBELinBLUE/deployer/tree/0.0.37) (2016-05-30)
-[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.35...0.0.37)
+## [0.0.37](https://github.com/REBELinBLUE/deployer/tree/0.0.37) (2016-08-06)
+[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.36...0.0.37)
+
+**Implemented enhancements:**
+
+- Update the log when viewing it [\#232](https://github.com/REBELinBLUE/deployer/issues/232)
+- \[IMPROVEMENT\] Ignore suggestions when installing Composer deps [\#252](https://github.com/REBELinBLUE/deployer/pull/252) ([jbrooksuk](https://github.com/jbrooksuk))
+- \[IMPROVEMENT\] Priority WS for optimal transport browser [\#250](https://github.com/REBELinBLUE/deployer/pull/250) ([denji](https://github.com/denji))
+
+**Fixed bugs:**
+
+- Options don't exist on all versions of tar [\#257](https://github.com/REBELinBLUE/deployer/issues/257)
+- Fatal error if git tags contain a string which is not a valid version [\#256](https://github.com/REBELinBLUE/deployer/issues/256)
+- Installer should check for node or nodejs [\#230](https://github.com/REBELinBLUE/deployer/issues/230)
+- Installer gets into an infinite loop if there are PDO drivers loaded before MySQL [\#254](https://github.com/REBELinBLUE/deployer/pull/254) ([moxx](https://github.com/moxx))
+- \*\*\[FIX\]\*\* Incorrect Lang variables [\#239](https://github.com/REBELinBLUE/deployer/pull/239) ([uLow](https://github.com/uLow))
+
+**Closed issues:**
+
+- Acting strange [\#233](https://github.com/REBELinBLUE/deployer/issues/233)
+- Custom deployment templates [\#174](https://github.com/REBELinBLUE/deployer/issues/174)
+
+**Merged pull requests:**
+
+- Possible fix for toJS issue in NavButtons [\#249](https://github.com/REBELinBLUE/deployer/pull/249) ([tizz66](https://github.com/tizz66))
+- Make spin a boolean prop of Icon instead of passing classname [\#247](https://github.com/REBELinBLUE/deployer/pull/247) ([tizz66](https://github.com/tizz66))
+- Fixes an error thrown by timeline component if there's no timeline data [\#246](https://github.com/REBELinBLUE/deployer/pull/246) ([tizz66](https://github.com/tizz66))
+- Refactors dashboard timeline and adds associated components [\#243](https://github.com/REBELinBLUE/deployer/pull/243) ([tizz66](https://github.com/tizz66))
+- Box component [\#241](https://github.com/REBELinBLUE/deployer/pull/241) ([tizz66](https://github.com/tizz66))
+
+## [0.0.36](https://github.com/REBELinBLUE/deployer/tree/0.0.36) (2016-05-30)
+[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.35...0.0.36)
 
 **Fixed bugs:**
 

CHANGELOG.md

@@ -42,19 +42,46 @@ Check out the [releases](https://github.com/REBELinBLUE/deployer/releases), [lic
 
 The `master` branch of this repository is a development branch and **should not** be used in production. Changes are merged into the `release` branch when they are considered stable and may then be tagged for release at any time. It is recommended that you use the latest tag [release](https://github.com/REBELinBLUE/deployer/releases) for production. For information on contributing see [contribution guidelines](/.github/CONTRIBUTING.md).
 
+### Common Error
+
+If you see an error like the following in the logs
+
+```
+'ErrorException' with message 'file_get_contents(/var/www/deployer/public/build/rev-manifest.json): failed to open stream: No such file or directory' in /var/www/deployer/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php:343
+```
+
+or the following on the page
+
+```
+ErrorException (E_ERROR) file_get_contents(/var/www/deployer/public/build/rev-manifest.json): failed to open stream: No such file or directory
+```
+
+it means you are not using a production build. You either need to checkout the `release` branch or a specific release, or install the additional development dependencies
+
+```shell
+$ composer install
+$ npm install
+```
+
+and then build the assets
+
+```shell
+$ gulp
+```
+
 ## Requirements
 
 - [PHP](http://www.php.net) 5.5.9+ or newer
 - A database, either [MySQL](https://www.mysql.com) or [PostgreSQL](http://www.postgresql.org) are recommended but [SQLite](https://www.sqlite.org) can be used
 - [Composer](https://getcomposer.org)
 - [Redis](http://redis.io)
 - [Node.js](https://nodejs.org/)
-- A suitable [queue](http://laravel.com/docs/5.1/queues) for Laravel, [Beanstalkd](http://kr.github.io/beanstalkd/) is recommended but Redis can also be used
+- [Beanstalkd](http://kr.github.io/beanstalkd/) for queuing jobs. Although Laravel can use redis there is currently [an issue when using more than 1 queue worker](https://github.com/laravel/framework/issues/8577), the default in Deployer is 3.
 
 ### Optional extras
 
 - [Supervisor](http://supervisord.org) to keep the queue listener and Node.js socket server running
-- A [caching server](http://laravel.com/docs/5.1/cache), unless you expect a lot of traffic the default `file` cache is probably enough
+- A [caching server](http://laravel.com/docs/5.2/cache), unless you expect a lot of traffic the default `file` cache is probably enough
 
 ## Installation
 
@@ -67,7 +94,7 @@ $ git clone https://github.com/REBELinBLUE/deployer.git
 2. Checkout the latest release
 
 ```shell
-$ git checkout 0.0.36
+$ git checkout 0.0.37
 ```
 
 3. Install dependencies
@@ -108,7 +135,7 @@ $ editor .env
 
 ```shell
 $ git fetch --all
-$ git checkout 0.0.36
+$ git checkout 0.0.37
  ```
 
 2. Update the dependencies

README.md

@@ -1 +1 @@
-0.0.37
+0.0.38-dev

VERSION

@@ -14,9 +14,8 @@ class ConfigureLogging extends BaseLoggingConfiguration
     /**
      * Configure the Monolog handlers for the application.
      *
-     * @param  \Illuminate\Contracts\Foundation\Application $app
-     * @param  \Illuminate\Log\Writer                       $log
-     * @return void
+     * @param Application $app
+     * @param Writer $log
      */
     protected function configureSingleHandler(Application $app, Writer $log)
     {
@@ -27,9 +26,8 @@ protected function configureSingleHandler(Application $app, Writer $log)
     /**
      * Configure the Monolog handlers for the application.
      *
-     * @param  \Illuminate\Contracts\Foundation\Application $app
-     * @param  \Illuminate\Log\Writer                       $log
-     * @return void
+     * @param Application $app
+     * @param Writer $log
      */
     protected function configureDailyHandler(Application $app, Writer $log)
     {

app/Bootstrap/ConfigureLogging.php

@@ -10,7 +10,19 @@
 use REBELinBLUE\Deployer\Traits\BroadcastChanges;
 
 /**
- * The application's  url store for health check.
+ * The application's url store for health check.
+ *
+ * @property integer $id
+ * @property string $title
+ * @property string $url
+ * @property integer $project_id
+ * @property integer $period
+ * @property boolean $is_report
+ * @property boolean $last_status
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $deleted_at
+ * @property-read Project $project
  */
 class CheckUrl extends Model
 {
@@ -44,8 +56,7 @@ class CheckUrl extends Model
 
     /**
      * Override the boot method to bind model event listeners.
-     *
-     * @return void
+     * @dispatches RequestProjectCheckUrl
      */
     public static function boot()
     {
@@ -62,8 +73,7 @@ public static function boot()
     /**
      * Define a mutator to set the status to untested if the URL changes.
      *
-     * @param  string $value
-     * @return void
+     * @param string $value
      */
     public function setUrlAttribute($value)
     {
@@ -77,7 +87,7 @@ public function setUrlAttribute($value)
     /**
      * Belongs to relationship.
      *
-     * @return Project
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function project()
     {

app/CheckUrl.php

@@ -8,6 +8,21 @@
 
 /**
  * The command model.
+ *
+ * @property integer $id
+ * @property string $name
+ * @property string $user
+ * @property string $script
+ * @property integer $project_id
+ * @property integer $step
+ * @property integer $order
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ * @property string $deleted_at
+ * @property boolean $optional
+ * @property boolean $default_on
+ * @property-read Project $project
+ * @property-read Server[] $servers
  */
 class Command extends Model
 {
@@ -57,7 +72,7 @@ class Command extends Model
     /**
      * Belongs to relationship.
      *
-     * @return Project
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function project()
     {
@@ -67,7 +82,7 @@ public function project()
     /**
      * Belongs to many relationship.
      *
-     * @return Server
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function servers()
     {

app/Command.php

@@ -13,8 +13,7 @@ class ActiveUserComposer
     /**
      * Sets the logged in user into a view variable.
      *
-     * @param  \Illuminate\Contracts\View\View $view
-     * @return void
+     * @param View $view
      */
     public function compose(View $view)
     {

app/Composers/ActiveUserComposer.php

@@ -10,12 +10,15 @@
  */
 class HeaderComposer
 {
+    /**
+     * @var DeploymentRepositoryInterface
+     */
     private $deploymentRepository;
 
     /**
-     * Class constructor.
+     * HeaderComposer constructor.
      *
-     * @param DeploymentRepositoryInterface $user
+     * @param DeploymentRepositoryInterface $deploymentRepository
      */
     public function __construct(DeploymentRepositoryInterface $deploymentRepository)
     {
@@ -25,8 +28,7 @@ public function __construct(DeploymentRepositoryInterface $deploymentRepository)
     /**
      * Generates the pending and deploying projects for the view.
      *
-     * @param  \Illuminate\Contracts\View\View $view
-     * @return void
+     * @param View $view
      */
     public function compose(View $view)
     {

app/Composers/HeaderComposer.php

@@ -10,12 +10,15 @@
  */
 class NavigationComposer
 {
+    /**
+     * @var GroupRepositoryInterface
+     */
     private $groupRepository;
 
     /**
-     * Class constructor.
+     * NavigationComposer constructor.
      *
-     * @param DeploymentRepositoryInterface $user
+     * @param GroupRepositoryInterface $groupRepository
      */
     public function __construct(GroupRepositoryInterface $groupRepository)
     {
@@ -25,8 +28,7 @@ public function __construct(GroupRepositoryInterface $groupRepository)
     /**
      * Generates the group listing for the view.
      *
-     * @param  \Illuminate\Contracts\View\View $view
-     * @return void
+     * @param View $view
      */
     public function compose(View $view)
     {

app/Composers/NavigationComposer.php

@@ -13,8 +13,7 @@ class ThemeComposer
     /**
      * Generates the pending and deploying projects for the view.
      *
-     * @param  \Illuminate\Contracts\View\View $view
-     * @return void
+     * @param View $view
      */
     public function compose(View $view)
     {

app/Composers/ThemeComposer.php

@@ -11,10 +11,13 @@
  */
 class VersionComposer
 {
+    /**
+     * @var LatestReleaseInterface
+     */
     private $release;
 
     /**
-     * Class constructor.
+     * VersionComposer constructor.
      *
      * @param LatestReleaseInterface $release
      */
@@ -26,8 +29,7 @@ public function __construct(LatestReleaseInterface $release)
     /**
      * Determines if the update prompt should show.
      *
-     * @param  \Illuminate\Contracts\View\View $view
-     * @return void
+     * @param View $view
      */
     public function compose(View $view)
     {

app/Composers/VersionComposer.php

@@ -25,21 +25,11 @@ class CheckHeartbeats extends Command
      * @var string
      */
     protected $description = 'Checks that any expected heartbeats have checked-in';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
+    
     /**
      * Execute the console command.
      *
-     * @return mixed
+     * @fires HeartbeatMissed
      */
     public function handle()
     {