os_version: choose_method

Author: scivision

+stdlib/+dotnet/os_version.m

@@ -0,0 +1,9 @@
+function [os, version] = os_version()
+
+v = System.Environment.OSVersion.VersionString;
+% https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.versionstring
+vs = split(string(v), ' ');
+version = vs(end);
+os = join(vs(1:end-1));
+
+end

+stdlib/+java/os_version.m

@@ -0,0 +1,8 @@
+function [os, version] = os_version()
+
+os = javaMethod("getProperty", "java.lang.System", "os.name");
+version = javaMethod("getProperty", "java.lang.System", "os.version");
+os = string(os);
+version = string(version);
+
+end

+stdlib/+sys/os_version.m

@@ -0,0 +1,25 @@
+function [os, version] = os_version()
+
+if ispc()
+  cmd1 = 'pwsh -c "(Get-CimInstance -ClassName Win32_OperatingSystem).Caption"';
+  cmd2 = 'pwsh -c "(Get-CimInstance -ClassName Win32_OperatingSystem).Version"';
+else
+  cmd1 = "uname -s";
+  cmd2 = "uname -r";
+end
+
+[s, os] = system(cmd1);
+if s == 0
+  os = strtrim(os);
+else
+  error("Failed to get OS name: %s", os);
+end
+
+[s, version] = system(cmd2);
+if s == 0
+  version = strtrim(version);
+else
+  error("Failed to get OS version: %s", version);
+end
+
+end

+stdlib/os_version.m

@@ -4,19 +4,12 @@
 % instead of Windows 10.
 % Ref: https://bugs.openjdk.org/browse/JDK-8274840
 
-function [os, version] = os_version()
-
-if stdlib.has_dotnet()
-  v = System.Environment.OSVersion.VersionString;
-  % https://learn.microsoft.com/en-us/dotnet/api/system.operatingsystem.versionstring
-  vs = split(string(v), ' ');
-  version = vs(end);
-  os = join(vs(1:end-1));
-else
-  os = javaMethod("getProperty", "java.lang.System", "os.name");
-  version = javaMethod("getProperty", "java.lang.System", "os.version");
-  os = string(os);
-  version = string(version);
+function [os, version] = os_version(method)
+arguments
+  method (1,:) string = ["java", "dotnet", "sys"]
 end
 
+fun = choose_method(method, "os_version");
+[os, version] = fun();
+
 end

test/TestSys.m

@@ -10,6 +10,7 @@
 cpu_arch_fun = {'java', 'dotnet', 'native'}
 ia_fun = {'sys', 'dotnet', 'java', 'python'}
 cr_method = {'sys', 'java', 'python'}
+os_m = {'java', 'dotnet', 'sys'}
 end
 
 methods(TestClassSetup)
@@ -108,10 +109,14 @@ function test_has_python(tc)
 tc.verifyTrue(all(v >= [3, 8, 0]), "expected Python >= 3.8")
 end
 
-function test_os_version(tc)
-tc.assumeTrue(stdlib.has_dotnet() || stdlib.has_java())
+function test_os_version(tc, os_m)
+try
+  [os, ver] = stdlib.os_version(os_m);
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
+  return
+end
 
-[os, ver] = stdlib.os_version();
 tc.verifyGreaterThan(strlength(os), 0, "expected non-empty os")
 tc.verifyGreaterThan(strlength(ver), 0, "expected non-empty version")
 end