Adds config to handle remote commands. See issues #10 and #11

profesorfalken · Oct 12, 2016 · 74b10eb · 74b10eb
1 parent bd5ad47
commit 74b10eb
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/src/main/java/com/profesorfalken/jpowershell/PowerShell.java b/src/main/java/com/profesorfalken/jpowershell/PowerShell.java
@@ -62,6 +62,7 @@ public class PowerShell {
     private int maxThreads = 3;
     private int waitPause = 10;
     private long maxWait = 10000;
+    private boolean remoteMode = false;
 
     //Variables for script mode
     private boolean scriptMode = false;
@@ -95,6 +96,7 @@ public PowerShell configuration(Map<String, String> config) {
             this.maxThreads = Integer.valueOf((config != null && config.get("maxThreads") != null) ? config.get("maxThreads") : PowerShellConfig.getConfig().getProperty("maxThreads"));
             this.waitPause = Integer.valueOf((config != null && config.get("waitPause") != null) ? config.get("waitPause") : PowerShellConfig.getConfig().getProperty("waitPause"));
             this.maxWait = Long.valueOf((config != null && config.get("maxWait") != null) ? config.get("maxWait") : PowerShellConfig.getConfig().getProperty("maxWait"));
+            this.remoteMode = Boolean.valueOf((config != null && config.get("remoteMode") != null) ? config.get("remoteMode") : PowerShellConfig.getConfig().getProperty("remoteMode"));
         } catch (NumberFormatException nfe) {
             Logger.getLogger(PowerShell.class.getName()).log(Level.SEVERE, "Could not read configuration. Use default values.", nfe);
         }
@@ -157,6 +159,10 @@ public PowerShellResponse executeCommand(String command) {
 
         Future<String> result = threadpool.submit(commandProcessor);
         Future<String> resultError = threadpool.submit(commandProcessorError);
+
+        if (this.remoteMode) {
+        	command  = completeRemoteCommand(command);
+        }
 
         //Launch command
         commandWriter.println(command);
@@ -325,4 +331,8 @@ private void waitUntilClose(Future<String> task) throws InterruptedException {
             closingTime += this.waitPause;
         }
     }
+
+    private String completeRemoteCommand(String command) {
+    	return command + ";Write-Host \"\"";
+    }
 }
diff --git a/src/main/resources/jpowershell.properties b/src/main/resources/jpowershell.properties
@@ -14,4 +14,5 @@
 
 maxThreads=3
 waitPause=10
-maxWait=10000
+maxWait=10000
+remoteMode=false
diff --git a/src/test/java/com/profesorfalken/jpowershell/PowerShellTest.java b/src/test/java/com/profesorfalken/jpowershell/PowerShellTest.java
@@ -365,6 +365,25 @@ public void testTimeout() throws Exception {
 
         }
     }
+
+    //@Test
+    public void testRemote() throws Exception {
+        System.out.println("testRemote");
+        if (OSDetector.isWindows()) {
+            PowerShell powerShell = PowerShell.openSession();
+            Map<String, String> config = new HashMap<String, String>();
+            config.put("remoteMode", "true");            
+            PowerShellResponse response = powerShell
+            		.configuration(config)
+            		.executeCommand("Invoke-command -ComputerName leon {(Get-Service W32Time).WaitForStatus('Running','02:00:00')}");
+
+            System.out.println("Output:" + response.getCommandOutput());
+
+            Assert.assertFalse(response.isError());
+
+            powerShell.close();
+        }
+    }
 
     @Test
     public void testLongScript() throws Exception {