train-core 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 498cde88401e4600e70ca7a11c60e22000252b8e6e453849e050f005bd5fa0eb
-  data.tar.gz: fb23a404a78eb64b4918ab4e5726d0f9cff1270cc750b9f5b77e6d9b67ec0ecd
+  metadata.gz: feec4276265c7ac930c41c9bb73182480eb4287adf883a9ca82b6b82b41eefa2
+  data.tar.gz: 46772374d142259ce4cd2cfdf2d5fb6b661edf8708e5c940b31745a0690453ac
 SHA512:
-  metadata.gz: be868622834db36c1c07c3c8221a13b7cc112c94c176db9fdd923160945bb28b0436d9405c8f9dd58175dbbc234278eab847cd55f866eaa56adf13c416868e25
-  data.tar.gz: a166c00d0eda33cc8942ed19cb2926433997c9f2975322e701c6a01ea52c9f614684e7d53df0489b8fbbf53e35375bf05cdc85eb7af5c2ee800cb12c531aacb3
+  metadata.gz: 6246399247cb941017ccf01f053adcab64bcdfce36441b579ad80d62c054538e29551eb39c2f64ea1b88ba632d03877f2426ce97c5b98317de2c1884e6941c42
+  data.tar.gz: 6a92d64cba31f6a322eeb5e34e3b478c54fa1a376c72e51e3c584089a1d1e6d276b37713c4e2abc92c5e1bab4d7c9cf978504e81f70cfb6af9c0e2209511cd24

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-core
 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