Deployer Next 🚀

.gitignore

@@ -1,6 +1,4 @@
-.php_cs.cache
 /vendor/
-/test/localhost
+/test/fixture/recipe/tmp/
+.php_cs.cache
 *.phar
-/.vagrant
-deploy.php

.scrutinizer.yml

@@ -8,12 +8,10 @@ filter:
     - src/*
     - recipe/*
     - bin/*
-  excluded_paths:
-    - src/Resources/*
 
 build:
   environment:
-    php: '5.6.26'
+    php: '7.0.8'
   tests:
     override:
       -

.styleci.yml

@@ -3,3 +3,7 @@ preset: psr2
 enabled:
   - short_array_syntax
   - no_whitespace_in_blank_line
+
+finder:
+  not-name:
+    - "tester.php"

.travis.yml

@@ -1,9 +1,6 @@
 language: php
 
-sudo: required
-
 php:
-  - 5.6
   - 7.0
   - 7.1
 
@@ -16,9 +13,11 @@ env:
     - COMPOSER_FLAGS="--prefer-lowest"
     - COMPOSER_FLAGS="--prefer-stable"
 
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y acl
+
 install:
-  - eval `ssh-agent -s`
-  - test/travis/setup-secure-shell.sh
   - composer self-update
   - composer update --no-interaction --prefer-source $COMPOSER_FLAGS
 

CHANGELOG.md

@@ -3,22 +3,40 @@
 ## master
 [v4.3.0...master](https://github.com/deployphp/deployer/compare/v4.3.0...master)
 
---
+### Added
+- Added `use_atomic_symlink` and `use_relative_symlink` option [14a8f8](https://github.com/deployphp/deployer/pull/1092/commits/14a8f8f9c4ebbc7da45c2b6b7c3c00a51b563ccf)
+- Added `Ssh\Client` [#1092](https://github.com/deployphp/deployer/pull/1092)
+- Added host ranges [#1092](https://github.com/deployphp/deployer/pull/1092)
+- Added --hosts and --roles options [#1092](https://github.com/deployphp/deployer/pull/1092)
+- Added `on` function [#1092](https://github.com/deployphp/deployer/pull/1092)
+- Added `host` and `localhost` [#1092](https://github.com/deployphp/deployer/pull/1092)
+- Added persistent config [#1092](https://github.com/deployphp/deployer/pull/1092)
+- Added `--log` option [#1092](https://github.com/deployphp/deployer/pull/1092)
+
+### Changed
+- `server` refactored to `host` [#1092](https://github.com/deployphp/deployer/pull/1092)
+- `Enviroment` refactored to `Configuration` [#1092](https://github.com/deployphp/deployer/pull/1092)
+- phpunit test refactored [#1092](https://github.com/deployphp/deployer/pull/1092)
+- `upload` and `download` now uses rsync [#1092](https://github.com/deployphp/deployer/pull/1092)
+- Only native ssh client for now [#1092](https://github.com/deployphp/deployer/pull/1092)
+- Task `current` to `config:current` [#1092](https://github.com/deployphp/deployer/pull/1092)
+- `onFailure` to `fail` [#1092](https://github.com/deployphp/deployer/pull/1092)
+
 
 ## v4.3.0
 [v4.2.1...v4.3.0](https://github.com/deployphp/deployer/compare/v4.2.1...v4.3.0)
 
 ### Added
-- Add support for multiple choice questions [#1076](https://github.com/deployphp/deployer/pull/1076)
-- Add a way to retrieve a defined task [#1008](https://github.com/deployphp/deployer/pull/1008)
-- Add support for configFile in the NativeSsh implementation [#979](https://github.com/deployphp/deployer/pull/979)
-- Add `--no-hooks` option for running commands without `before()` and `after()` [#1061](https://github.com/deployphp/deployer/pull/1061)
+- Added support for multiple choice questions [#1076](https://github.com/deployphp/deployer/pull/1076)
+- Added a way to retrieve a defined task [#1008](https://github.com/deployphp/deployer/pull/1008)
+- Added support for configFile in the NativeSsh implementation [#979](https://github.com/deployphp/deployer/pull/979)
+- Added `--no-hooks` option for running commands without `before()` and `after()` [#1061](https://github.com/deployphp/deployer/pull/1061)
 - Added a usefull error when ask*() is not used wihtin a task() [#1083](https://github.com/deployphp/deployer/pull/1083)
 
 ### Changed
 - Parse hyphens in environment setting names [#1073](https://github.com/deployphp/deployer/pull/1074)
 - Autoload functions via Composer [#1015](https://github.com/deployphp/deployer/pull/1015)
-- Add task queue:restart for Laravel recipe [#1007](https://github.com/deployphp/deployer/pull/1007)
+- Added task queue:restart for Laravel recipe [#1007](https://github.com/deployphp/deployer/pull/1007)
 - Changed output of errors for native ssh [#1012](https://github.com/deployphp/deployer/issues/1012)
 
 ### Fixed
@@ -30,7 +48,7 @@
 - Fixed old releases not being cleaned up when keep_releases reduced by more than half.
 - Fixed creating non-existed `writable_dirs` [#1000](https://github.com/deployphp/deployer/pull/1000)
 - Fixed uploading files with spaces in a path via Native SSH [#1010](https://github.com/deployphp/deployer/issues/1010)
-- Fix merge of string array config options [#1067](https://github.com/deployphp/deployer/pull/1067)
+- Fixed merge of string array config options [#1067](https://github.com/deployphp/deployer/pull/1067)
 - Fixed uploading of files containing spaces [#1077](https://github.com/deployphp/deployer/issues/1077)
 - Fixed download of files when filename remote contains spaces [#1082](https://github.com/deployphp/deployer/pull/1082)
 

UPGRADE.md

@@ -1,3 +1,55 @@
+# Upgrade from 4.x to 5.x
+
+1. Servers to Hosts
+
+   * `server($name, $hostname)` to `host($hostname)`
+   * `localServer($name)` to `localhost()`
+   * `cluster($name, $nodes, $port)` to `hosts(...$hodes)`
+   * `serverList($file)` to `inventory($file)`
+
+2. Configuration options
+
+   * Rename `{{server.name}}` to `{{hostname}}`
+
+3. DotArray syntax
+
+   In v5 access to nested arrays in config via dot notation was removed. 
+   If you was using it, consider to move to plain config options.
+
+   Refactor this:
+
+   ```php
+   set('a', ['b' => 1]);
+
+   // ...
+
+   get('a.b');
+   ```
+
+   To:
+
+   ```php
+   set('a_b', 1);
+
+   // ...
+
+   get('a_b');
+   ```
+
+4. Credentials 
+
+   Best practice in new v5 is to omit credentials for connection in `deploy.php` and write them in `~/.ssh/config` instead.
+
+   * `identityFile($publicKeyFile,, $privateKeyFile, $passPhrase)` to `identityFile($privateKeyFile)`
+   * `pemFile($pemFile)` to `identityFile($pemFile)`
+   * `forwardAgent()` to `forwardAgent(true)`
+
+5. Tasks constraints
+
+   * `onlyOn` to `onHosts`
+   * `onlyOnStage` to `onStage`
+
+
 # Upgrade from 3.x to 4.x
 
 1. Namespace for functions

build → bin/build

@@ -1,12 +1,14 @@
 #!/usr/bin/env php
 <?php
-/*  __   ___  __
- * |  \ |__  |__)
- * |__/ |___ |
+/* (c) Anton Medvedev <anton@medv.io>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
-require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
+define('ROOT', realpath(__DIR__ . '/..'));
 $opt = getopt('v::');
 
 $version = 'dev-master';
@@ -17,8 +19,11 @@ if (array_key_exists('v', $opt)) {
     }
 }
 
+chdir(ROOT);
+exec('composer install --no-dev');
+
 $pharName = "deployer.phar";
-$pharFile = __DIR__ . '/' . $pharName;
+$pharFile = ROOT . '/' . $pharName;
 
 if (file_exists($pharFile)) {
     unlink($pharFile);
@@ -40,18 +45,18 @@ $finder->files()
     ->exclude('test')
     ->exclude('tests')
     ->exclude('phpspec')
-    ->in(__DIR__);
+    ->in(ROOT);
 
 foreach ($finder as $fileInfo) {
-    $file = str_replace(__DIR__, '', $fileInfo->getRealPath());
+    $file = str_replace(ROOT, '', $fileInfo->getRealPath());
 
     echo "Add file: " . $file . "\n";
 
     $phar->addFile($fileInfo->getRealPath(), $file);
 }
 
 // Add bin/dep file
-$depContent = file_get_contents(__DIR__ . '/bin/dep');
+$depContent = file_get_contents(ROOT . '/bin/dep');
 $depContent = str_replace("#!/usr/bin/env php\n", '', $depContent);
 $depContent = str_replace("'master'", "'$version'", $depContent);
 $depContent = str_replace('__FILE__', 'str_replace("phar://", "", Phar::running())', $depContent);

bin/dep

@@ -93,28 +93,19 @@ if (is_readable($composerLockFile)) {
     }
 }
 
-// Init Deployer
-$console = new \Deployer\Console\Application('Deployer', $version);
-$input = new \Symfony\Component\Console\Input\ArgvInput();
-$output = new \Symfony\Component\Console\Output\ConsoleOutput();
-$deployer = new \Deployer\Deployer($console, $input, $output);
-
-// Pretty-print uncaught exceptions in symfony-console
-// SymfonyStyle was added in sf-console 2.7, therefore we feature detect first
-if (class_exists('\Symfony\Component\Console\Style\SymfonyStyle')) {
-    set_exception_handler(function($e) use ($input, $output) {
-        $io = new \Symfony\Component\Console\Style\SymfonyStyle($input, $output);
-        $io->error($e);
-    });
-}
+$method = new ReflectionMethod('Deployer\Deployer', 'run');
+if (!$method->isStatic()) {
+    die(
+        'You need to update Deployer to the latest version:' . PHP_EOL .
+        PHP_EOL .
+        '  dep self-update' . PHP_EOL .
+        PHP_EOL .
+        'Or use composer installed version:' . PHP_EOL .
+        PHP_EOL .
+        '  php vendor/bin/dep' . PHP_EOL .
+        PHP_EOL
 
-// Require deploy.php file
-if (is_readable($deployFile)) {
-    // Prevent variable leak into deploy.php file
-    call_user_func(function () use ($deployFile) {
-        require $deployFile;
-    });
+    );
 }
 
-// Run Deployer
-$deployer->run();
+\Deployer\Deployer::run($version, $deployFile);

composer.json

@@ -19,29 +19,27 @@
             "Deployer\\": "src/"
         },
         "files": [
+            "src/Support/helpers.php",
             "src/functions.php"
         ]
     },
     "bin": [
         "bin/dep"
     ],
     "require": {
-        "php": ">=5.6.0",
-        "elfet/pure": "~2.0",
-        "monolog/monolog": "^1.21",
-        "phpseclib/phpseclib": "~2.0",
+        "php": "~7.0",
+        "deployer/phar-update": "~2.0",
         "pimple/pimple": "~3.0",
-        "symfony/console": "~2.6|~3.0",
-        "symfony/finder": "~2.6|~3.0",
-        "symfony/process": "~2.6|~3.0",
-        "symfony/yaml": "~2.6|~3.0"
+        "symfony/console": "~2.7|~3.0",
+        "symfony/finder": "~2.7|~3.0",
+        "symfony/process": "~2.7|~3.0",
+        "symfony/yaml": "~2.7|~3.0"
     },
     "require-dev": {
-        "deployer/phar-update": "~2.0",
-        "phpunit/phpunit": "~5.7"
+        "phpunit/phpunit": "~6.0"
     },
     "suggest": {
-        "ext-sockets": "For parallel deployment"
+        "deployer/phar-update": "~2.0"
     },
     "config": {
         "sort-packages": true