use newest tags

also better version parsing on master

Author: SimonCropp

GitFlowVersion/BranchClassifier.cs

@@ -2,7 +2,7 @@ namespace GitFlowVersion
 {
     using LibGit2Sharp;
 
-    public static class BranchClassifier
+    static class BranchClassifier
     {
 
         public static bool IsHotfix(this Branch branch)

GitFlowVersion/BranchFinders/MasterVersionFinder.cs

@@ -1,6 +1,5 @@
 namespace GitFlowVersion
 {
-    using System.Linq;
     using LibGit2Sharp;
 
     class MasterVersionFinder
@@ -13,7 +12,7 @@ public VersionAndBranch FindVersion()
             int major;
             int minor;
             int patch;
-            foreach (var tag in Repository.Tags.Where(tag => tag.Target == Commit).Reverse())
+            foreach (var tag in Repository.TagsByDate(Commit))
             {
                 if (ShortVersionParser.TryParse(tag.Name, out major, out minor, out patch))
                 {

GitFlowVersion/CachedVersion.cs

@@ -1,6 +1,6 @@
 namespace GitFlowVersion
 {
-    public class CachedVersion
+    class CachedVersion
     {
         public VersionAndBranch VersionAndBranch;
         public long Timestamp;

GitFlowVersion/DirectoryDateFinder.cs

@@ -3,7 +3,7 @@
     using System;
     using System.IO;
 
-    public static class DirectoryDateFinder
+    static class DirectoryDateFinder
     {
         public static long GetLastDirectoryWrite(string path)
         {

GitFlowVersion/LibGitExtensions.cs

@@ -5,7 +5,7 @@ namespace GitFlowVersion
     using System.Linq;
     using LibGit2Sharp;
 
-    public static class LibGitExtensions
+    static class LibGitExtensions
     {
 
         public static DateTimeOffset When(this Commit commit)
@@ -24,23 +24,33 @@ public static string Prefix(this Commit commit)
 
         public static SemanticVersion NewestSemVerTag(this IRepository repository, Commit commit)
         {
-            SemanticVersion highest = null;
-            foreach (var tag in repository.Tags.Where(tag => tag.Target == commit))
+            foreach (var tag in repository.TagsByDate(commit))
             {
                 SemanticVersion version;
-                if (!SemanticVersionParser.TryParse(tag.Name, out version))
+                if (SemanticVersionParser.TryParse(tag.Name, out version))
                 {
-                    continue;
+                    return version;
                 }
+            }
+            return null;
+        }
 
-                if (version.CompareTo(highest) > 0)
+        public static IEnumerable<Tag> TagsByDate(this IRepository repository, Commit commit)
+        {
+            return repository.Tags
+                .Where(tag => tag.Target == commit)
+                .OrderByDescending(tag =>
                 {
-                    highest = version;
-                }
-            }
-            return highest;
+                    if (tag.Annotation != null)
+                    {
+                        return tag.Annotation.Tagger.When;
+                    }
+                    //lightweight tags will not have an Annotation
+                    return commit.Committer.When;
+                });
         }
 
+
         public static IEnumerable<Commit> CommitsPriorToThan(this Branch branch, DateTimeOffset olderThan)
         {
             return branch.Commits.SkipWhile(c => c.When() > olderThan);

GitFlowVersion/MergeMessageParser.cs

@@ -3,7 +3,7 @@ namespace GitFlowVersion
     using System.Linq;
     using LibGit2Sharp;
 
-    public class MergeMessageParser
+    class MergeMessageParser
     {
         public static bool TryParse(Commit mergeCommit, out string versionPart)
         {
@@ -14,7 +14,7 @@ public static bool TryParse(Commit mergeCommit, out string versionPart)
                 return false;
             }
 
-            string message = mergeCommit.Message;
+            var message = mergeCommit.Message;
 
             string trimmed;
             if (message.StartsWith("Merge branch 'hotfix-"))

GitFlowVersion/Program.cs

@@ -6,7 +6,7 @@ namespace GitFlowVersion
     using System.IO;
     using System.Linq;
 
-    public class Program
+    class Program
     {
         static void Main()
         {

GitFlowVersion/SearchPath.cs

@@ -3,7 +3,7 @@
     using System;
     using System.IO;
 
-    public class SearchPath
+    class SearchPath
     {
         static bool isPathSet;
 

GitFlowVersion/ShortVersionParser.cs

@@ -2,7 +2,7 @@ namespace GitFlowVersion
 {
     using System;
 
-    public class ShortVersionParser
+    class ShortVersionParser
     {
 
         public static void Parse(string versionString, out int major, out int minor, out int patch)
@@ -31,14 +31,45 @@ public static void Parse(string versionString, out int major, out int minor, out
 
         public static bool TryParseMajorMinor(string versionString, out int major, out int minor)
         {
-            int patch;
+            major = 0;
+            minor = 0;
+            var strings = versionString.Split('.');
+            if (strings.Length == 2)
+            {
+                if (!int.TryParse(strings[0], out major))
+                {
+                    return false;
+                }
+
+                if (!int.TryParse(strings[1], out minor))
+                {
+                    return false;
+                }
+                return true;
+            }
 
-            if (!TryParse(versionString, out major, out minor, out patch))
+
+            if (strings.Length == 3)
             {
-                return false;
+                if (!int.TryParse(strings[0], out major))
+                {
+                    return false;
+                }
+
+                if (!int.TryParse(strings[1], out minor))
+                {
+                    return false;
+                }
+                int patch;
+                if (!int.TryParse(strings[2], out patch))
+                {
+                    return false;
+                }
+                return patch == 0;
             }
 
-            return patch == 0;
+
+            return false;
         }
 
         public static bool TryParse(string versionString, out int major, out int minor, out int patch)
@@ -74,4 +105,5 @@ static void Throw(string versionString)
             throw new Exception(string.Format("Could not parse version from '{0}' expected 'major.minor.patch'", versionString));
         }
     }
+
 }

GitFlowVersion/TeamCityVersionBuilder.cs

@@ -2,7 +2,7 @@
 {
     using System;
 
-    public class TeamCityVersionBuilder
+    class TeamCityVersionBuilder
     {
         public static string GenerateBuildVersion(VersionAndBranch versionAndBranch)
         {