From 28e402a113e26f16249c5ba35946a039297f5f16 Mon Sep 17 00:00:00 2001
From: Andy Davidoff <andy+github@disruptek.com>
Date: Sat, 2 Nov 2019 23:12:21 -0400
Subject: [PATCH] 1.8.4: version values now uint

---
 bump.nim        | 18 +++++++++---------
 bump.nimble     |  2 +-
 tests/tbump.nim | 22 +++++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/bump.nim b/bump.nim
index f740d55..4912e29 100644
--- a/bump.nim
+++ b/bump.nim
@@ -11,9 +11,9 @@ from macros import nil
 
 type
   Version* = tuple
-    major: int
-    minor: int
-    patch: int
+    major: uint
+    minor: uint
+    patch: uint
 
   Target* = tuple
     repo: string
@@ -173,20 +173,20 @@ proc parseVersion*(nimble: string): Option[Version] =
     if dotted.len != 3:
       continue
     try:
-      result = (major: dotted[0].parseInt,
-                minor: dotted[1].parseInt,
-                patch: dotted[2].parseInt).some
+      result = (major: dotted[0].parseUInt,
+                minor: dotted[1].parseUInt,
+                patch: dotted[2].parseUInt).some
     except ValueError:
       discard
 
 proc bumpVersion*(ver: Version; major, minor, patch = false): Option[Version] =
   ## increment the version by the specified metric
   if major:
-    result = (ver.major + 1, 0, 0).some
+    result = (ver.major + 1'u, 0'u, 0'u).some
   elif minor:
-    result = (ver.major, ver.minor + 1, 0).some
+    result = (ver.major, ver.minor + 1'u, 0'u).some
   elif patch:
-    result = (ver.major, ver.minor, ver.patch + 1).some
+    result = (ver.major, ver.minor, ver.patch + 1'u).some
 
 proc withCrazySpaces*(version: Version; line = ""): string =
   ## insert a new version into a line which may have "crazy spaces"
diff --git a/bump.nimble b/bump.nimble
index ed6163d..52aa149 100644
--- a/bump.nimble
+++ b/bump.nimble
@@ -1,4 +1,4 @@
-version = "1.8.3"
+version = "1.8.4"
 author = "disruptek"
 description = "a tiny tool to bump nimble versions"
 license = "MIT"
diff --git a/tests/tbump.nim b/tests/tbump.nim
index eff7a5c..e1e4b07 100644
--- a/tests/tbump.nim
+++ b/tests/tbump.nim
@@ -7,14 +7,14 @@ import bump
 suite "bump":
   setup:
     let
-      ver123 {.used.} = (major: 1, minor: 2, patch: 3)
-      ver155 {.used.} = (major: 1, minor: 5, patch: 5)
-      ver170 {.used.} = (major: 1, minor: 7, patch: 0)
-      ver171 {.used.} = (major: 1, minor: 7, patch: 1)
-      ver456 {.used.} = (major: 4, minor: 5, patch: 6)
-      ver457 {.used.} = (major: 4, minor: 5, patch: 7)
-      ver789 {.used.} = (major: 7, minor: 8, patch: 9)
-      ver799 {.used.} = (major: 7, minor: 9, patch: 9)
+      ver123 {.used.} = (major: 1'u, minor: 2'u, patch: 3'u)
+      ver155 {.used.} = (major: 1'u, minor: 5'u, patch: 5'u)
+      ver170 {.used.} = (major: 1'u, minor: 7'u, patch: 0'u)
+      ver171 {.used.} = (major: 1'u, minor: 7'u, patch: 1'u)
+      ver456 {.used.} = (major: 4'u, minor: 5'u, patch: 6'u)
+      ver457 {.used.} = (major: 4'u, minor: 5'u, patch: 7'u)
+      ver789 {.used.} = (major: 7'u, minor: 8'u, patch: 9'u)
+      ver799 {.used.} = (major: 7'u, minor: 9'u, patch: 9'u)
       aList {.used.} = ""
       bList {.used.} = """
         v.1.2.3
@@ -87,10 +87,10 @@ suite "bump":
     check tagv155.get == "V1.5.5"
 
   test "version validity checks out":
-    check (0, 0, 0).isValid == false
-    check (0, 0, 1).isValid == true
+    check (0'u, 0'u, 0'u).isValid == false
+    check (0'u, 0'u, 1'u).isValid == true
 
-  test "strange use-supplied versions do not parse":
+  test "strange user-supplied versions do not parse":
     check parseVersion("""version = "-1.2.3"""").isNone
     check parseVersion("""version = "12.3"""").isNone
     check parseVersion("""version = "123"""").isNone