added support for multiple sbt launchers

Author: uzilan

pom.xml

@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.jvnet.hudson.plugins</groupId>
+    <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.392</version>
+    <version>1.396</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -29,8 +29,8 @@
       <url>file:.</url>
     </snapshotRepository>
     <repository>
-      <id>java.net-m2-repository</id>
-      <url>http://maven.hudson-labs.org:8081/content/repositories/releases/</url>
+      <id>maven.jenkins-ci.org</id>
+      <url>http://maven.jenkins-ci.org:8081/content/repositories/releases/</url>
     </repository>
   </distributionManagement>  
 

src/main/java/org/jvnet/hudson/plugins/SbtPluginBuilder.java

@@ -16,13 +16,17 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.servlet.ServletException;
 
+import jline.ArgumentCompletor;
+
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
@@ -31,7 +35,7 @@
 import org.kohsuke.stapler.StaplerRequest;
 
 /**
- * Sample {@link Builder}.
+ * sbt plugin {@link Builder}.
  * 
  * <p>
  * When the user configures the project and enables this builder,
@@ -45,23 +49,33 @@
  * {@link #perform(AbstractBuild, Launcher, BuildListener)} method will be
  * invoked.
  * 
- * @author Kohsuke Kawaguchi
+ * @author Uzi Landsmann
  */
 public class SbtPluginBuilder extends Builder {
 
-	private final String actions;
+	public static final Logger LOGGER = Logger.getLogger(SbtPluginBuilder.class
+			.getName());
+
+	private final String name;
 	private final String jvmFlags;
 	private final String sbtFlags;
+	private final String actions;
 
 	// Fields in config.jelly must match the parameter names in the
 	// "DataBoundConstructor"
 	@DataBoundConstructor
-	public SbtPluginBuilder(String jvmFlags, String sbtFlags, String actions) {
+	public SbtPluginBuilder(String name, String jvmFlags, String sbtFlags,
+			String actions) {
+		this.name = name;
 		this.jvmFlags = jvmFlags;
 		this.sbtFlags = sbtFlags;
 		this.actions = actions;
 	}
 
+	public String getName() {
+		return name;
+	}
+
 	public String getJvmFlags() {
 		return jvmFlags;
 	}
@@ -74,6 +88,10 @@ public String getActions() {
 		return actions;
 	}
 
+	/**
+	 * Perform the sbt build. Interpret the command arguments and create a
+	 * command line, then run it.
+	 */
 	@Override
 	public boolean perform(AbstractBuild build, Launcher launcher,
 			BuildListener listener) {
@@ -95,31 +113,40 @@ public boolean perform(AbstractBuild build, Launcher launcher,
 			return success;
 		} catch (IllegalArgumentException e) {
 			// Util.displayIOException(e, listener);
-			e.printStackTrace(listener.fatalError("command execution failed"));
+			e.printStackTrace(listener.fatalError("command execution failed: "
+					+ e.getMessage()));
 			build.setResult(Result.FAILURE);
 			return false;
 		} catch (IOException e) {
 			Util.displayIOException(e, listener);
-			e.printStackTrace(listener.fatalError("command execution failed"));
+			e.printStackTrace(listener.fatalError("command execution failed: "
+					+ e.getMessage()));
 			build.setResult(Result.FAILURE);
 			return false;
 		} catch (InterruptedException e) {
 			// Util.displayIOException(e, listener);
-			e.printStackTrace(listener.fatalError("command execution failed"));
+			e.printStackTrace(listener.fatalError("command execution failed: "
+					+ e.getMessage()));
 			build.setResult(Result.FAILURE);
 			return false;
 		}
 
 	}
 
+	/**
+	 * Create an {@link ArgumentListBuilder} to run the build, given command
+	 * arguments.
+	 */
 	private ArgumentListBuilder buildCmdLine(AbstractBuild build,
 			Launcher launcher, BuildListener listener)
 			throws IllegalArgumentException {
 		ArgumentListBuilder args = new ArgumentListBuilder();
 
-		String sbtJarPath = getDescriptor().getSbtJarPath();
+		DescriptorImpl descriptor = (DescriptorImpl) getDescriptor();
+
+		String launcherPath = descriptor.getJar(name).getPath();
 
-		if (StringUtils.isBlank(sbtJarPath)) {
+		if (StringUtils.isBlank(launcherPath)) {
 			throw new IllegalArgumentException("SBT jar path is empty");
 		}
 
@@ -133,19 +160,12 @@ private ArgumentListBuilder buildCmdLine(AbstractBuild build,
 				+ "/java" : "java";
 		args.add(new File(java).getAbsolutePath());
 
-		String[] split = jvmFlags.split(" ");
-		for (String flag : split) {
-			args.add(flag);
-		}
-
-		split = sbtFlags.split(" ");
-		for (String flag : split) {
-			args.add(flag);
-		}
+		splitAndAddArgs(jvmFlags, args);
+		splitAndAddArgs(sbtFlags, args);
 
 		args.add("-jar");
 
-		args.add(sbtJarPath);
+		args.add(launcherPath);
 
 		for (String action : split(actions)) {
 			args.add(action);
@@ -154,13 +174,35 @@ private ArgumentListBuilder buildCmdLine(AbstractBuild build,
 		return args;
 	}
 
+	/**
+	 * Split arguments and add them to the args list
+	 * 
+	 * @param argsToSplit
+	 *            the arguments to split
+	 * @param args
+	 *            java/sbt command arguments
+	 */
+	private void splitAndAddArgs(String argsToSplit, ArgumentListBuilder args) {
+		if (StringUtils.isBlank(argsToSplit)) {
+			return;
+		}
+
+		String[] split = argsToSplit.split(" ");
+		for (String flag : split) {
+			args.add(flag);
+		}
+	}
+
 	/*
-	 * Splits by whitespace except if surrounded by quotes.
-	 * See http://stackoverflow.com/questions/366202/regex-for-splitting-a-string-using-space-when-not-surrounded-by-single-or-double/366532#366532
+	 * Splits by whitespace except if surrounded by quotes. See
+	 * http://stackoverflow
+	 * .com/questions/366202/regex-for-splitting-a-string-using
+	 * -space-when-not-surrounded-by-single-or-double/366532#366532
 	 */
 	private List<String> split(String s) {
 		List<String> result = new ArrayList<String>();
-		Matcher matcher = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'").matcher(s);
+		Matcher matcher = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'")
+				.matcher(s);
 		while (matcher.find()) {
 			if (matcher.group(1) != null)
 				result.add(matcher.group(1));
@@ -172,9 +214,6 @@ else if (matcher.group(2) != null)
 		return result;
 	}
 
-	// overrided for better type safety.
-	// if your plugin doesn't really define any property on Descriptor,
-	// you don't have to do this.
 	@Override
 	public DescriptorImpl getDescriptor() {
 		return (DescriptorImpl) super.getDescriptor();
@@ -194,53 +233,107 @@ public DescriptorImpl getDescriptor() {
 	public static final class DescriptorImpl extends
 			BuildStepDescriptor<Builder> {
 
-		private String sbtJarPath;
+		private volatile Jar[] jars = new Jar[0];
 
 		public DescriptorImpl() {
+			super(SbtPluginBuilder.class);
 			load();
 		}
 
-		/**
-		 * Performs on-the-fly validation of the form field 'name'.
-		 * 
-		 * @param value
-		 *            This parameter receives the value that the user has typed.
-		 * @return Indicates the outcome of the validation. This is sent to the
-		 *         browser.
-		 */
-		public FormValidation doCheckSbtJarPath(@QueryParameter String value)
-				throws IOException, ServletException {
-			if (value.isEmpty()) {
-				return FormValidation.error("Please enter a path");
-			}
-			return FormValidation.ok();
-		}
-
+		@Override
 		public boolean isApplicable(Class<? extends AbstractProject> aClass) {
-			// indicates that this builder can be used with all kinds of project
-			// types
 			return true;
 		}
 
+		@Override
+		public Builder newInstance(StaplerRequest req, JSONObject formData) {
+
+			LOGGER.info(String.format("Creating new instance with formData %s",
+					formData));
+
+			String name = formData.getString("name");
+			String jvmFlags = formData.getString("jvmFlags");
+			String sbtFlags = formData.getString("sbtFlags");
+			String actions = formData.getString("actions");
+
+			return new SbtPluginBuilder(name, jvmFlags, sbtFlags, actions);
+		}
+
 		/**
 		 * This human readable name is used in the configuration screen.
 		 */
 		public String getDisplayName() {
-			return "Build using SBT";
+			return "Build using sbt";
+		}
+
+		public Jar getJar(String name) {
+			for (Jar jar : jars) {
+				if (jar.getName().equals(name)) {
+					return jar;
+				}
+			}
+			return null;
 		}
 
 		@Override
 		public boolean configure(StaplerRequest req, JSONObject formData)
 				throws FormException {
-			sbtJarPath = formData.getString("sbtJarPath");
+			
+			try {
+				jars = req.bindJSONToList(Jar.class,
+						req.getSubmittedForm().get("jar")).toArray(new Jar[0]);
+				save();
+				return true;
+			} catch (ServletException e) {
+
+				LOGGER.severe(String.format("Couldn't save jars beacause %s",
+						e.getMessage()));
+				LOGGER.severe(String.format("Stacktrace %s", e.getStackTrace()
+						.toString()));
+
+				return false;
+			}
+		}
+
+		public Jar[] getJars() {
+			return jars;
+		}
+
+	}
 
-			save();
-			return super.configure(req, formData);
+	/**
+	 * Representation of an sbt launcher. Several such launchers can be defined
+	 * in Jenkins properties to choose among when running a project.
+	 */
+	public static final class Jar implements Serializable {
+		private static final long serialVersionUID = 1L;
+
+		/** The human-friendly name of this launcher */
+		private String name;
+		
+		/** The path to the launcher */
+		private String path;
+
+		@DataBoundConstructor
+		public Jar(String name, String path) {
+			this.name = name;
+			this.path = path;
+		}
+
+		public String getName() {
+			return name;
 		}
 
-		public String getSbtJarPath() {
-			return sbtJarPath;
+		public void setName(String name) {
+			this.name = name;
 		}
 
+		public String getPath() {
+			return path;
+		}
+
+		public void setPath(String path) {
+			this.path = path;
+		}
 	}
 }

src/main/resources/org/jvnet/hudson/plugins/SbtPluginBuilder/config.jelly

@@ -4,12 +4,20 @@
 
     See global.jelly for a general discussion about jelly script.
   -->
+  
+  <f:entry title="sbt launcher">
+  	<select class="setting-input" name="jar.name" description="Select configured sbt launcher">
+        <j:forEach var="jar" items="${descriptor.jars}">
+          <f:option selected="${jar.name.equals(instance.name)}">${jar.name}</f:option>
+        </j:forEach>
+      </select>
+  </f:entry>
 
   <f:entry title="JVM Flags" field="jvmFlags">
   	<f:textbox/>
   </f:entry>
 
-  <f:entry title="SBT Flags" field="sbtFlags" >
+  <f:entry title="sbt Flags" field="sbtFlags" >
   	<f:textbox default="-Dsbt.log.noformat=true"/>
   </f:entry>