Version up to 1.0.6.

Author: RamonSmit

README.md

@@ -34,19 +34,19 @@ $ php artisan vendor:publish --tag=ldh-config
 
 ## Usage
 
-*Deploy to server*  
+*Deploy to server*
 Deploy full instance to the remote server
 ```bash
 php artisan ldh:deploy --stage=production --branch=develop
 ```
 
-*Patch to server*  
+*Patch to server*
 Push a simple patch to the remote server (minor changes only)
 ```bash
 php artisan ldh:patch --stage=production --branch=patch
 ```
 
-*Rollback one instance*  
+*Rollback one instance*
 Something went horrably wrong, go back in history
 ```bash
 php artisan ldh:rollback --stage=production

src/Console/Commands/Patch.php

@@ -52,7 +52,7 @@ public function handle()
         SSH::preFlight($this, $this->option('stage'), $this->option('branch'));
 
         // Get the band-aid, we're going to patch some shit
-        Deployer::doPatch($ssh, $this->option('stage'), $this->option('branch'));
+        Deployer::doPatch($this->option('stage'), $this->option('branch'));
 
         // Done
         SSH::performLanding($this->option('stage'));

src/Helpers/Deployer.php

@@ -14,7 +14,7 @@ public static function freshInit(Connection $connection, $stage)
     {
         // Init fresh remote repo
         $connection->define('init', [
-            'cd '.config('laravel-deploy-helper.stages.'.$stage.'.remote.root'),
+            'cd ' . config('laravel-deploy-helper.stages.' . $stage . '.remote.root'),
             'mkdir releases',
             'mkdir patches',
             'mkdir shared',
@@ -35,11 +35,11 @@ public static function doDeploy($stage, $branch, $ldh)
     {
         // Some stuff that does not change in runtime
         $releaseName = time();
-        $home = config('laravel-deploy-helper.stages.'.$stage.'.remote.root');
-        $shared = config('laravel-deploy-helper.stages.'.$stage.'.shared');
-        $commands = config('laravel-deploy-helper.stages.'.$stage.'.commands');
-        $versions = config('laravel-deploy-helper.stages.'.$stage.'.config.dependencies');
-        $keep = config('laravel-deploy-helper.stages.'.$stage.'.config.keep');
+        $home = config('laravel-deploy-helper.stages.' . $stage . '.remote.root');
+        $shared = config('laravel-deploy-helper.stages.' . $stage . '.shared');
+        $commands = config('laravel-deploy-helper.stages.' . $stage . '.commands');
+        $versions = config('laravel-deploy-helper.stages.' . $stage . '.config.dependencies');
+        $keep = config('laravel-deploy-helper.stages.' . $stage . '.config.keep');
 
         // Check what releases are old and can be removed
         ksort($ldh);
@@ -52,67 +52,67 @@ public static function doDeploy($stage, $branch, $ldh)
 
         // Check versions
         // Operators: http://php.net/manual/en/function.version-compare.php
-        verbose('['.$stage.'] Checking dependencies. Migth take a minute.');
+        verbose('[' . $stage . '] Checking dependencies. Migth take a minute.');
         foreach ($versions as $app => $version) {
             SSH::checkAppVersion($connection, $app, $version);
         }
 
         // Define the deploy
-        verbose('['.$stage.'] Creating new release directory and pulling from remote');
+        verbose('[' . $stage . '] Creating new release directory and pulling from remote');
         SSH::execute($stage, [
-            'mkdir '.$home.'/releases/'.$releaseName,
-            'cd '.$home.'/releases/'.$releaseName,
-            'git clone -b '.$branch.' '.config('laravel-deploy-helper.stages.'.$stage.'.git.http').' .',
+            'mkdir ' . $home . '/releases/' . $releaseName,
+            'cd ' . $home . '/releases/' . $releaseName,
+            'git clone -b ' . $branch . ' ' . config('laravel-deploy-helper.stages.' . $stage . '.git.http') . ' .',
         ]);
 
         // Pre-flight for shared stuff
         $items['directories'] = [];
         foreach ($shared['directories'] as $share) {
-            verbose('['.$stage.'] About to share direcroty "'.$home.'/current/'.$share.'"');
-            $items['directories'][] = '[ -e '.$home.'/current/'.$share.' ] && cp -R -p '.$home.'/current/'
-                .$share.' '.$home.'/shared/'.$share;
-            $items['directories'][] = '[ -e '.$home.'/shared/'.$share.' ] && cp -R -p '.$home.'/shared/'.
-                $share.' '.$home.'/releases/'.$releaseName;
+            verbose('[' . $stage . '] About to share direcroty "' . $home . '/current/' . $share . '"');
+            $items['directories'][] = '[ -e ' . $home . '/current/' . $share . ' ] && cp -R -p ' . $home . '/current/'
+                . $share . ' ' . $home . '/shared/' . $share;
+            $items['directories'][] = '[ -e ' . $home . '/shared/' . $share . ' ] && cp -R -p ' . $home . '/shared/' .
+                $share . ' ' . $home . '/releases/' . $releaseName;
         }
         // Pre-flight for shared stuff
         $items['files'] = [];
         foreach ($shared['files'] as $share) {
-            verbose('['.$stage.'] About to share file "'.$home.'/current/'.$share.'"');
-            $items['files'][] = '[ -e '.$home.'/current/'.$share.' ] && cp -p '.$home.'/current/'.$share
-                .' '.$home.'/shared/'.$share;
-            $items['files'][] = '[ -e '.$home.'/shared/'.$share.' ] && cp -p '.$home.'/shared/'.$share.
-                ' '.$home.'/releases/'.$releaseName.'/'.$share;
+            verbose('[' . $stage . '] About to share file "' . $home . '/current/' . $share . '"');
+            $items['files'][] = '[ -e ' . $home . '/current/' . $share . ' ] && cp -p ' . $home . '/current/' . $share
+                . ' ' . $home . '/shared/' . $share;
+            $items['files'][] = '[ -e ' . $home . '/shared/' . $share . ' ] && cp -p ' . $home . '/shared/' . $share .
+                ' ' . $home . '/releases/' . $releaseName . '/' . $share;
         }
 
         // Define shared files
-        verbose('['.$stage.'] Syncing shared files');
+        verbose('[' . $stage . '] Syncing shared files');
         SSH::execute($stage, $items['files']);
 
         // Define shared directories
-        verbose('['.$stage.'] Syncing shared directories');
+        verbose('[' . $stage . '] Syncing shared directories');
         SSH::execute($stage, $items['directories']);
 
         $items = [];
         foreach ($commands as $command) {
-            $items[] = 'cd '.$home.'/releases/'.$releaseName.' && '.$command;
+            $items[] = 'cd ' . $home . '/releases/' . $releaseName . ' && ' . $command;
         }
         // Define commands
-        verbose('['.$stage.'] Executing custom commands');
+        verbose('[' . $stage . '] Executing custom commands');
         SSH::execute($stage, $items);
 
         // Define post deploy actions
-        verbose('['.$stage.'] Linking new release to /current directory and removing temp');
+        verbose('[' . $stage . '] Linking new release to /current directory and removing temp');
         SSH::execute($stage, [
-            'ln -sfn '.$home.'/releases/'.$releaseName.' '.$home.'/current',
-            'rm -rf '.$home.'/shared/*',
+            'ln -sfn ' . $home . '/releases/' . $releaseName . ' ' . $home . '/current',
+            'rm -rf ' . $home . '/shared/*',
         ]);
 
         // Remove old deploys
         $items = [];
         foreach ($toRemove as $dir => $val) {
-            $items[] = 'echo "Removing release '.$dir.'" && rm -rf '.$home.'/releases/'.$dir;
+            $items[] = 'echo "Removing release ' . $dir . '" && rm -rf ' . $home . '/releases/' . $dir;
         }
-        verbose('['.$stage.'] Cleaning up old releases');
+        verbose('[' . $stage . '] Cleaning up old releases');
         SSH::execute($stage, $items);
 
         $ldh[$releaseName] = true;
@@ -125,15 +125,15 @@ public static function doDeploy($stage, $branch, $ldh)
      */
     public static function doRollback(Connection $connection, $stage, $ldh, $dirs)
     {
-        $home = config('laravel-deploy-helper.stages.'.$stage.'.remote.root');
+        $home = config('laravel-deploy-helper.stages.' . $stage . '.remote.root');
 
         // Define post deploy actions
         $connection->define('preformRollback', [
-            'ln -sfn '.$home.'/releases/'.$dirs[1].' '.$home.'/current',
-            'rm -rf '.$home.'/releases/'.$dirs[0],
+            'ln -sfn ' . $home . '/releases/' . $dirs[1] . ' ' . $home . '/current',
+            'rm -rf ' . $home . '/releases/' . $dirs[0],
         ]);
 
-        verbose("\t".'Hold my beer, We\'re rolling back');
+        verbose("\t" . 'Hold my beer, We\'re rolling back');
         $connection->task('preformRollback');
 
         unset($dirs[0]);
@@ -147,20 +147,29 @@ public static function doRollback(Connection $connection, $stage, $ldh, $dirs)
         return $ldhs;
     }
 
-    public static function doPatch(Connection $connection, $stage, $branch)
+    /**
+     * @param $stage
+     * @param $branch
+     */
+    public static function doPatch($stage, $branch)
     {
         $home = config('laravel-deploy-helper.stages.' . $stage . '.remote.root');
 
-        dd(Command::builder('git',
-            ['apply', '--reject', '--whitespace=fix', '--directory=' . $home . '/patches/*.patch']));
+        // setup ssh connection to remote
+        $connection = SSH::instance()->into($stage);
 
         $connection->define('preformPatch', [
             Command::builder('cd', [$home . '/current']),
             Command::builder('ls', ['-haml']),
+
+            Command::builder('git', ['config', 'user.email', 'git+LDH@localhost.ext']),
+            Command::builder('git', ['config', 'user.name', 'LDH']),
+
             Command::builder('git', ['fetch']),
-            Command::builder('git', ['format-patch', 'origin/' . $branch, 'FETCH_HEAD', '-o', $home . '/patches']),
             Command::builder('git',
-                ['apply', '--reject', '--whitespace=fix', '--directory=' . $home . '/patches/*.patch']),
+                ['format-patch', '-1', 'origin/' . $branch, 'FETCH_HEAD', '-o', $home . '/patches']),
+            'git apply --reject --whitespace=fix ' . $home . '/patches/*',
+            Command::builder('rm', ['-rf', $home . '/patches'])
         ]);
 
         verbose("\t" . 'Hold on tight, trying to patch!');

src/Helpers/SSH.php

@@ -22,7 +22,7 @@ public static function instance()
      */
     public static function home($stage)
     {
-        return config('laravel-deploy-helper.stages.'.$stage.'.remote.root');
+        return config('laravel-deploy-helper.stages.' . $stage . '.remote.root');
     }
 
     public static function checkAppVersion(Connection $connection, $app, $requestedVersion)
@@ -68,7 +68,7 @@ public static function checkAppVersion(Connection $connection, $app, $requestedV
         if ($requestedVersion === true) {
             $connection->run(Command::builder($app, []), function ($response) use ($app) {
                 if (stripos($response, 'command not found') !== false) {
-                    throw new \Exception('ERROR: '.$app.' is not installed on the server.');
+                    throw new \Exception('ERROR: ' . $app . ' is not installed on the server.');
                 }
             });
             verbose("\t => Checking $app is available");
@@ -81,7 +81,7 @@ public static function checkAppVersion(Connection $connection, $app, $requestedV
          */
         $connection->run(Command::builder($app, []), function ($response) use ($app) {
             if (stripos($response, 'command not found') !== false) {
-                throw new \Exception('ERROR: '.$app.' is not installed on the server.');
+                throw new \Exception('ERROR: ' . $app . ' is not installed on the server.');
             }
         });