moonscript.cmd.moonc: Improve normalize_dir, add iterate_path

Author: Shados

moonscript/cmd/moonc.lua

@@ -1,7 +1,7 @@
 local lfs = require("lfs")
 local split
 split = require("moonscript.util").split
-local dirsep, dirsep_chars, mkdir, normalize_dir, parse_dir, parse_file, convert_path, format_time, gettime, compile_file_text, write_file, compile_and_write, is_abs_path, path_to_target
+local dirsep, dirsep_chars, mkdir, normalize_dir, parse_dir, parse_file, convert_path, iterate_path, format_time, gettime, compile_file_text, write_file, compile_and_write, is_abs_path, path_to_target
 dirsep = package.config:sub(1, 1)
 if dirsep == "\\" then
   dirsep_chars = "\\/"
@@ -19,7 +19,17 @@ mkdir = function(path)
   return lfs.attributes(path, "mode")
 end
 normalize_dir = function(path)
-  return path:match("^(.-)[" .. tostring(dirsep_chars) .. "]*$") .. dirsep
+  local normalized_dir
+  if is_abs_path(path) then
+    normalized_dir = dirsep
+  else
+    normalized_dir = ""
+  end
+  for path_element in iterate_path(path) do
+    normalized_dir = normalized_dir .. (path_element .. dirsep)
+  end
+  return normalized_dir
+end
 end
 parse_dir = function(path)
   return (path:match("^(.-)[^" .. tostring(dirsep_chars) .. "]*$"))
@@ -34,6 +44,9 @@ convert_path = function(path)
   end
   return new_path
 end
+iterate_path = function(path)
+  return path:gmatch("([^" .. tostring(dirsep_chars) .. "]+)")
+end
 format_time = function(time)
   return ("%.3fms"):format(time * 1000)
 end
@@ -190,6 +203,7 @@ return {
   normalize_dir = normalize_dir,
   parse_dir = parse_dir,
   parse_file = parse_file,
+  iterate_path = iterate_path,
   convert_path = convert_path,
   gettime = gettime,
   format_time = format_time,

moonscript/cmd/moonc.moon

@@ -23,9 +23,15 @@ mkdir = (path) ->
 
   lfs.attributes path, "mode"
 
--- strips excess / and ensures path ends with /
+-- Strips excess / and ensures path ends with /
 normalize_dir = (path) ->
-  path\match("^(.-)[#{dirsep_chars}]*$") .. dirsep
+  normalized_dir = if is_abs_path(path)
+    dirsep
+  else
+    ""
+  for path_element in iterate_path(path)
+    normalized_dir ..= path_element .. dirsep
+  return normalized_dir
 
 -- parse the directory out of a path
 parse_dir = (path) ->
@@ -42,6 +48,10 @@ convert_path = (path) ->
     new_path = path .. ".lua"
   new_path
 
+-- Iterates over the directories (and file) in a path
+iterate_path = (path) ->
+  path\gmatch "([^#{dirsep_chars}]+)"
+
 format_time = (time) ->
   "%.3fms"\format time*1000
 
@@ -187,6 +197,7 @@ path_to_target = (path, target_dir=nil, base_dir=nil) ->
   :normalize_dir
   :parse_dir
   :parse_file
+  :iterate_path
   :convert_path
   :gettime
   :format_time

spec/cmd_spec.moon

@@ -14,9 +14,15 @@ describe "moonc", ->
 
   it "should normalize dir", ->
     same moonc.normalize_dir, "hello/world/", "hello/world/"
+    same moonc.normalize_dir, "/hello/world/", "/hello/world/"
     same moonc.normalize_dir, "hello/world//", "hello/world/"
-    same moonc.normalize_dir, "", "/" -- wrong
+    same moonc.normalize_dir, "/hello/world//", "/hello/world/"
+    same moonc.normalize_dir, "hello//world//", "hello/world/"
+    same moonc.normalize_dir, "/hello//world//", "/hello/world/"
+    same moonc.normalize_dir, "", ""
+    same moonc.normalize_dir, "/", "/"
     same moonc.normalize_dir, "hello", "hello/"
+    same moonc.normalize_dir, "/hello", "/hello/"
 
   it "should parse dir", ->
     same moonc.parse_dir, "/hello/world/file", "/hello/world/"
@@ -35,6 +41,25 @@ describe "moonc", ->
     same moonc.convert_path, "/hello/file.moon", "/hello/file.lua"
     same moonc.convert_path, "/hello/world/file", "/hello/world/file.lua"
 
+  it "iterates paths", ->
+    single = {"foo"}
+    single_path = "foo"
+    nested = {"foo", "bar"}
+    nested_path = "foo/bar"
+    nested_file = {"foo", "bar.baz"}
+    nested_file_path = "foo/bar.baz"
+
+    same_iterated_path = (path, comparison_tbl) ->
+      i = 0
+      for path_element in moonc.iterate_path(path)
+        i += 1
+        assert.same comparison_tbl[i], path_element
+      assert.same #comparison_tbl, i
+
+    same_iterated_path single_path, single
+    same_iterated_path nested_path, nested
+    same_iterated_path nested_file_path, nested_file
+
   it "calculate target", ->
     p = moonc.path_to_target