Merge branch 'master' into release

* master: (42 commits)
  Updated CHANGELOG
  Fixes #273 by not copying the shared folder/file from the release if it has already been copied
  Re-added postgres env
  Testing only 1 env
  Test
  Test
  Changed cat command for travis
  Fix code climate issues
  Changed build image
  Fixes #275 by checking that the --no-suggest option exists before attempting to use it
  Fixes #276 - Allows the passphrase for the private key to be set
  Fixed missing reason of rollback (#270)
  Updated dependencies
  Updated dependencies
  Update README.md
  Update README.md
  Update README.md
  Update README.md
  Last chance
  Setting a random JWT
  ...

Author: REBELinBLUE

.env.example

@@ -15,6 +15,7 @@ SOCKET_PORT=6001
 SOCKET_SSL_KEY_FILE=
 SOCKET_SSL_CERT_FILE=
 SOCKET_SSL_CA_FILE=
+SOCKET_SSL_KEY_PASSPHRASE=
 
 DB_TYPE=mysql
 DB_HOST=localhost

.github/CONTRIBUTING.md

@@ -30,7 +30,7 @@ PHPDoc blocks can be checked with
 
 ### Automated testing
 
-Coding standards are checked using [StyleCI](http://styleci.io); mess, duplication, PHPDoc blocks and PHP syntax are checked using [PHPCI](https://www.phptesting.org)
+Coding standards are checked using [StyleCI](https://styleci.io/repos/33559148); mess, duplication, PHPDoc blocks and PHP syntax are checked using [TravisCI](https://travis-ci.org/REBELinBLUE/deployer)
 
 ## .editorconfig
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,7 +5,7 @@ Please prefix your pull request with one of the following: **[FEATURE]** **[FIX]
 - [ ] I have read and understood the [contributing guidelines](https://github.com/REBElinBLUE/deployer/.github/CONTRIBUTING.md)?
 - [ ] I have checked that another pull request for this purpose does not exist.
 - [ ] I have considered, and confirmed that this submission will be valuable to others.
-- [ ] Do the PHPCI tests pass?
+- [ ] Do the TravisCI tests pass?
 - [ ] Does the StyleCI test pass?
 
 _NOTE: The last 2 are not required to open a PR and can be done afterwards /

.phpci.yml

@@ -12,39 +12,54 @@ cache:
     - $HOME/.composer/cache
 
 services:
+  - mysql
   - postgresql
   - redis-server
 
 addons:
   postgresql: "9.3"
+  mariadb: "10.1"
 
 before_install:
-  - if [[ $TRAVIS_PHP_VERSION != 7.1 ]] ; then phpenv config-rm xdebug.ini; fi
+  - if [[ $TRAVIS_PHP_VERSION == 5.6 ]] ; then phpenv config-rm xdebug.ini; fi
   - curl -L https://github.com/kr/beanstalkd/archive/v1.9.tar.gz | tar xz -C /tmp
   - cd /tmp/beanstalkd-1.9/
   - make
-  - ./beanstalkd &
+  - ./beanstalkd 2>&1 >/dev/null &
   - cd $TRAVIS_BUILD_DIR
 
 install:
   - composer install --no-interaction --no-scripts --prefer-dist --no-suggest
 
+env:
+  - DB=mysql DB_USERNAME=travis
+  - DB=pgsql DB_USERNAME=postgres
+#  - DB=sqlite - SQLite is currently broken
+
 before_script:
     - cp .env.example .env
-    - sed -i 's/DB_TYPE=mysql/DB_TYPE=pgsql/g' .env
-    - sed -i 's/DB_USERNAME=deployer/DB_USERNAME=postgres/g' .env
+    - sed -i "s/DB_TYPE=mysql/DB_TYPE=$DB/g" .env
+    - sed -i "s/DB_CONNECTION=mysql/DB_CONNECTION=$DB/g" .env
+    - sed -i "s/DB_USERNAME=deployer/DB_USERNAME=$DB_USERNAME/g" .env
     - sed -i 's/DB_PASSWORD=secret/DB_PASSWORD=/g' .env
     - sed -i 's/SOCKET_SSL_KEY_FILE=//g' .env
     - sed -i 's/SOCKET_SSL_CERT_FILE=//g' .env
     - sed -i 's/SOCKET_SSL_CA_FILE=//g' .env
+    - sed -i 's/SOCKET_SSL_KEY_PASSPHRASE=//g' .env
+    - sed -i 's/REDIS_PASSWORD=null//g' .env
     - sed -i 's/TRUSTED_PROXIES=//g' .env
     - sed -i 's/GITHUB_OAUTH_TOKEN=//g' .env
+    - sed -i "s/JWT_SECRET=changeme/JWT_SECRET=$(date +%s | sha256sum | base64 | head -c 32 ; echo)/g" .env
     - sed -i '/^#/ d' .env
     - sed -i '/^[[:blank:]]*$/d' .env
     - php artisan key:generate
-    - php artisan jwt:generate
+    #- php artisan jwt:generate --force
     - cat .env
-    - psql -c 'CREATE DATABASE deployer;' -U postgres
+    - if [[ "$DB" == "mysql" ]] ; then mysql -e 'CREATE DATABASE deployer;'; fi
+    - if [[ "$DB" == "pgsql" ]] ; then psql -c 'CREATE DATABASE deployer;' -U postgres; fi
+    - if [[ "$DB" == "sqlite" ]] ; then touch $TRAVIS_BUILD_DIR/database/database.sqlite; fi
+    - php artisan optimize
+    - php artisan js-localization:refresh
     - php artisan migrate --seed --env="testing"
     - chmod -R 777 storage/
     - chmod -R 777 bootstrap/
@@ -60,4 +75,5 @@ script:
   - vendor/bin/phpdoccheck --directory=app
 
 after_script:
-  - cat $TRAVIS_BUILD_DIR/storage/logs/*.log
+  - find $TRAVIS_BUILD_DIR/storage/logs/*.log -type f -print -exec cat {} \;
+  - vendor/bin/test-reporter

.travis.yml

@@ -1,12 +1,19 @@
 # Change Log
 
-## [0.0.39](https://github.com/REBELinBLUE/deployer/tree/0.0.39) (2016-09-06)
+## [0.0.39](https://github.com/REBELinBLUE/deployer/tree/0.0.39) (2016-10-23)
 [Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.38...0.0.39)
 
-**Implemented enhancements:**
+**Fixed bugs:**
+
+- node socket.js doesn't work with SSL when key has a passphrase [\#276](https://github.com/REBELinBLUE/deployer/issues/276)
+- Install dev dependencies does not work with older versions of composer due to using a 1.2+ flag [\#275](https://github.com/REBELinBLUE/deployer/issues/275)
+- Persistent Folder creating multiple folders [\#273](https://github.com/REBELinBLUE/deployer/issues/273)
+
+**Merged pull requests:**
 
-- Automatically detect and restart php-fpm [\#238](https://github.com/REBELinBLUE/deployer/pull/238) ([REBELinBLUE](https://github.com/REBELinBLUE))
-- Access control lists/User levels [\#236](https://github.com/REBELinBLUE/deployer/pull/236) ([REBELinBLUE](https://github.com/REBELinBLUE))
+- Fixed missing reason of rollback [\#270](https://github.com/REBELinBLUE/deployer/pull/270) ([phecho](https://github.com/phecho))
+- Added target trait [\#269](https://github.com/REBELinBLUE/deployer/pull/269) ([phecho](https://github.com/phecho))
+- Cleaning up polymorphic relationships \(projects/templates\) [\#265](https://github.com/REBELinBLUE/deployer/pull/265) ([REBELinBLUE](https://github.com/REBELinBLUE))
 
 ## [0.0.38](https://github.com/REBELinBLUE/deployer/tree/0.0.38) (2016-08-21)
 [Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.37...0.0.38)
@@ -16,7 +23,19 @@
 - usort: Array was modified by the user comparison function [\#258](https://github.com/REBELinBLUE/deployer/issues/258)
 
 ## [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)
+[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/blah-blah-blah-blah...0.0.37)
+
+**Fixed bugs:**
+
+- --warning option 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 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))
+
+## [blah-blah-blah-blah](https://github.com/REBELinBLUE/deployer/tree/blah-blah-blah-blah) (2016-08-02)
+[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/test...blah-blah-blah-blah)
+
+## [test](https://github.com/REBELinBLUE/deployer/tree/test) (2016-08-02)
+[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.36...test)
 
 **Implemented enhancements:**
 
@@ -26,10 +45,7 @@
 
 **Fixed bugs:**
 
-- --warning option 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))
 - Incorrect Lang variables [\#239](https://github.com/REBELinBLUE/deployer/pull/239) ([uLow](https://github.com/uLow))
 
 ## [0.0.36](https://github.com/REBELinBLUE/deployer/tree/0.0.36) (2016-05-30)
@@ -113,6 +129,7 @@
 - Remove need for mcrypt [\#183](https://github.com/REBELinBLUE/deployer/issues/183)
 - Have the update process backup the DB [\#177](https://github.com/REBELinBLUE/deployer/issues/177)
 - Re-ordering groups [\#176](https://github.com/REBELinBLUE/deployer/issues/176)
+- Checking if composer exists [\#103](https://github.com/REBELinBLUE/deployer/issues/103)
 - Mirroring repositories locally to deployer [\#129](https://github.com/REBELinBLUE/deployer/pull/129) ([REBELinBLUE](https://github.com/REBELinBLUE))
 - Checking if composer is installed [\#104](https://github.com/REBELinBLUE/deployer/pull/104) ([REBELinBLUE](https://github.com/REBELinBLUE))
 
@@ -420,4 +437,4 @@
 ## [0.0.1](https://github.com/REBELinBLUE/deployer/tree/0.0.1) (2015-04-08)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

CHANGELOG.md

@@ -4,22 +4,22 @@ Deployer is a PHP Application deployment system powered by [Laravel 5.2](http://
 
 Check out the [releases](https://github.com/REBELinBLUE/deployer/releases), [license](/LICENSE.md), [screenshots](/SCREENSHOTS.md), and [contribution guidelines](/.github/CONTRIBUTING.md).
 
-[![Gitter](https://img.shields.io/badge/chat-on%20gitter-green.svg)](https://gitter.im/REBELinBLUE/deployer)
+[![Gitter](https://img.shields.io/badge/chat-on%20gitter-brightgreen.svg?style=flat-square)](https://gitter.im/REBELinBLUE/deployer)
 
 **Current Build Status**
 
-[![StyleCI](https://styleci.io/repos/33559148/shield?style=flat)](https://styleci.io/repos/33559148)
-[![Build Status](https://travis-ci.org/REBELinBLUE/deployer.svg?branch=master)](https://travis-ci.org/REBELinBLUE/deployer)
-[![Build Status](http://ci.rebelinblue.com/build-status/image/3?branch=master&style=flat&label=PHPCI)](http://ci.rebelinblue.com/build-status/view/3?branch=master)
-[![Code Climate](https://codeclimate.com/github/REBELinBLUE/deployer/badges/gpa.svg)](https://codeclimate.com/github/REBELinBLUE/deployer)
-[![Test Coverage](https://codeclimate.com/github/REBELinBLUE/deployer/badges/coverage.svg)](https://codeclimate.com/github/REBELinBLUE/deployer)
-[![SensioLabs Insight](https://img.shields.io/sensiolabs/i/686dd98b-c0e5-465b-8f14-29b1cab47f3b.svg)](https://insight.sensiolabs.com/projects/686dd98b-c0e5-465b-8f14-29b1cab47f3b)
+[![StyleCI](https://styleci.io/repos/33559148/shield?style=flat-square&branch=master)](https://styleci.io/repos/33559148)
+[![Build Status](https://img.shields.io/travis/REBELinBLUE/deployer.svg?style=flat-square&branch=master)](https://travis-ci.org/REBELinBLUE/deployer)
+[![Code Climate](https://img.shields.io/codeclimate/github/REBELinBLUE/deployer.svg?style=flat-square)](https://codeclimate.com/github/REBELinBLUE/deployer)
+[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/REBELinBLUE/deployer.svg?style=flat-square)](https://codeclimate.com/github/REBELinBLUE/deployer)
+[![SensioLabs Insight](https://img.shields.io/sensiolabs/i/686dd98b-c0e5-465b-8f14-29b1cab47f3b.svg?style=flat-square)](https://insight.sensiolabs.com/projects/686dd98b-c0e5-465b-8f14-29b1cab47f3b)
 
 **Release Status**
 
-[![PHP Dependency Status](https://www.versioneye.com/user/projects/5531329410e7141211000f29/badge.svg)](https://www.versioneye.com/user/projects/5531329410e7141211000f29)
-[![Node Dependency Status](https://www.versioneye.com/user/projects/5531329610e714f9e500109c/badge.svg)](https://www.versioneye.com/user/projects/5531329610e714f9e500109c)
-[![Latest Version](https://img.shields.io/github/release/REBELinBLUE/deployer.svg)](https://github.com/REBELinBLUE/deployer/releases)
+[![PHP Dependency Status](https://www.versioneye.com/user/projects/5531329410e7141211000f29/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/5531329410e7141211000f29)
+[![Node Dependency Status](https://www.versioneye.com/user/projects/5531329610e714f9e500109c/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/5531329610e714f9e500109c)
+[![Latest Version](https://img.shields.io/github/release/REBELinBLUE/deployer.svg?style=flat-square)](https://github.com/REBELinBLUE/deployer/releases)
+[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](/LICENSE.md)
 
 ## What it does
 
@@ -95,7 +95,7 @@ $ git clone https://github.com/REBELinBLUE/deployer.git
 2. Checkout the latest release
 
 ```shell
-$ git checkout 0.0.38
+$ git checkout 0.0.39
 ```
 
 3. Install dependencies
@@ -136,7 +136,7 @@ $ editor .env
 
 ```shell
 $ git fetch --all
-$ git checkout 0.0.38
+$ git checkout 0.0.39
  ```
 
 2. Update the dependencies
@@ -154,4 +154,4 @@ $ php artisan app:update
 
 ## License
 
-Deployer is licensed under [The MIT License (MIT)](LICENSE.md).
+Deployer is licensed under [The MIT License (MIT)](/LICENSE.md).

README.md

@@ -1 +1 @@
-0.0.39
+0.0.40-dev

VERSION

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use REBELinBLUE\Deployer\Traits\BroadcastChanges;
+use REBELinBLUE\Deployer\Traits\HasTarget;
 
 /**
  * The command model.
@@ -26,7 +27,7 @@
  */
 class Command extends Model
 {
-    use SoftDeletes, BroadcastChanges;
+    use SoftDeletes, BroadcastChanges, HasTarget;
 
     const BEFORE_CLONE    = 1;
     const DO_CLONE        = 2;
@@ -46,14 +47,15 @@ class Command extends Model
      *
      * @var array
      */
-    protected $hidden = ['project', 'created_at', 'deleted_at', 'updated_at'];
+    protected $hidden = ['created_at', 'deleted_at', 'updated_at'];
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['name', 'user', 'script', 'project_id', 'step', 'order', 'optional', 'default_on'];
+    protected $fillable = ['name', 'user', 'script', 'target_type', 'target_id',
+                           'step', 'order', 'optional', 'default_on', ];
 
     /**
      * The attributes that should be casted to native types.
@@ -62,23 +64,12 @@ class Command extends Model
      */
     protected $casts = [
         'id'         => 'integer',
-        'project_id' => 'integer',
         'step'       => 'integer',
         'optional'   => 'boolean',
         'default_on' => 'boolean',
         'order'      => 'integer',
     ];
 
-    /**
-     * Belongs to relationship.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function project()
-    {
-        return $this->belongsTo(Project::class);
-    }
-
     /**
      * Belongs to many relationship.
      *

app/Command.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use REBELinBLUE\Deployer\Traits\BroadcastChanges;
+use REBELinBLUE\Deployer\Traits\HasTarget;
 
 /**
  * Static file for project.
@@ -19,16 +20,16 @@
  * @property string $deleted_at
  * @property-read Project $project
  */
-class ProjectFile extends Model
+class ConfigFile extends Model
 {
-    use SoftDeletes, BroadcastChanges;
+    use SoftDeletes, BroadcastChanges, HasTarget;
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['name', 'path', 'content', 'project_id'];
+    protected $fillable = ['name', 'path', 'content', 'target_type', 'target_id'];
 
     /**
      * The attributes excluded from the model's JSON form.
@@ -43,17 +44,6 @@ class ProjectFile extends Model
      * @var array
      */
     protected $casts = [
-        'id'         => 'integer',
-        'project_id' => 'integer',
+        'id' => 'integer',
     ];
-
-    /**
-     * Belongs to relationship.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function project()
-    {
-        return $this->belongsTo(Project::class);
-    }
 }