Added ArgumentBuilder#transform

common-test/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>se.softhouse</groupId>
 		<artifactId>jargo-parent</artifactId>
-		<version>0.4.5-SNAPSHOT</version>
+		<version>0.4.15-SNAPSHOT</version>
 	</parent>
 	<artifactId>common-test</artifactId>
 	<description>Reusable classes to use from tests.</description>
@@ -32,7 +32,6 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.4.201502262128</version>
 				<executions>
 					<execution>
 						<!-- Not as strict requirements for test helping code -->

common-test/src/main/java/se/softhouse/common/testlib/Explanation.java

@@ -32,4 +32,6 @@ private Explanation()
 	 * make the test fail for the wrong reasons.
 	 */
 	public static final String FAIL_FAST = "fail-fast during configuration phase";
+
+	public static final String TESTING_INVALID_CODE = "Invalid code";
 }

common-test/src/main/java/se/softhouse/common/testlib/Launcher.java

@@ -16,15 +16,20 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.lang.reflect.Modifier.isPublic;
 import static java.lang.reflect.Modifier.isStatic;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
 
 import java.io.File;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -47,12 +52,14 @@ public static final class LaunchedProgram
 		private final String errors;
 		private final String output;
 		private final String debugInformation;
+		private final int exitCode;
 
-		private LaunchedProgram(String errors, String output, String debugInformation)
+		private LaunchedProgram(String errors, String output, String debugInformation, int exitCode)
 		{
 			this.errors = errors;
 			this.output = output;
 			this.debugInformation = debugInformation;
+			this.exitCode = exitCode;
 		}
 
 		/**
@@ -71,6 +78,14 @@ public String errors()
 			return errors;
 		}
 
+		/**
+		 * @return the <a href="https://en.wikipedia.org/wiki/Exit_status">exit code/status</a> of the finished program
+		 */
+		public int exitCode()
+		{
+			return exitCode;
+		}
+
 		/**
 		 * Returns information suitable to print in case of errors on a debug level
 		 */
@@ -91,25 +106,16 @@ private Launcher()
 	}
 
 	/**
-	 * Runs {@code classWithMainMethod} in a separate process using the system property
-	 * {@code java.home} to find java and {@code java.class.path} for the class path. This method
-	 * will wait until program execution has finished.
+	 * Like {@link #launch(Class, String...)} but with more configurable options
 	 * 
-	 * @param classWithMainMethod a class with a static "main" method
-	 * @param programArguments optional arguments to pass to the program
-	 * @return output/errors from the executed program
-	 * @throws IOException if an I/O error occurs while starting {@code classWithMainMethod} as a
-	 *             process
-	 * @throws InterruptedException if the thread starting the program is
-	 *             {@link Thread#interrupted()} while waiting for the program to finish
-	 * @throws IllegalArgumentException if {@code classWithMainMethod} doesn't have a public static
-	 *             main method
-	 * @throws SecurityException if it's not possible to validate the existence of a main method in
-	 *             {@code classWithMainMethod} (or if {@link SecurityManager#checkExec checkExec}
-	 *             fails)
+	 * @param envVariables variables to add to {@link ProcessBuilder#environment()}.
+	 * @param additionalVmArgs the vm args to pass in
 	 */
-	public static LaunchedProgram launch(Class<?> classWithMainMethod, String ... programArguments) throws IOException, InterruptedException
+	public static LaunchedProgram launch(List<String> additionalVmArgs, Map<String, String> envVariables, Class<?> classWithMainMethod,
+			String ... programArguments) throws IOException, InterruptedException
 	{
+		checkNotNull(additionalVmArgs);
+		checkNotNull(envVariables);
 		checkNotNull(programArguments);
 		try
 		{
@@ -130,11 +136,35 @@ public static LaunchedProgram launch(Class<?> classWithMainMethod, String ... pr
 
 		List<String> args = Lists.newArrayList(jvm, "-cp", classPath);
 		args.addAll(vmArgs);
+		args.addAll(additionalVmArgs);
 		args.add(classWithMainMethod.getName());
 		args.addAll(Arrays.asList(programArguments));
 
 		String debugInformation = "\njvm: " + jvm + "\nvm args: " + vmArgs + "\nclasspath: " + classPath;
-		return execute(args, debugInformation);
+		return execute(args, envVariables, debugInformation);
+	}
+
+	/**
+	 * Runs {@code classWithMainMethod} in a separate process using the system property
+	 * {@code java.home} to find java and {@code java.class.path} for the class path. This method
+	 * will wait until program execution has finished.
+	 * 
+	 * @param classWithMainMethod a class with a static "main" method
+	 * @param programArguments optional arguments to pass to the program
+	 * @return output/errors from the executed program
+	 * @throws IOException if an I/O error occurs while starting {@code classWithMainMethod} as a
+	 *             process
+	 * @throws InterruptedException if the thread starting the program is
+	 *             {@link Thread#interrupted()} while waiting for the program to finish
+	 * @throws IllegalArgumentException if {@code classWithMainMethod} doesn't have a public static
+	 *             main method
+	 * @throws SecurityException if it's not possible to validate the existence of a main method in
+	 *             {@code classWithMainMethod} (or if {@link SecurityManager#checkExec checkExec}
+	 *             fails)
+	 */
+	public static LaunchedProgram launch(Class<?> classWithMainMethod, String ... programArguments) throws IOException, InterruptedException
+	{
+		return launch(emptyList(), emptyMap(), classWithMainMethod, programArguments);
 	}
 
 	/**
@@ -151,20 +181,34 @@ public static LaunchedProgram launch(Class<?> classWithMainMethod, String ... pr
 	 */
 	public static LaunchedProgram launch(String program, String ... programArguments) throws IOException, InterruptedException
 	{
-		return execute(Lists.asList(program, programArguments), "Failed to launch " + program);
+		return execute(Lists.asList(program, programArguments), emptyMap(), "Failed to launch " + program);
 	}
 
-	private static LaunchedProgram execute(List<String> args, String debugInformation) throws IOException, InterruptedException
+	/**
+	 * Different JDKs behave differently, to have consistent results, let's clean it away
+	 * No way to turn it off either: https://bugs.openjdk.java.net/browse/JDK-8039152
+	 */
+	private static final Pattern JVM_OUTPUT_CLEANER = Pattern.compile("Picked up _JAVA_OPTIONS.*\n");
+
+	private static LaunchedProgram execute(List<String> args, Map<String, String> envVariables, String debugInformation)
+			throws IOException, InterruptedException
 	{
-		Process program = new ProcessBuilder().command(args).start();
+		ProcessBuilder processBuilder = new ProcessBuilder().command(args);
+		processBuilder.environment().putAll(envVariables);
+		Process program = processBuilder.start();
 		Future<String> stdout = Streams.readAsynchronously(program.getInputStream());
 		Future<String> stderr = Streams.readAsynchronously(program.getErrorStream());
-		program.waitFor();
+		int exitCode = program.waitFor();
 		try
 		{
 			String output = stdout.get();
 			String errors = stderr.get();
-			return new LaunchedProgram(errors, output, debugInformation);
+			Matcher matcher = JVM_OUTPUT_CLEANER.matcher(errors);
+			if(matcher.find())
+			{
+				errors = matcher.replaceFirst("");
+			}
+			return new LaunchedProgram(errors, output, debugInformation, exitCode);
 		}
 		catch(ExecutionException e)
 		{

common-test/src/test/java/se/softhouse/common/testlib/EnumTesterTest.java

@@ -22,6 +22,8 @@
 import com.google.common.testing.NullPointerTester;
 import com.google.common.testing.NullPointerTester.Visibility;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 public class EnumTesterTest
 {
 	@Test
@@ -55,11 +57,12 @@ private enum InvalidEnum
 		ONE,
 		TWO;
 
-		@Override
+	@Override
 		public String toString()
 		{
 			return TWO.name();
 		}
+
 	}
 
 	@Test
@@ -78,18 +81,17 @@ public void testThatInvalidToStringIsDetected()
 		}
 	}
 
-	private enum InvalidValueOfEnum
+	private enum InvalidValueOfEnum{ONE,TWO
 	{
-		ONE,
-		TWO
-		{
-			@Override
+
+	@Override
+			@SuppressFBWarnings(value = "NP_TOSTRING_COULD_RETURN_NULL", justification = Explanation.TESTING_INVALID_CODE)
 			public String toString()
 			{
 				return null;
 			}
-		};
-	}
+
+	};}
 
 	@Test
 	public void testThatPackageProtectedValueOfIsNotCallable() throws ClassNotFoundException

config/code-formatter.xml

@@ -72,7 +72,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="150"/>
 <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
@@ -156,7 +156,7 @@
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line_shifted"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="80"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="do not insert"/>
@@ -178,7 +178,7 @@
 <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="9"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="10"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
@@ -200,7 +200,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="9"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="10"/>
 <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
@@ -270,7 +270,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="9"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="10"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
@@ -312,4 +312,5 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="do not insert"/>
 </profile>
+
 </profiles>

config/eclipse.txt

@@ -1,9 +1,6 @@
-Recommended plugins:
-Workspace mechanic (http://code.google.com/a/eclipselabs.org/p/workspacemechanic/)
-From Marketplace:
-AnyEdit Tools
-EclEmma
-Maven Integration for eclipse (m2eclipse)
+Recommended plugins from Marketplace:
+Workspace mechanic
+Spotbugs
 
 NOTE: As the workspace mechanic tasks modifies workspace global settings it's 
 recommended to develop in a fresh workspace.

jargo-addons/pom.xml

@@ -3,15 +3,15 @@
 	<parent>
 		<groupId>se.softhouse</groupId>
 		<artifactId>jargo-parent</artifactId>
-		<version>0.4.5-SNAPSHOT</version>
+		<version>0.4.15-SNAPSHOT</version>
 	</parent>
 	<artifactId>jargo-addons</artifactId>
 	<description>Code that could have been added to jargo if it didn't require third party dependencies.</description>
 	<dependencies>
 		<dependency>
 			<groupId>se.softhouse</groupId>
 			<artifactId>jargo</artifactId>
-			<version>0.4.5-SNAPSHOT</version>
+			<version>0.4.15-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>
@@ -22,14 +22,14 @@
 		<dependency>
 			<groupId>se.softhouse</groupId>
 			<artifactId>common-test</artifactId>
-			<version>0.4.5-SNAPSHOT</version>
+			<version>0.4.15-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- Reuses test classes in jargo without having to publish them on maven central -->
 		<dependency>
 			<groupId>se.softhouse</groupId>
 			<artifactId>jargo</artifactId>
-			<version>0.4.5-SNAPSHOT</version>
+			<version>0.4.15-SNAPSHOT</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>

jargo/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>se.softhouse</groupId>
 		<artifactId>jargo-parent</artifactId>
-		<version>0.4.5-SNAPSHOT</version>
+		<version>0.4.15-SNAPSHOT</version>
 	</parent>
 	<artifactId>jargo</artifactId>
 	<description>An argument and options parser for java</description>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>se.softhouse</groupId>
 			<artifactId>common-test</artifactId>
-			<version>0.4.5-SNAPSHOT</version>
+			<version>0.4.15-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>