More reliable latest tag handling

stackriot-labs · Feb 15, 2019 · 3efe913 · 3efe913
1 parent 9eddf75
commit 3efe913
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/AppGet.Manifest.Tests/PackageManifestTests.cs b/src/AppGet.Manifest.Tests/PackageManifestTests.cs
@@ -40,7 +40,9 @@ public void print_sample_manifest()
 
         [TestCase("name", null, ExpectedResult = "name")]
         [TestCase("name", "latest", ExpectedResult = "name")]
+        [TestCase("name", "latest     ", ExpectedResult = "name")]
         [TestCase("name", "LATEST", ExpectedResult = "name")]
+        [TestCase("name   ", "", ExpectedResult = "name")]
         [TestCase("name", "", ExpectedResult = "name")]
         [TestCase("name", "1", ExpectedResult = "name_1")]
         public string get_filename(string id, string tag)

diff --git a/src/AppGet.Manifest/PackageManifest.cs b/src/AppGet.Manifest/PackageManifest.cs
@@ -51,7 +51,8 @@ public string ToYaml()
         public string GetFileName()
         {
             var tag = Tag?.Trim().ToLower();
-            return IsLatest ? $"{Id}" : $"{Id}_{tag}";
+            var id = Id.Trim().ToLower();
+            return IsLatest ? $"{id}" : $"{id}_{tag}";
         }
     }
 

diff --git a/src/AppGet.Manifest/TagHelper.cs b/src/AppGet.Manifest/TagHelper.cs
@@ -15,7 +15,7 @@ private static int IndexOfTag(string text)
 
         public static bool IsLatest(string tag)
         {
-            return tag == null || tag == PackageManifest.LATEST_TAG;
+            return string.IsNullOrWhiteSpace(tag) || tag.Trim().ToLowerInvariant() == PackageManifest.LATEST_TAG;
         }
 
         private static string ParseTarget(string input)