Merge pull request #156 from wilzbach/impro

Rename cli option to --simulate-daily-cron + use toLower for labels
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>

Author: dlang-bot

source/dlangbot/app.d

@@ -268,7 +268,7 @@ else void main(string[] args)
     auto settings = new HTTPServerSettings;
     settings.port = 8080;
     readOption("port|p", &settings.port, "Sets the port used for serving.");
-    readOption("simulative-cron-daily", &runDailyCronSimulation, "Sets the port used for serving.");
+    readOption("simulate-cron-daily", &runDailyCronSimulation, "Sets the port used for serving.");
     readOption("cron-daily", &runDailyCron, "Run daily cron tasks.");
     if (!finalizeCommandLineOptions())
         return;

source/dlangbot/cron.d

@@ -144,13 +144,18 @@ auto walkPR(Actions)(string repoSlug, GHIssue issue, Actions actions, CronConfig
         }
     }
 
+    import std.uni : asLowerCase, sicmp;
+    alias siEqual = (a, b) => sicmp(a, b) == 0;
+    alias siLess = (a, b) => sicmp(a, b) < 0;
     // update labels
     auto putLabels = labels.chain(addLabels)
                         .array
-                        .sort.uniq
-                        .filter!(l => !removeLabels.canFind(l)).array;
+                        .sort!siLess
+                        .uniq!siEqual
+                        .filter!(l => !removeLabels.map!asLowerCase.canFind(l.asLowerCase)).array;
 
-    if (!labels.equal(putLabels))
+    auto labelsSorted = labels.dup.sort!siLess;
+    if (!labelsSorted.equal!siEqual(putLabels))
     {
         logInfo("[%s/%d/putLabels]: %s (before: %s)", repoSlug, pr.number, putLabels, labels);
         if (!config.simulate)

source/dlangbot/github.d

@@ -197,8 +197,9 @@ Json[] tryMerge(in ref PullRequest pr, GHMerge.MergeMethod method)
 
 void checkAndRemoveLabels(GHLabel[] labels, in ref PullRequest pr, in string[] toRemoveLabels)
 {
+    import std.uni : toLower;
     labels
-        .map!(l => l.name)
+        .map!(l => l.name.toLower)
         .filter!(n => toRemoveLabels.canFind(n))
         .each!(l => pr.removeLabel(l));
 }

test/cronjob.d

@@ -3,7 +3,6 @@ import utils;
 import std.format : format;
 import std.stdio;
 
-bool simulate = false;
 string[] repositories = ["dlang/phobos"];
 
 // test the first items of the cron job
@@ -53,14 +52,11 @@ unittest
         (scope HTTPServerRequest req, scope HTTPServerResponse res){
             assert(req.method == HTTPMethod.PUT);
             assert(req.json[].map!(e => e.get!string).equal(
-                ["Bug Fix", "Enhancement","decision block", "needs rebase", "stalled"]
+                ["Bug Fix", "decision block", "Enhancement", "needs rebase", "stalled"]
             ));
         },
     );
-
-    import dlangbot.app : cronDaily;
-    cronDaily(repositories, simulate);
-    checkAPIExpectations;
+    testCronDaily(repositories);
 }
 
 // test that stalled isn't falsely removed (e.g. by recent labelling)
@@ -86,7 +82,5 @@ unittest
         },
     );
 
-    import dlangbot.app : cronDaily;
-    cronDaily(repositories, simulate);
-    checkAPIExpectations;
+    testCronDaily(repositories);
 }

test/utils.d

@@ -317,3 +317,14 @@ void openUrl(string url, string expectedResponse,
     checkAPIExpectations;
     assert(req.bodyReader.readAllUTF8 == expectedResponse);
 }
+
+void testCronDaily(string[] repositories, int line = __LINE__, string file = __FILE__)
+{
+    import dlangbot.app : cronDaily;
+    bool simulate = false;
+
+    logInfo("Starting cron test in %s:%d", file, line);
+
+    cronDaily(repositories, simulate);
+    checkAPIExpectations;
+}