Merge pull request #11 from georgevella/feature/shortname_fix

Feature/shortname fix
rebus-org · Nov 30, 2016 · 09a627d · 09a627d
2 parents 5e8b50f + 80b3ca5
commit 09a627d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/GoCommando.Tests/TestCommand.cs b/GoCommando.Tests/TestCommand.cs
@@ -25,10 +25,26 @@ public void CanCorrectlyHandleDifferentAlternativeSwitchFormatsFoundInOneSingleT
             Assert.That(bimseInstance.Switch, Is.EqualTo("value2"));
         }
 
+        [TestCase("-s:value2")]
+        [TestCase("-s=value2")]
+        [TestCase(@"-s""value2""")]
+        public void CanCorrectlyHandleDifferentAlternativeSwitchFormatsFoundInOneSingleTokenOnly_Shortname(string switchText)
+        {
+            var settings = new Settings();
+            var invoker = new CommandInvoker("bimse", settings, new Bimse());
+            var arguments = Go.Parse(new[] { switchText }, settings);
+
+            invoker.Invoke(arguments.Switches, EnvironmentSettings.Empty);
+
+            var bimseInstance = (Bimse)invoker.CommandInstance;
+
+            Assert.That(bimseInstance.Switch, Is.EqualTo("value2"));
+        }
+
         [Command("bimse")]
         class Bimse : ICommand
         {
-            [Parameter("switch")]
+            [Parameter("switch", shortName: "s")]
             public string Switch { get; set; }
 
             public void Run()

diff --git a/GoCommando/Internals/CommandInvoker.cs b/GoCommando/Internals/CommandInvoker.cs
@@ -265,7 +265,7 @@ static bool CanBeResolvedFromEnvironmentSettings(EnvironmentSettings environment
 
         static bool CanBeResolvedFromSwitches(IEnumerable<Switch> switches, Parameter p)
         {
-            return switches.Any(s => s.Key == p.Name);
+            return switches.Any(s => p.MatchesKey(s.Key));
         }
     }
 }