Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prompt text is read after each command exec

Browse Source 
allows the prompt to be changed in dynamic envs
This commit is contained in:
Costin Leau
2012-07-29 19:50:30 +03:00
parent fc12a15bbf
commit 297c60f5ab
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/shell/core/JLineShell.java
View File

@@ -44,14 +44,15 @@ import jline.WindowsTerminal;
import org.apache.commons.io.input.ReversedLinesFileReader;
import org.springframework.shell.event.ShellStatus;
import org.springframework.shell.event.ShellStatusListener;
import org.springframework.shell.event.ShellStatus.Status;
import org.springframework.shell.event.ShellStatusListener;
import org.springframework.shell.support.util.Assert;
import org.springframework.shell.support.util.ClassUtils;
import org.springframework.shell.support.util.IOUtils;
import org.springframework.shell.support.util.OsUtils;
import org.springframework.shell.support.util.StringUtils;
import org.springframework.shell.support.util.VersionUtils;
import org.springframework.util.ObjectUtils;
/**
@@ -463,6 +464,7 @@ public abstract class JLineShell extends AbstractShell implements CommandMarker,
public void promptLoop() {
setShellStatus(Status.USER_INPUT);
String line;
String prompt = getPromptText();
try {
while (exitShellRequest == null && (reader != null && ((line = reader.readLine()) != null))) {
@@ -474,6 +476,12 @@ public abstract class JLineShell extends AbstractShell implements CommandMarker,
}
executeCommand(line);
String newPrmpt = getPromptText();
if (!ObjectUtils.nullSafeEquals(prompt, newPrmpt)) {
prompt = newPrmpt;
setPromptPath(null);
}
//System.out.println("executed command:" + line);
}
} catch (IOException ioe) {

2
src/test/java/org/springframework/shell/plugin/support/DefaultPromptProviderTest.java
View File

@@ -52,6 +52,6 @@ public class DefaultPromptProviderTest {
*/
@Test
public void testGetPromptText() {
assertEquals("spring-shell>", prompt.getPrompt());
assertTrue(prompt.getPrompt().startsWith("spring-shell>"));
}
}