GitHub private pull request (dancryer#1323)

* Updating Remote Build To Have 'runBySsh' Method - Separates Out SSH Logic So Child Classes Can Easily Make SSH Based Commands

* Updating GitHub Pull Request To Utilize SSH Call

* Adding Additional Logic To Maintain Original http Methods Correctly.

Author: Fenikkusu

PHPCI/Model/Build/GithubBuild.php

@@ -174,7 +174,11 @@ protected function postCloneSetup(Builder $builder, $cloneTo)
                 $remoteBranch = $this->getExtra('remote_branch');
 
                 $cmd = 'cd "%s" && git checkout -b phpci/' . $this->getId() . ' %s && git pull -q --no-edit %s %s';
-                $success = $builder->executeCommand($cmd, $cloneTo, $this->getBranch(), $remoteUrl, $remoteBranch);
+                if ($this->canRunSsh()) {
+                    $success = $this->runBySsh($builder, $cloneTo, $cmd, [$cloneTo, $this->getBranch(), $remoteUrl, $remoteBranch]);
+                } else {
+                    $success = $builder->executeCommand($cmd, $cloneTo, $this->getBranch(), $remoteUrl, $remoteBranch);
+                }
             }
         } catch (\Exception $ex) {
             $success = false;

PHPCI/Model/Build/RemoteGitBuild.php

@@ -33,9 +33,7 @@ protected function getCloneUrl()
     */
     public function createWorkingCopy(Builder $builder, $buildPath)
     {
-        $key = trim($this->getProject()->getSshPrivateKey());
-
-        if (!empty($key)) {
+        if ($this->canRunSsh()) {
             $success = $this->cloneBySsh($builder, $buildPath);
         } else {
             $success = $this->cloneByHttp($builder, $buildPath);
@@ -77,32 +75,42 @@ protected function cloneByHttp(Builder $builder, $cloneTo)
     */
     protected function cloneBySsh(Builder $builder, $cloneTo)
     {
-        $keyFile = $this->writeSshKey($cloneTo);
-
-        if (!IS_WIN) {
-            $gitSshWrapper = $this->writeSshWrapper($cloneTo, $keyFile);
-        }
-
         // Do the git clone:
-        $cmd = 'git clone --recursive ';
-
+        $cmd   = 'git clone --recursive ';
         $depth = $builder->getConfig('clone_depth');
-
         if (!is_null($depth)) {
             $cmd .= ' --depth ' . intval($depth) . ' ';
         }
 
         $cmd .= ' -b %s %s "%s"';
 
+        $success = $this->runBySsh($builder, $cloneTo, $cmd, [$this->getBranch(), $this->getCloneUrl(), $cloneTo]);
+
+        if ($success) {
+            $success = $this->postCloneSetup($builder, $cloneTo);
+        }
+
+        return $success;
+    }
+
+    protected function canRunSsh() {
+        $key = trim($this->getProject()->getSshPrivateKey());
+        return !empty($key);
+    }
+
+    protected function runBySsh(Builder $builder, $cloneTo, $runCommand, $runArguments) {
+        $keyFile = $this->writeSshKey($cloneTo);
+
+        $cmd = $runCommand;
+
         if (!IS_WIN) {
+            $gitSshWrapper = $this->writeSshWrapper($cloneTo, $keyFile);
             $cmd = 'export GIT_SSH="'.$gitSshWrapper.'" && ' . $cmd;
         }
 
-        $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo);
+        array_unshift($runArguments, $cmd);
 
-        if ($success) {
-            $success = $this->postCloneSetup($builder, $cloneTo);
-        }
+        $success = call_user_func_array([$builder, 'executeCommand'], $runArguments);
 
         // Remove the key file and git wrapper:
         unlink($keyFile);