Fix fsprojects#1722: added a username and password option scripting

This allows add-credentials to supply username and password from the
command line.

src/Paket.Core/ConfigFile.fs

@@ -193,13 +193,17 @@ let AddToken (source, token) =
         | None -> () 
     }
 
-let askAndAddAuth (source : string) (username : string) = 
+let askAndAddAuth (source : string) (username : string) (password : string) = 
     let username =
         if username = "" then
             Console.Write "Username: "
             Console.ReadLine()
         else 
             username
 
-    let password = readPassword "Password: "
+    let password = 
+        if password = "" then
+            readPassword "Password: "
+        else
+            password
     AddCredentials (source, username, password)

src/Paket.Core/PublicAPI.fs

@@ -140,10 +140,10 @@ type Dependencies(dependenciesFileName: string) =
                                               projectName, installAfter))
 
     /// Adds credentials for a Nuget feed
-    member this.AddCredentials(source: string, username: string) : unit =
+    member this.AddCredentials(source: string, username: string, password : string) : unit =
         Utils.RunInLockedAccessMode(
             this.RootPath,
-            fun () -> ConfigFile.askAndAddAuth source username |> returnOrFail )
+            fun () -> ConfigFile.askAndAddAuth source username password |> returnOrFail )
 
     /// Adds a token for a source
     member this.AddToken(source : string, token : string) : unit =

src/Paket/Commands.fs

@@ -92,12 +92,16 @@ with
 type ConfigArgs =
     | [<CustomCommandLine("add-credentials")>] AddCredentials of string
     | [<CustomCommandLine("add-token")>] AddToken of string * string
+    | Username of string
+    | Password of string
 with
     interface IArgParserTemplate with
         member this.Usage =
             match this with
             | AddCredentials(_) -> "Add credentials for the specified NuGet feed."
             | AddToken(_) -> "Add token for the specified source."
+            | Username(_) -> "Provide a username (for scripting)"
+            | Password(_) -> "provide a password on the commandline (for scripting)"
 
 type ConvertFromNugetArgs =
     | [<AltCommandLine("-f")>] Force

src/Paket/Paket.fsproj

@@ -28,8 +28,9 @@
     <DocumentationFile>
     </DocumentationFile>
     <StartAction>Project</StartAction>
-    <StartProgram>paket.exe</StartProgram>
-    <StartAction>Project</StartAction>
+    <StartProgram>D:\develop\github\Paket\bin\paket.exe</StartProgram>
+    <StartAction>Program</StartAction>
+    <StartArguments>add-credentials http://blub --batch blub bli</StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

src/Paket/Program.fs

@@ -100,12 +100,9 @@ let config (results : ParseResults<_>) =
     | true, _ -> 
       let args = results.GetResults <@ ConfigArgs.AddCredentials @>
       let source = args.Item 0
-      let username =
-          if(args.Length > 1) then
-              args.Item 1
-          else
-              ""
-      Dependencies.Locate().AddCredentials(source, username)
+      let username, password = results.GetResult (<@ ConfigArgs.Username @>, ""), results.GetResult (<@ ConfigArgs.Password @>, "") 
+
+      Dependencies.Locate().AddCredentials(source, username, password)
     | _, true ->
       let args = results.GetResults <@ ConfigArgs.AddToken @>
       let source, token = args.Item 0