Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 502:Scriptbuilder functions are not tolerant of missing final newlines

This commit is contained in:
Adrian Cole 2011-07-28 02:21:47 -07:00
parent 32fe309424
commit 27c45dce0d
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/util/Utils.java
View File

@ -133,8 +133,10 @@ public class Utils {
public static String writeFunctionFromResource(String function, OsFamily family) {
try {
return CharStreams.toString(Resources.newReaderSupplier(Resources.getResource(Utils.class, String
String toReturn = CharStreams.toString(Resources.newReaderSupplier(Resources.getResource(Utils.class, String
.format("/functions/%s.%s", function, ShellToken.SH.to(family))), Charsets.UTF_8));
String lf = ShellToken.LF.to(family);
return toReturn.endsWith(lf) ? toReturn : new StringBuilder(toReturn).append(lf).toString();
} catch (IOException e) {
throw new FunctionNotFoundException(function, family, e);
}

9
scriptbuilder/src/test/java/org/jclouds/scriptbuilder/util/UtilsTest.java
View File

@ -39,6 +39,15 @@ public class UtilsTest {
"hello world");
}
public void testWriteFunctionFromResourceAddsNewlineUNIX() {
assertEquals(Utils.writeFunctionFromResource("nonewline", OsFamily.UNIX), "foo\n");
}
public void testWriteFunctionFromResourceAddsNewlineWINDOWS() {
assertEquals(Utils.writeFunctionFromResource("nonewline", OsFamily.WINDOWS), "foo\r\n");
}
public void testWriteVariableExportersUNIX() {
assertEquals(Utils.writeVariableExporters(ImmutableMap.of("mavenOpts",
"-Xms128m -Xmx256m -XX:+HeapDumpOnOutOfMemoryError"), OsFamily.UNIX),

1
scriptbuilder/src/test/resources/functions/nonewline.cmd Normal file
View File

@ -0,0 +1 @@
foo

1
scriptbuilder/src/test/resources/functions/nonewline.sh Normal file
View File

@ -0,0 +1 @@
foo