wslc-wip 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e6e4afaf5e33e69fa5dd6dc35f4fc32695e9916b0ceeac998ae58334fab3d4
-  data.tar.gz: 56e438283cad62937ac37132bb49048a1159897de4d3058c122f14272bca9e68
+  metadata.gz: 5808f27cf9f20fab582caacc33a35f4727d1b74764b8e541fe9f10a82ec8ceaa
+  data.tar.gz: 79c031022523b9ea21dfc79d7b160bcc46ab71cebe9f98d89050758ba581d986
 SHA512:
-  metadata.gz: 29bfbc9430132bf62ae58813e333f64df00d9228ad98386f3374e3a0de897e55605b977d7208bf7ce9622957e0a3acd1d598e25f25a594eed839fc7007deb37d
-  data.tar.gz: 8588e1b97851a59936bb42daf6a8d09002e1c3fdba12dafba0a35bfe8a1c9e430742bee1b8f818a677b83cc793f6b96151be1d729f7465632c3c368d9b518cd8
+  metadata.gz: 4b64f0d01f0f54476b5acacc7094dc6c54f2ea5ed480272644b20839a9a1d3217d9c32748935eb20d75f5ee3672012d6c8799dfba8192b1fa656e16a7c65380f
+  data.tar.gz: 5ab533ffee65252d885c20862c32450f3d4b7c5c4a8019cf2314e5075b9c3f5ea49efd551f08cf73c170663b90cebe420533be7041e5d20c6eff1988e6b3a758

data/lib/wip/doctor.rb

@@ -15,9 +15,8 @@ module Wip
 
     def call
       results = []
-      results << result(@environment.wsl2? ? :ok : :fail, 'Running on WSL2', 'Not running on WSL2')
-      results << result(@environment.windows_interop? ? :ok : :fail, 'Windows executable interoperability is enabled',
-                        'Windows executable interoperability is disabled')
+      results << result(@environment.wsl2? ? :ok : :fail, *wsl2_messages)
+      results << interop_result unless @environment.windows?
       results << Result.new(:ok, "Architecture: #{@environment.architecture}")
       config = load_config(results)
       command = resolve(config, results) if config
@@ -29,6 +28,17 @@ module Wip
 
     private
 
+    def wsl2_messages
+      return ['WSL2 is available', 'WSL2 is not available'] if @environment.windows?
+
+      ['Running on WSL2', 'Not running on WSL2']
+    end
+
+    def interop_result
+      result(@environment.windows_interop? ? :ok : :fail, 'Windows executable interoperability is enabled',
+             'Windows executable interoperability is disabled')
+    end
+
     def load_config(results)
       config = @loader.load
       invalid = %w[container image].select { |key| config.defaults[key].to_s.empty? }

data/lib/wip/environment.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'open3'
+
 module Wip
   # Detects WSL2, Windows interop, and architecture facts about the host.
   class Environment
@@ -8,7 +10,11 @@ module Wip
       @stdout = stdout
     end
 
+    def windows? = Gem.win_platform?
+
     def wsl2?
+      return wsl2_backend_available? if windows?
+
       File.read('/proc/version').match?(/microsoft.*WSL2/i)
     rescue Errno::ENOENT
       false
@@ -18,9 +24,20 @@ module Wip
     def interactive? = @stdin.tty? && @stdout.tty?
 
     def architecture
-      machine = `uname -m`.strip
-      { 'x86_64' => 'linux/amd64', 'aarch64' => 'linux/arm64', 'arm64' => 'linux/arm64' }.fetch(machine,
-                                                                                                "linux/#{machine}")
+      machine = RbConfig::CONFIG['host_cpu']
+      { 'x86_64' => 'linux/amd64', 'x64' => 'linux/amd64', 'aarch64' => 'linux/arm64', 'arm64' => 'linux/arm64' }
+        .fetch(machine, "linux/#{machine}")
+    end
+
+    private
+
+    # On native Windows there is no /proc/version to read, so ask Windows
+    # itself whether the WSL2 backend that WSLC depends on is installed.
+    def wsl2_backend_available?
+      _output, status = Open3.capture2e('wsl.exe', '--status')
+      status.success?
+    rescue Errno::ENOENT
+      false
     end
   end
 end

data/lib/wip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wip
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wslc-wip
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Wip contributors