add support for multiple builds

README.md

@@ -142,16 +142,3 @@ public class TrafficLightFactoryTest {
 }
 ```
 
-### Installation of the commandline tool ###
-
-* [Windows Download](http://h1994633.stratoserver.net:9090/job/Build-Light/lastSuccessfulBuild/artifact/driver/cleware/build/distributions/cleware-0.1-DEV.zip)
-* [Linux/Mac Download](http://h1994633.stratoserver.net:9090/job/Build-Light/lastSuccessfulBuild/artifact/driver/cleware/build/distributions/cleware-0.1-DEV.tar)
-* [RaspberryPI Download](http://h1994633.stratoserver.net:9090/job/Build-Light/lastSuccessfulBuild/artifact/driver/cleware-pi/build/distributions/cleware-pi-0.1-DEV.tar)
-
-```bash
-berndzuther@Bernds-MacBook-Pro ~/Downloads$ tar xvf cleware-0.1-DEV.zip
-berndzuther@Bernds-MacBook-Pro ~/Downloads$ cd cleware-0.1-DEV/bin
-berndzuther@Bernds-MacBook-Pro ~/Downloads$ ./cleware --gui
-```
-![Cleware Java GUI](picture/driver-gui-screen-windows.png)
-

app/buildlight/build.gradle

@@ -3,10 +3,12 @@ apply plugin: 'macAppBundle'
 
 
 
-mainClassName = "com.comsysto.buildlight.application.Runner"
+def runnerClassName = "com.comsysto.buildlight.application.Runner"
+
+mainClassName = runnerClassName
 
 macAppBundle {
-    mainClassName = mainClassName
+    mainClassName = "${runnerClassName}"
     icon = "${buildDir}/resources/main/icons/TrafficLight.icns"
 }
 
@@ -64,9 +66,9 @@ jar {
     manifest {
         attributes(
                 "Implementation-Title": "Build Light Application",
-                "Implementation-Version": version,
+                "Implementation-Version": "${version}",
                 "Author": "Bernd Zuther <bernd.zuther@comsysto.com>",
-                "Main-Class": mainClassName
+                "Main-Class": "${runnerClassName}"
         )
     }
 }

app/buildlight/src/main/java/com/comsysto/buildlight/application/ConfigurationFile.java

@@ -34,46 +34,14 @@ public class ConfigurationFile {
     private String bambooUsername;
     private String bambooPassword;
 
-    public BuildServerType getServerType() {
-        return serverType;
-    }
-
-    public String getJenkinsUrl() {
-        return jenkinsUrl;
-    }
-
-    public String getJenkinsBuildName() {
-        return jenkinsBuildName;
-    }
-
-    public String jenkinsBuildNameProperty() {
-        return jenkinsBuildName;
-    }
-
-    public String getBambooUrl() {
-        return bambooUrl;
-    }
-
-    public String bambooBuildKey() {
-        return bambooBuildKey;
-    }
-
-    public String bambooUsername() {
-        return bambooUsername;
-    }
-
-    public String bambooPassword() {
-        return bambooPassword;
-    }
-
     @Override
     public String toString() {
         StringBuilder buffer = new StringBuilder();
         switch (serverType) {
             case Jenkins:
                 buffer.append("build.server=").append(serverType.name()).append("\n")
                       .append("jenkins.server.url=").append(jenkinsUrl).append("\n")
-                      .append("jenkins.build.name=").append(jenkinsBuildName).append("\n");
+                      .append("jenkins.build.names=").append(jenkinsBuildName).append("\n");
                 break;
             case Bamboo:
                 buffer.append("build.server=")

app/buildlight/src/main/java/com/comsysto/buildlight/application/adapter/JenkinsAdapter.java

@@ -1,8 +1,11 @@
 package com.comsysto.buildlight.application.adapter;
 
 import com.comsysto.buildlight.respository.jenkins.api.JenkinsRepository;
+import com.comsysto.buildlight.respository.jenkins.model.Build;
 import com.comsysto.buildlight.respository.jenkins.model.JenkinsBuildResponse;
 
+import java.util.List;
+
 /**
  * @author zutherb
  */
@@ -16,8 +19,21 @@ public JenkinsAdapter(JenkinsRepository jenkinsRepository) {
 
     @Override
     public BuildState getCurrentBuildState() {
-        JenkinsBuildResponse buildResponse = jenkinsRepository.getBuildResponse();
-        return getCurrentBuildState(buildResponse);
+        List<JenkinsBuildResponse> buildResponses = jenkinsRepository.getBuildResponse();
+        return getCurrentBuildState(buildResponses);
+    }
+
+    private BuildState getCurrentBuildState(List<JenkinsBuildResponse> buildResponses) {
+        BuildState result = BuildState.Successful;
+        for(JenkinsBuildResponse response : buildResponses){
+            if (BuildState.Building.equals(getCurrentBuildState(response)) && response.getDisplayName().contains("ui-test")){
+                result = BuildState.Building;
+            }
+            if (BuildState.Failed.equals(getCurrentBuildState(response))){
+                result = BuildState.Failed;
+            }
+        }
+        return result;
     }
 
     private BuildState getCurrentBuildState(JenkinsBuildResponse buildResponse) {

app/buildlight/src/main/java/com/comsysto/buildlight/application/adapter/ColorSwitcher.java → app/buildlight/src/main/java/com/comsysto/buildlight/application/job/ColorSwitcher.java

@@ -1,9 +1,13 @@
-package com.comsysto.buildlight.application.adapter;
+package com.comsysto.buildlight.application.job;
 
+import com.comsysto.buildlight.application.adapter.BuildServerAdapter;
+import com.comsysto.buildlight.application.adapter.BuildServerAdapterFactory;
+import com.comsysto.buildlight.application.adapter.BuildState;
 import com.comsysto.buildlight.common.driver.core.TrafficLight;
 import com.comsysto.buildlight.respository.common.BuildServerRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;