Update: Fixed minor matching on semver. Now support watch on macOS

Author: MrcSnm

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
       - uses: MrcSnm/setup-dlang@v2
         with:
           compiler: ldc-latest
-          redub: 1.25.2
+          redub: master
 
       - name: Build
         if: runner.os != 'macOS'

dub.json

@@ -14,22 +14,16 @@
             "versions": ["RedubCLI", "FSWForcePoll", "RedubWatcher"],
             "dependencies": {
                 "fswatch": "~>0.6.1",
-                "arsd-official:terminal": "~>12.0"
+                "arsd-official:terminal": "~>12.1"
             }
         },
-        {
-            "name": "cli-osx",
-            "targetType": "executable",
-            "platforms": ["osx"],
-            "versions": ["RedubCLI"]
-        },
         {
             "name": "cli-dev",
             "versions": ["RedubCLI", "Developer", "RedubWatcher", "FSWForcePoll"],
             "targetType": "executable",
             "dependencies": {
                 "fswatch": "~>0.6.1",
-                "arsd-official:terminal": "~>12.0"
+                "arsd-official:terminal": "~>12.1"
             }
         },
         {

semver/source/redub/libs/semver.d

@@ -247,12 +247,13 @@ struct SemVer
 
 
 private alias cr = ComparisonResult;
-enum ComparisonTypes : ComparisonResult[3] 
+enum ComparisonTypes : ComparisonResult[3]
 {
     /// Implementation when directly specified version, or `=` is used.
     mustBeEqual = [cr.equal, cr.equal, cr.equal],
     /// Implementation when using `~`
     greaterPatchesOnly = [cr.equal, cr.equal, cr.gtEqual],
+    greaterMinors = [cr.equal, cr.gtEqual, cr.any],
     /// Implementation when using `*`
     any = [cr.any, cr.any, cr.any],
     ///Implementation when using '>='
@@ -286,9 +287,9 @@ private bool parseOperator(ref SemVer sv, string op, size_t partsLength) @nogc n
         case "^":  sv.comparison = [equal, atOnce, gtEqual];  break;
         case "~", "~>":  
             if(partsLength <= 2)
-                sv.comparison = [equal, atOnce, gtEqual];
+                sv.comparison = ComparisonTypes.greaterMinors;
             else
-                sv.comparison = [equal, equal, gtEqual]; 
+                sv.comparison = ComparisonTypes.greaterPatchesOnly;
             break;
         case ">":  sv.comparison = [atOnce, greaterThan, greaterThan]; break;
         case ">=": sv.comparison = [atOnce, gtEqual, gtEqual]; break;
@@ -366,6 +367,15 @@ unittest
     // assert(SemVer("~5").satisfies("5.0.0"));
 }
 
+@("Compare using ~>")
+unittest
+{
+    SemVer matchMinor = SemVer("~>12.1");
+    assert(!SemVer("12.0.0").satisfies(matchMinor));
+    assert(SemVer("12.1.0").satisfies(matchMinor));
+    assert(!SemVer("13.1.0").satisfies(matchMinor));
+}
+
 @("Compare Using Metadata")
 unittest
 {

source/redub/buildapi.d

@@ -8,7 +8,7 @@ import redub.package_searching.api;
 
 
 ///vX.X.X
-enum RedubVersionOnly = "v1.25.5";
+enum RedubVersionOnly = "v1.25.6";
 ///Redub vX.X.X
 enum RedubVersionShort = "Redub "~RedubVersionOnly;
 ///Redub vX.X.X - Description