add WSL fcns: has_wsl, wslpath2winpath, winpath2wslpath, wsl_tempfile

Author: scivision

+stdlib/+fileio/which.m

@@ -7,9 +7,6 @@
   fpath (1,:) string = getenv('PATH')
 end
 
-import stdlib.fileio.is_exe
-import stdlib.fileio.expanduser
-
 names = filename;
 
 if ispc
@@ -26,7 +23,7 @@
 
   if strlength(fileparts(name)) > 0
     % has directory part
-    if is_exe(name)
+    if stdlib.fileio.is_exe(name)
       exe = name;
       return
     end
@@ -37,7 +34,7 @@
 %% path given
 
 if isscalar(fpath)
-  fpath = split(expanduser(fpath), pathsep).';
+  fpath = split(stdlib.fileio.expanduser(fpath), pathsep).';
 end
 fpath = fpath(strlength(fpath)>0);
 
@@ -50,7 +47,7 @@
 
   for p = fpath
     exe = fullfile(p, name);
-    if is_exe(exe)
+    if stdlib.fileio.is_exe(exe)
       return
     end
   end

+stdlib/+sys/has_wsl.m

@@ -0,0 +1,17 @@
+function ok = has_wsl()
+% HAS_WSL  Check if WSL is installed and notionally working
+
+persistent wsl;
+
+if isempty(wsl)
+  if ispc
+    [stat, ~] = system("wsl test 1");
+    wsl = stat == 0;
+  else
+    wsl = false;
+  end
+end
+
+ok = wsl;
+
+end

+stdlib/+sys/iswsl.m

@@ -3,15 +3,13 @@
 
 if isempty(wsl)
   wsl = false;
-  yeswsl = false;
   if isunix && ~ismac
     fid = fopen('/proc/version');
-    if fid < 1
-      return
+    if fid >= 1
+      v = fscanf(fid,'%s');
+      fclose(fid);
+      wsl = contains(v, 'microsoft-standard');
     end
-    v = fscanf(fid,'%s');
-    fclose(fid);
-    wsl = contains(v, 'microsoft-standard');
   end
 end
 

+stdlib/+sys/winpath2wslpath.m

@@ -0,0 +1,16 @@
+function wsl_path = winpath2wslpath(win_path)
+%% WINPATH2WSLPATH Convert Windows path to WSL path
+% input format like \\wsl$\Ubuntu\home\username\...
+arguments
+  win_path (1,1) string {mustBeNonzeroLengthText}
+end
+
+assert(stdlib.sys.has_wsl(), "stdlib:sys:winpath2wslpath:EnvironmentError", mfilename() + "only supported on Windows Matlab with WSL")
+
+[stat, wsl_path] = system("wsl wslpath " + strrep(win_path, '\', '/'));
+
+assert(stat == 0, "stdlib:sys:winpath2wslpath:IOError", "could not convert wslpath " + wsl_path)
+
+wsl_path = strip(string(wsl_path));
+
+end

+stdlib/+sys/wsl_tempfile.m

@@ -0,0 +1,12 @@
+function path = wsl_tempfile()
+%% Windows Subsystem for Linux (WSL) temporary file from Windows Matlab
+
+assert(stdlib.sys.has_wsl(), "stdlib:sys:wsl_tempfile:EnvironmentError", mfilename() + "only supported on Windows Matlab with WSL")
+
+[stat, path] = system("wsl mktemp -u");
+
+assert(stat == 0, "stdlib:sys:wsl_tempfile:IOError", "could not get wsl mktemp " + path)
+
+path = strip(string(path));
+
+end

+stdlib/+sys/wslpath2winpath.m

@@ -0,0 +1,16 @@
+function win_path = wslpath2winpath(wsl_path)
+%% WSLPATH2WINPATH Convert a WSL path to a Windows path
+% output format is like \\wsl$\Ubuntu\home\username\...
+arguments
+  wsl_path (1,1) string {mustBeNonzeroLengthText}
+end
+
+assert(stdlib.sys.has_wsl(), "stdlib:sys:wslpath2winpath:EnvironmentError", mfilename() + "only supported on Windows Matlab with WSL")
+
+[stat, win_path] = system("wsl wslpath -w " + wsl_path);
+
+assert(stat == 0, "stdlib:sys:wslpath2winpath:IOError", "could not convert wslpath " + win_path)
+
+win_path = strip(string(win_path));
+
+end

+stdlib/+test/TestFileImpure.m

@@ -4,6 +4,7 @@
 
 function test_expanduser(tc)
 import stdlib.fileio.expanduser
+
 tc.verifyFalse(startsWith(expanduser('~/foo'), "~"))
 tc.verifyFalse(any(startsWith(expanduser(["~/abc", "~/123"]), "~")))
 
@@ -21,7 +22,6 @@ function test_makedir(tc)
 end
 
 function test_which_name(tc)
-import stdlib.fileio.which
 
 if ismac
   n = "ls";
@@ -30,50 +30,13 @@ function test_which_name(tc)
 end
 %% which: Matlab in environment variable PATH
 % MacOS Matlab does not source .zshrc so Matlab is not on internal Matlab PATH
-tc.verifyNotEmpty(which(n))
+tc.verifyNotEmpty(stdlib.fileio.which(n))
 
 end
 
-function test_is_exe_which_wsl(tc)
-import stdlib.fileio.is_exe
-import stdlib.fileio.which
-import stdlib.sys.subprocess_run
-
-tc.assumeTrue(ispc, "Windows only")
-
-wsl = which("wsl");
-tc.assumeNotEmpty(wsl, "did not find Windows Subsystem for Linux")
-
-[ret, cc] = system("wsl which cc");
-tc.assumeEqual(ret, 0, "could not find WSL C compiler")
-tc.assumeNotEmpty(cc, "did not find WSL C compiler")
-
-cwd = fileparts(mfilename('fullpath'));
-src = "main.c";
-[~, out] = fileparts(tempname);
-
-oldcwd = pwd;
-cd(cwd)
-ret = system("wsl cc " + src + " -o" + out);
-
-tc.assumeEqual(ret, 0, "failed to compile " + src)
-tc.assumeTrue(isfile(out), "cc failed to produce output file " + out)
-
-tc.verifyTrue(is_exe(out), "is_exe() failed to detect WSL executable " + out)
-
-wsl_exe = which(out);
-tc.verifyNotEmpty(wsl_exe, "which() failed to detect WSL executable " + out)
-
-delete(out)
-
-cd(oldcwd)
-
-end
 
 function test_is_exe_which_fullpath(tc)
 import matlab.unittest.constraints.IsFile
-import stdlib.fileio.which
-import stdlib.fileio.is_exe
 
 n = "matlab";
 %% is_exe test
@@ -83,9 +46,9 @@ function test_is_exe_which_fullpath(tc)
 else
   fp = p;
 end
-tc.verifyTrue(is_exe(fp))
+tc.verifyTrue(stdlib.fileio.is_exe(fp))
 %% which: test absolute path
-exe = which(p);
+exe = stdlib.fileio.which(p);
 
 if ispc
   tc.verifyTrue(endsWith(exe, ".exe"))

+stdlib/+test/TestSys.m

@@ -55,6 +55,7 @@ function test_octave(tc)
 function test_wsl(tc)
 import matlab.unittest.constraints.IsOfClass
 tc.verifyThat(stdlib.sys.iswsl, IsOfClass('logical'))
+tc.verifyThat(stdlib.sys.has_wsl, IsOfClass('logical'))
 end
 
 function test_isinteractive(tc)

+stdlib/+test/TestWSL.m

@@ -0,0 +1,53 @@
+classdef TestWSL < matlab.unittest.TestCase
+
+methods (Test)
+
+function test_is_exe_which_wsl(tc)
+
+tc.assumeTrue(ispc, "Windows only")
+tc.assumeTrue(stdlib.sys.has_wsl(), "did not find Windows Subsystem for Linux")
+
+[ret, cc] = system("wsl which cc");
+tc.assumeEqual(ret, 0, "could not find WSL C compiler")
+tc.assumeNotEmpty(cc, "did not find WSL C compiler")
+
+cwd = fileparts(mfilename('fullpath'));
+src = stdlib.sys.winpath2wslpath(fullfile(cwd, "main.c"));
+
+[ret, out_wsl] = system("wsl mktemp -u");
+tc.assumeEqual(ret, 0, "could not get WSL tempfile")
+out_wsl = strtrim(out_wsl);
+
+ret = system("wsl cc " + src + " -o" + out_wsl);
+
+tc.assumeEqual(ret, 0, "failed to compile " + src)
+out = stdlib.sys.wslpath2winpath(out_wsl);
+tc.assumeTrue(isfile(out), "cc failed to produce output file " + out)
+
+tc.verifyTrue(stdlib.fileio.is_exe(out), "is_exe() failed to detect WSL executable " + out)
+
+wsl_exe = stdlib.fileio.which(out);
+tc.verifyNotEmpty(wsl_exe, "which() failed to detect WSL executable " + out)
+
+end
+
+
+function test_wsl_path(tc)
+
+tc.assumeTrue(ispc, "Windows only")
+tc.assumeTrue(stdlib.sys.has_wsl(), "did not find Windows Subsystem for Linux")
+
+wsl_temp = stdlib.sys.wsl_tempfile();
+tc.verifyNotEmpty(wsl_temp, "could not get WSL tempfile")
+
+wsl_path = stdlib.sys.wslpath2winpath(wsl_temp);
+tc.verifyNotEmpty(wsl_path, "could not convert WSL path to Windows path")
+
+win_path = stdlib.sys.winpath2wslpath(wsl_path);
+tc.verifyNotEmpty(win_path, "could not convert Windows path to WSL path")
+
+end
+
+end
+
+end