Allowing install-plugin to load a file from standard input so as to work without -remoting.

core/src/main/java/hudson/cli/InstallPluginCommand.java

@@ -42,6 +42,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Set;
+import org.apache.commons.io.FileUtils;
 
 /**
  * Installs a plugin either from a file, an URL, or from update center.
@@ -55,14 +56,15 @@ public class InstallPluginCommand extends CLICommand {
         return Messages.InstallPluginCommand_ShortDescription();
     }
 
-    @Argument(metaVar="SOURCE",required=true,usage="If this points to a local file, that file will be installed. " +
-            "If this is an URL, Jenkins downloads the URL and installs that as a plugin." +
-            "Otherwise the name is assumed to be the short name of the plugin in the existing update center (like \"findbugs\")," +
+    @Argument(metaVar="SOURCE",required=true,usage="If this points to a local file (‘-remoting’ mode only), that file will be installed. " +
+            "If this is an URL, Jenkins downloads the URL and installs that as a plugin. " +
+            "If it is the string ‘=’, the file will be read from standard input of the command, and ‘-name’ must be specified. " +
+            "Otherwise the name is assumed to be the short name of the plugin in the existing update center (like ‘findbugs’), " +
             "and the plugin will be installed from the update center.")
     public List<String> sources = new ArrayList<String>();
 
     @Option(name="-name",usage="If specified, the plugin will be installed as this short name (whereas normally the name is inferred from the source name automatically).")
-    public String name;
+    public String name; // TODO better to parse out Short-Name from the manifest and deprecate this option
 
     @Option(name="-restart",usage="Restart Jenkins upon successful installation.")
     public boolean restart;
@@ -80,6 +82,19 @@ public class InstallPluginCommand extends CLICommand {
         }
 
         for (String source : sources) {
+            if (source.equals("=")) {
+                if (name == null) {
+                    throw new IllegalArgumentException("-name required when using -source -");
+                }
+                stdout.println(Messages.InstallPluginCommand_InstallingPluginFromStdin());
+                File f = getTargetFile(name);
+                FileUtils.copyInputStreamToFile(stdin, f);
+                if (dynamicLoad) {
+                    pm.dynamicLoad(f);
+                }
+                continue;
+            }
+
             // is this a file?
             if (channel!=null) {
                 FilePath f = new FilePath(channel, source);

core/src/main/resources/hudson/cli/Messages.properties

 InstallPluginCommand.DidYouMean={0} looks like a short plugin name. Did you mean \u2018{1}\u2019?
 InstallPluginCommand.InstallingFromUpdateCenter=Installing {0} from update center
 InstallPluginCommand.InstallingPluginFromLocalFile=Installing a plugin from local file: {0}
+InstallPluginCommand.InstallingPluginFromStdin=Installing a plugin from standard input
 InstallPluginCommand.InstallingPluginFromUrl=Installing a plugin from {0}
 InstallPluginCommand.NoUpdateCenterDefined=Note that no update center is defined in this Jenkins.
 InstallPluginCommand.NoUpdateDataRetrieved=No update center data is retrieved yet from: {0}

test/src/test/java/hudson/cli/InstallPluginCommandTest.java

+/*
+ * The MIT License
+ *
+ * Copyright 2017 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.cli;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.Rule;
+import org.jvnet.hudson.test.JenkinsRule;
+
+public class InstallPluginCommandTest {
+
+    @Rule
+    public JenkinsRule r = new JenkinsRule();
+
+    @Test
+    public void fromStdin() throws Exception {
+        assertNull(r.jenkins.getPluginManager().getPlugin("token-macro"));
+        assertThat(new CLICommandInvoker(r, "install-plugin").
+                withStdin(InstallPluginCommandTest.class.getResourceAsStream("/plugins/token-macro.hpi")).
+                invokeWithArgs("-name", "token-macro", "-deploy", "="),
+            CLICommandInvoker.Matcher.succeeded());
+        assertNotNull(r.jenkins.getPluginManager().getPlugin("token-macro"));
+    }
+
+}