Merge pull request #9 from jgedarovich/master

allow ssl to be used for jenknis_url
etsy · Apr 15, 2015 · ab03300 · ab03300
2 parents 6884923 + c7a3322
commit ab03300
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/TryLib/JenkinsRunner.php b/TryLib/JenkinsRunner.php
@@ -27,7 +27,11 @@ public function __construct(
         $try_job_name,
         $cmd_runner
     ) {
-        $this->jenkins_url = $jenkins_url;
+        if (filter_var($jenkins_url, FILTER_VALIDATE_URL) !== false) {
+            $this->jenkins_url = $jenkins_url;
+        } else {
+            throw new Exception("jenkins url must include protocol, ie http://, and trailing /, $jenkins_url given");
+        }
         $this->jenkins_cli = $jenkins_cli;
         $this->try_job_name = $try_job_name;
         $this->cmd_runner = $cmd_runner;
@@ -47,8 +51,7 @@ abstract protected function getBuildCommand();
     abstract protected function getBuildExtraArguments($show_results, $show_progress);
 
     public function runJenkinsCommand($command) {
-        $cmd = sprintf(
-            "java -jar %s -s http://%s/ %s",
+        $cmd = sprintf( "java -jar %s -s %s %s",
             $this->jenkins_cli,
             $this->jenkins_url,
             $command

diff --git a/tests/phpunit/JenkinsRunner/FreeStyleProjectTest.php b/tests/phpunit/JenkinsRunner/FreeStyleProjectTest.php
@@ -3,7 +3,7 @@
 require_once "TryLib/Autoload.php";
 
 class FreeStyleProjectTest extends PHPUnit_Framework_TestCase {
-    const JENKINS_URL = 'url.to.jenkins.com:8080';
+    const JENKINS_URL = 'http://url.to.jenkins.com:8080/';
     const JENKINS_CLI = '/path/to/cli.jar';
     const JENKINS_JOB = 'test-try';
 

diff --git a/tests/phpunit/JenkinsRunner/MasterProjectTest.php b/tests/phpunit/JenkinsRunner/MasterProjectTest.php
@@ -3,7 +3,7 @@
 require_once "TryLib/Autoload.php";
 
 class MasterProjectTest extends PHPUnit_Framework_TestCase {
-    const JENKINS_URL = 'url.to.jenkins.com:8080';
+    const JENKINS_URL = 'http://url.to.jenkins.com:8080/';
     const JENKINS_CLI = '/path/to/cli.jar';
     const JENKINS_JOB = 'test-try';
 

diff --git a/tests/phpunit/JenkinsRunnerTest.php b/tests/phpunit/JenkinsRunnerTest.php
@@ -20,7 +20,7 @@ public function pollForCompletion($pretty) {
 }
 
 class JenkinsRunnerTest extends PHPUnit_Framework_TestCase {
-    const JENKINS_URL = 'url.to.jenkins.com:8080';
+    const JENKINS_URL = 'https://url.to.jenkins.com:8080/';
     const JENKINS_CLI = '/path/to/cli.jar';
     const JENKINS_JOB = 'test-try';
 
@@ -42,8 +42,21 @@ function setUp() {
         vfsStream::setup('testDir');
     }
 
+    /**
+     * @expectedException
+     */
+    function testInvalidUrl() {
+            $this->jenkins_runner = new TestRunner(
+                'http://totallyvalid.com/',
+                self::JENKINS_CLI,
+                self::JENKINS_JOB,
+                $this->mock_cmd_runner
+            );
+    }
+
+
     function testRunJenkinsCommand() {
-        $expected_cmd = 'java -jar ' . self::JENKINS_CLI . ' -s http://' . self::JENKINS_URL . '/ dummy-cmd';
+        $expected_cmd = 'java -jar ' . self::JENKINS_CLI . ' -s ' . self::JENKINS_URL . ' dummy-cmd';
 
         $this->mock_cmd_runner->expects($this->once())
                               ->method('run')