wip

Author: monyarm

packages/mcl/src/src/mcl/commands/dev_commit.d

@@ -35,12 +35,15 @@ bool inGitIgnore(string file)
 {
     foreach (string line; gitIgnore)
     {
-        writeln("Comparing: " ~ file ~ " with " ~ line);
-        if (line.startsWith("#") || line == "")
-            continue;
-        else if (globMatch(file, line))
+        if (file.strip == ".direnv")
+            writeln("file: ", file, " line: ", line);
+        if (file.strip == line.strip)
             return true;
-        else if (file.startsWith(line.strip ~ "/"))
+        else if (file.strip == (line.strip ~ "/"))
+            return true;
+        else if (globMatch(file.strip, line.strip))
+            return true;
+        else if (globMatch(file.strip, line.strip ~ "/**"))
             return true;
     }
     return false;
@@ -51,11 +54,9 @@ void initGitDiff()
     // auto status = execute("git diff --name-only -- cached", false).split("\n");
     auto status = dirEntries("", SpanMode.depth).map!(a => a.name.strip).array
     .filter!(a =>
+        !inGitIgnore(a) &&
         !a.startsWith("node_modules") &&
-        !a.startsWith(".direnv") &&
         !a.startsWith("vendor") &&
-        !a.startsWith("result") &&
-        !a.startsWith(".result") &&
         !a.startsWith("dist") &&
         !a.startsWith(".yarn/") &&
         !a.startsWith(".git/") &&
@@ -70,8 +71,7 @@ void initGitDiff()
         !(a =="libs") &&
         !(a =="modules") &&
         !(a =="services")&&
-        !(a ==".git") &&
-        !inGitIgnore(a)
+        !(a ==".git")
     ).array;
     if (status.length)
     {
@@ -132,9 +132,8 @@ string[] getAuthors()
 
 export void dev_commit()
 {
-    writeln("It's Supercalifragilisticexpialidocious! Even though the sound of it is something quite atrocious! If you say it loud enough, you'll always sound precocious! Supercalifragilisticexpialidocious!");
+    gitIgnore = readText(rootDir() ~ "/.gitignore").split("\n").filter!(a => !(a.strip.startsWith("#") || a.strip == "")).array;
     initGitDiff();
-    gitIgnore = readText(rootDir() ~ "/.gitignore").split("\n");
     writeln(guessScope().join("\n"));
     return;