improve argument parsing

forki · Apr 17, 2016 · Mar 31, 2016 · Mar 31, 2016 · Mar 31, 2016 · Apr 3, 2016
commit 7f9a01c5e0a660fe86627b4e81305c3873c31ef6
diff --git a/src/Paket.Bootstrapper/ArgumentParser.cs b/src/Paket.Bootstrapper/ArgumentParser.cs
@@ -37,24 +37,16 @@ public static BootstrapperOptions ParseArgumentsAndConfigurations(IEnumerable<st
 
             var commandArgs = arguments.ToList();
 
-            if (commandArgs.Contains(CommandArgs.PreferNuget))
+            if (commandArgs.Contains(CommandArgs.PreferNuget) || appSettings.GetKey(AppSettingKeys.PreferNugetAppSettingsKey).ToLowerSafe() == "true")
             {
                 options.PreferNuget = true;
                 commandArgs.Remove(CommandArgs.PreferNuget);
             }
-            else if (appSettings.GetKey(AppSettingKeys.PreferNugetAppSettingsKey).ToLowerSafe() == "true")
-            {
-                options.PreferNuget = true;
-            }
-            if (commandArgs.Contains(CommandArgs.ForceNuget))
+            if (commandArgs.Contains(CommandArgs.ForceNuget) || appSettings.GetKey(AppSettingKeys.ForceNugetAppSettingsKey).ToLowerSafe() == "true")
             {
                 options.ForceNuget = true;
                 commandArgs.Remove(CommandArgs.ForceNuget);
             }
-            else if (appSettings.GetKey(AppSettingKeys.ForceNugetAppSettingsKey).ToLowerSafe() == "true")
-            {
-                options.ForceNuget = true;
-            }
             if (commandArgs.Contains(CommandArgs.Silent))
             {
                 options.Silent = true;
@@ -101,10 +93,12 @@ private static IEnumerable<string> EvaluateDownloadOptions(DownloadArguments dow
                 {
                     ignorePrerelease = false;
                     latestVersion = String.Empty;
+                    commandArgs.Remove(CommandArgs.Prerelease);
                 }
                 else
                 {
                     latestVersion = commandArgs[0];
+                    commandArgs.Remove(commandArgs[0]);
                 }
             }
 
@@ -114,6 +108,7 @@ private static IEnumerable<string> EvaluateDownloadOptions(DownloadArguments dow
             downloadArguments.NugetSource = nugetSource;
             downloadArguments.DoSelfUpdate = doSelfUpdate;
             downloadArguments.Target = target;
+            downloadArguments.Folder = folder;
             return commandArgs;
         }
 

diff --git a/src/Paket.Bootstrapper/DownloadArguments.cs b/src/Paket.Bootstrapper/DownloadArguments.cs
@@ -4,7 +4,7 @@ namespace Paket.Bootstrapper
 {
     public class DownloadArguments
     {
-        public string Folder { get; private set; }
+        public string Folder { get; set; }
         public string Target { get; set; }
         public string NugetSource { get; set; }
         public bool DoSelfUpdate { get; set; }

diff --git a/src/Paket.Bootstrapper/Program.cs b/src/Paket.Bootstrapper/Program.cs
@@ -21,7 +21,7 @@ static void Main(string[] args)
 
             var options = ArgumentParser.ParseArgumentsAndConfigurations(args, ConfigurationManager.AppSettings, Environment.GetEnvironmentVariables());
             if (!options.Silent && options.UnprocessedCommandArgs.Any())
-                Console.WriteLine("Ignoring the following unknown arguments: {0}", String.Join(", ", options.UnprocessedCommandArgs));
+                Console.WriteLine("Ignoring the following unknown argument(s): {0}", String.Join(", ", options.UnprocessedCommandArgs));
 
             var effectiveStrategy = GetEffectiveDownloadStrategy(options.DownloadArguments, options.PreferNuget, options.ForceNuget);
 

diff --git a/tests/Paket.Bootstrapper.Tests/ArgumentParserTests.cs b/tests/Paket.Bootstrapper.Tests/ArgumentParserTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
@@ -36,7 +35,7 @@ public void EmptyArguments_GetDefault()
             Assert.That(result.UnprocessedCommandArgs, Is.Empty);
             Assert.That(result.DownloadArguments, Is.Not.Null);
             Assert.That(result.DownloadArguments.DoSelfUpdate, Is.False);
-            Assert.That(result.DownloadArguments.Folder, Is.Null);
+            Assert.That(result.DownloadArguments.Folder, Is.Not.Null);
             Assert.That(result.DownloadArguments.IgnoreCache, Is.False);
             Assert.That(result.DownloadArguments.IgnorePrerelease, Is.True);
             Assert.That(result.DownloadArguments.LatestVersion, Is.Empty);
@@ -164,6 +163,7 @@ public void Prerelease()
 
             //assert
             Assert.That(result.DownloadArguments.IgnorePrerelease, Is.False);
+            Assert.That(result.UnprocessedCommandArgs, Is.Empty);
         }
 
         [Test]
@@ -188,6 +188,7 @@ public void LatestVersion()
 
             //assert
             Assert.That(result.DownloadArguments.LatestVersion, Is.EqualTo("1.0"));
+            Assert.That(result.UnprocessedCommandArgs, Is.Empty);
         }
 
         [Test]
@@ -210,7 +211,7 @@ public void LeftoverCommandArgs()
             //arrange
 
             //act
-            var result = ArgumentParser.ParseArgumentsAndConfigurations(new[] { "leftover" }, null, null);
+            var result = ArgumentParser.ParseArgumentsAndConfigurations(new[] { "2.22", "leftover" }, null, null);
 
             //assert
             Assert.That(result.UnprocessedCommandArgs, Is.Not.Empty.And.EqualTo(new[] { "leftover" }));