train 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 822b69fa9ee45bff40a62fcce80d792e4605d86d7f55511c289b0bfff86f1d11
-  data.tar.gz: 2052e5189271479302b9079fafb1ed2b612fe02d876a5e35dd468f407ad62270
+  metadata.gz: 0f79287e10225a5c785d6f7da50b8526353c403ae6a02ae39876ba9c0db1b4c5
+  data.tar.gz: 417ad3e156ac170850a576e0800698ee38dc915bb00b6164ebc42b732c89010a
 SHA512:
-  metadata.gz: 52685bfaa63eb3db6db5c36477c2fad2b272264064f30a6da0c5e59ae419d328a392eaa96bc42a1e2c573cfa86e88ba4a0661d97bb39af21c3fdfd8494cb36c6
-  data.tar.gz: b30555ac34ee0fcb74ea05e77db4a78a8570424f8d5843911be532f8cd656bb52813b3e11ba5eed404e2d040a817ba2875cb0a78f919d1513ad733e7ab603863
+  metadata.gz: 9d0c0fd94a2c1f380ffca4ca64f91ff7a757e29a6abe4ba3fb5569d59df5497b9034529a9f4f85b57f718c8812282b2483b4790c13df3b6fb4215063c663b9e1
+  data.tar.gz: 7285fab00c1390dd47a770d0d3c5a8ab5373d681154648efc6df6762ff9abe7092542f15ea7d0455e09879d039eddb8a1478f7d2dfadb280eaac6288df3aaddb

data/lib/train/platforms/detect/helpers/os_windows.rb

@@ -1,8 +1,13 @@
 module Train::Platforms::Detect::Helpers
   module Windows
     def detect_windows
+      check_cmd || check_powershell
+    end
+
+    def check_cmd
       # try to detect windows, use cmd.exe to also support Microsoft OpenSSH
       res = @backend.run_command("cmd.exe /c ver")
+
       return false if (res.exit_status != 0) || res.stdout.empty?
 
       # if the ver contains `Windows`, we know its a Windows system
@@ -13,16 +18,29 @@ module Train::Platforms::Detect::Helpers
 
       # try to extract release from eg. `Microsoft Windows [Version 6.3.9600]`
       release = /\[(?<name>.*)\]/.match(version)
-      unless release[:name].nil?
+      if release[:name]
         # release is 6.3.9600 now
         @platform[:release] = release[:name].downcase.gsub("version", "").strip
         # fallback, if we are not able to extract the name from wmic later
         @platform[:name] = "Windows #{@platform[:release]}"
       end
 
-      # try to use wmic, but lets keep it optional
       read_wmic
+      true
+    end
 
+    def check_powershell
+      command = @backend.run_command(
+        "Get-WmiObject Win32_OperatingSystem | Select Caption,Version | ConvertTo-Json"
+      )
+      return false if (command.exit_status != 0) || command.stdout.empty?
+
+      payload = JSON.parse(command.stdout)
+      @platform[:family] = "windows"
+      @platform[:release] = payload["Version"]
+      @platform[:name] = payload["Caption"]
+
+      read_wmic
       true
     end
 

data/lib/train/version.rb

@@ -3,5 +3,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = "3.1.3".freeze
+  VERSION = "3.1.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json