You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2012/02/22 15:13:18 UTC
svn commit: r1292297 - in /karaf/trunk/shell:
commands/src/main/java/org/apache/karaf/shell/shell/
commands/src/main/resources/OSGI-INF/blueprint/
console/src/main/java/org/apache/karaf/shell/console/completer/
Author: iocanel
Date: Wed Feb 22 14:13:17 2012
New Revision: 1292297
URL: http://svn.apache.org/viewvc?rev=1292297&view=rev
Log:
[KARAF-1196] Implemented command-watch command which watches and refreshes the output of a command at a given interval. Modified CommandsCompleter to be usable as argument/option completer.
Added:
karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/WatchAction.java
Modified:
karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
Added: karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/WatchAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/WatchAction.java?rev=1292297&view=auto
==============================================================================
--- karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/WatchAction.java (added)
+++ karaf/trunk/shell/commands/src/main/java/org/apache/karaf/shell/shell/WatchAction.java Wed Feb 22 14:13:17 2012
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.karaf.shell.shell;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Option;
+import org.apache.karaf.shell.console.AbstractAction;
+
+@Command(scope = "shell", name = "command-watch", description = "Watches & refreshes the output of a command")
+public class WatchAction extends AbstractAction {
+
+ @Option(name = "-n", aliases = {"--interval"}, description = "The interval between executions of the command in seconds", required = false, multiValued = false)
+ private long interval = 1;
+
+ @Argument(index = 0, name = "command", description = "The command to watch / refresh", required = true, multiValued = true)
+ private String[] arguments;
+
+ CommandProcessor commandProcessor;
+ private ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
+
+ @Override
+ protected Object doExecute() throws Exception {
+ if (arguments == null || arguments.length == 0) {
+ System.err.println("Argument expected");
+ return null;
+ } else {
+ StringBuilder command = new StringBuilder();
+ for (String arg:arguments) {
+ command.append(arg).append(" ");
+ }
+ WatchTask watchTask = new WatchTask(commandProcessor, command.toString().trim());
+ executorService.scheduleAtFixedRate(watchTask, 0, interval, TimeUnit.SECONDS);
+ try {
+ int c = ' ';
+ while (c != 'q' && c != 'Q') {
+ c = System.in.read();
+ }
+ } finally {
+ executorService.shutdownNow();
+ watchTask.close();
+ return null;
+ }
+ }
+ }
+
+ public class WatchTask implements Runnable {
+
+ private final CommandProcessor processor;
+ private final String command;
+
+ CommandSession session;
+ ByteArrayOutputStream byteArrayOutputStream = null;
+ PrintStream printStream = null;
+
+ public WatchTask(CommandProcessor processor, String command) {
+ this.processor = processor;
+ this.command = command;
+ }
+
+ public void run() {
+ try {
+ byteArrayOutputStream = new ByteArrayOutputStream();
+ printStream = new PrintStream(byteArrayOutputStream);
+ session = commandProcessor.createSession(null, printStream, printStream);
+ String output = "";
+ session.execute(command);
+ output = byteArrayOutputStream.toString();
+ System.out.print("\33[2J");
+ System.out.print("\33[1;1H");
+ System.out.print(output);
+ System.out.flush();
+ byteArrayOutputStream.close();
+ session.close();
+ } catch (Exception e) {
+ //Ingore
+ }
+ }
+
+ public void close() throws IOException {
+ if (this.session != null) {
+ this.session.close();
+ }
+ if (this.byteArrayOutputStream != null) {
+ this.byteArrayOutputStream.close();
+ }
+ if (this.printStream != null) {
+ printStream.close();
+ }
+ }
+ }
+
+ public CommandProcessor getCommandProcessor() {
+ return commandProcessor;
+ }
+
+ public void setCommandProcessor(CommandProcessor commandProcessor) {
+ this.commandProcessor = commandProcessor;
+ }
+}
Modified: karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml?rev=1292297&r1=1292296&r2=1292297&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml (original)
+++ karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml Wed Feb 22 14:13:17 2012
@@ -82,8 +82,19 @@
<command>
<action class="org.apache.karaf.shell.shell.TailAction"/>
</command>
+ <command>
+ <action class="org.apache.karaf.shell.shell.WatchAction">
+ <property name="commandProcessor" ref="commandProcessor"/>
+ </action>
+ <completers>
+ <ref component-id="commandCompleter" />
+ <null/>
+ </completers>
+ </command>
</command-bundle>
+ <bean id="commandCompleter" class="org.apache.karaf.shell.console.completer.CommandsCompleter"/>
+
<bean class="org.osgi.util.tracker.BundleTracker" init-method="open"
destroy-method="close">
<argument ref="blueprintBundleContext" />
@@ -98,5 +109,7 @@
<reference-list id="infoProviders" interface="org.apache.karaf.shell.shell.info.InfoProvider"
availability="optional">
</reference-list>
+
+ <reference id="commandProcessor" interface="org.apache.felix.service.command.CommandProcessor"/>
</blueprint>
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java?rev=1292297&r1=1292296&r2=1292297&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java Wed Feb 22 14:13:17 2012
@@ -313,7 +313,8 @@ public class ArgumentCompleter implement
* enter "f bar" into the buffer, and move to after the "f"
* and hit TAB, we want "foo bar" instead of "foo bar".
*/
- if ((cursor != buffer.length()) && isDelimiter(buffer, cursor)) {
+
+ if ((buffer != null) && (cursor != buffer.length()) && isDelimiter(buffer, cursor)) {
for (int i = 0; i < candidates.size(); i++) {
String val = candidates.get(i);
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java?rev=1292297&r1=1292296&r2=1292297&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java Wed Feb 22 14:13:17 2012
@@ -31,6 +31,7 @@ import org.apache.felix.gogo.runtime.Com
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Function;
import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.jline.CommandSessionHolder;
/**
* Like the {@link org.apache.karaf.shell.console.completer.CommandsCompleter} but does not use OSGi but is
@@ -42,12 +43,19 @@ public class CommandsCompleter implement
private final List<Completer> completers = new ArrayList<Completer>();
private final Set<String> commands = new HashSet<String>();
+ public CommandsCompleter() {
+ this(CommandSessionHolder.getSession());
+ }
+
public CommandsCompleter(CommandSession session) {
this.session = session;
}
public int complete(String buffer, int cursor, List<String> candidates) {
+ if (session == null) {
+ session = CommandSessionHolder.getSession();
+ }
checkData();
int res = new AggregateCompleter(completers).complete(buffer, cursor, candidates);
Collections.sort(candidates);