Add handling for versions generated with git-describe. Fixes #207

lib/exrm/utils.ex

@@ -154,18 +154,29 @@ defmodule ReleaseManager.Utils do
   compare, but can fall back to regular string compare.
   """
   def sort_versions(versions) do
-    versions |> Enum.sort(
-      fn v1, v2 ->
+    versions
+    |> Enum.map(fn ver ->
+        # Special handling for git-describe versions
+        compared = case Regex.named_captures(~r/(?<ver>\d+\.\d+\.\d+)-(?<commits>\d+)-(?<sha>[A-Ga-g0-9]+)/, ver) do
+          nil -> ver
+          %{"ver" => version, "commits" => n, "sha" => sha} -> <<version::binary, ?+, n::binary, ?-, sha::binary>>
+        end
+        {ver, compared}
+      end)
+    |> Enum.sort(
+      fn {_, v1}, {_, v2} ->
         case { parse_version(v1), parse_version(v2) } do
           {{:semantic, v1}, {:semantic, v2}} ->
             case Version.compare(v1, v2) do
               :gt -> true
-              _   -> false
+              :eq -> v1 > v2
+              :lt -> false
             end;
           {{_, v1}, {_, v2}} ->
             v1 >  v2
         end
       end)
+    |> Enum.map(fn {v, _} -> v end)
   end
 
   defp parse_version(ver) do

test/utils_test.exs

@@ -98,4 +98,10 @@ defmodule UtilsTest do
     assert ["1.3", "1.2", "1.1"] = Utils.sort_versions(["1.1", "1.3", "1.2"])
   end
 
+  test "can compare complex versions" do
+    expected = ["0.0.2", "0.0.1-2-a1d2g3f", "0.0.1-1-deadbeef", "0.0.1"]
+    result = Utils.sort_versions(["0.0.2", "0.0.1-1-deadbeef", "0.0.1-2-a1d2g3f", "0.0.1"])
+    assert expected == result
+  end
+
 end