guess_os 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89004a256626a3a6a8275aa5caf484caf1463a1c3c1bdb1c32f64f52fdabdd4a
-  data.tar.gz: d2c9becce5271e407a582079de1b00d9da5a93fc8c6d7bd6292f989c918e511c
+  metadata.gz: 0be86469e07373cbb16f984b73bb740c26b014c352bcb8a3112cd90cc4aa3418
+  data.tar.gz: a7a7760ab74ffc209f7f3e852e5674a13108de1ebaf250408ee8397d9fed9123
 SHA512:
-  metadata.gz: 0e5322b66cc4582261c064d9f3c2a1e1b0fbc4b91da37dc64274526df7f283ab7f15634021eb1aba49533127788d55efa8645723a0ca45c8025f0c3666854e52
-  data.tar.gz: 12cae8e6292a805ec368e0ccda51284d35072693166ba0da65088c9156f42925ec4f3050b1d68426a2bc31a7df767a5ed125ad7b2774ee37be4f7cefde0ab6fa
+  metadata.gz: 214db1350922347cfff01b453669258e67ea2b33ad92558c3eb7f6421ae92751c22c5308ea85c7a822b7a65270d0f3e3a33b5a1b2af5c30c0608eea7425165a4
+  data.tar.gz: dc4c9df949498c7246201d69b549f59de51680918f828bac1fae95cbdfbabba9e869f32ba4a3ba293b297879c225dd5cd6dc2592c20b16812212cd496f48b6b7

data/lib/guess_os/host.rb

@@ -22,5 +22,9 @@ module GuessOS
     def remote?
       !local?
     end
+
+    def self.unkown
+      GuessOS::OS.new(:unkown, :unkown, "Unkown")
+    end
   end
 end

data/lib/guess_os/type/windows.rb

@@ -1,26 +1,82 @@
 class Windows
   def self.guess(host)
     conn = GuessOS::Conn.new(host)
-    command = "ver"
+
+    os = try_with_regedit(conn)
+    return os unless os.type == :unkown
+
+    os = try_with_ver(conn)
+    return os unless os.type == :unkown
+
+    os = try_with_folder(conn)
+    return os unless os.type == :unkown
+  end
+
+  def self.try_with_regedit(conn)
+    command = 'run "reg query \"HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\" /t REG_SZ'
     conn.exec(command)
+
+    identified = conn.ok && conn.last_output.include?("Windows")
+    return GuessOS::OS.unkown unless identified
+
+    output = conn.last_output
+    begin
+      lines = output.split("\n")
+      filter = lines.filter { _1.include? "ProductName" }
+      filter[0].gsub!("ProductName", "")
+      filter[0].gsub!("REG_SZ", "")
+
+      desc = filter[0].strip
+      items = desc.split
+      name = "#{items[0]} #{items[1]}"
+
+      GuessOS::OS.new(:windows, name, desc)
+    rescue
+      GuessOS::OS.unkown
+    end
+  end
+
+  def self.try_with_ver(conn)
     # ver => Microsoft Windows [Version 10.0.20348.469]
-    # command = 'echo %windir%' => Windows
+    command = "ver"
+    conn.exec(command)
 
     identified = conn.ok && conn.last_output.include?("Windows")
-    return GuessOS::OS.new(:unkown, :unkown, conn.status) unless identified
+    return GuessOS::OS.unkown unless identified
 
     output = conn.last_output
     begin
-      output.tr!("\r", ".")
-      output.tr!("\n", ".")
+      output.tr!("\r", "")
+      output.tr!("\n", "")
+      items = output.split
+      type = :windows
+      name = "windows #{items[3].split(".").first}"
+      desc = output
+      GuessOS::OS.new(type, name, desc)
     rescue
-      # nothing
+      GuessOS::OS.unkown
     end
-    items = output.split
+  end
 
-    type = :windows
-    name = "windows #{items[3].split(".").first}"
-    desc = output
-    GuessOS::OS.new(type, name, desc)
+  def self.try_with_folder(conn)
+    # command = 'echo %windir%' => Windows
+    command = "cd c:\windows"
+    conn.exec(command)
+
+    identified = conn.ok && conn.last_output.include?("Windows")
+    return GuessOS::OS.unkown unless identified
+
+    output = conn.last_output
+    begin
+      lines = output.split("\n")
+      filter = lines.filter { _1.include? "Volume" }
+      items = filter[0].split
+      type = :windows
+      name = items[-2, 2].join(" ").to_s
+      desc = filter[0]
+      GuessOS::OS.new(type, name, desc)
+    rescue
+      GuessOS::OS.unkown
+    end
   end
 end

data/lib/guess_os/type.rb

@@ -2,22 +2,13 @@ require_relative "type/all"
 
 module GuessOS
   class Type
-    def self.guess(host)
-      os = Windows.guess(host)
-      return os unless os.type == :unkown
-
-      os = GNULinux.guess(host)
-      return os unless os.type == :unkown
-
-      os = MacOS.guess(host)
-      return os unless os.type == :unkown
-
-      os = Cygwin.guess(host)
-      return os unless os.type == :unkown
-
-      os = Minix.guess(host)
-      return os unless os.type == :unkown
+    TYPES = [Windows, GNULinux, MacOS, Cygwin, Minix]
 
+    def self.guess(host)
+      TYPES.each do |klass|
+        os = klass.send :guess, host
+        return os unless os.type == :unkown
+      end
       os
     end
   end

data/lib/guess_os/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module GuessOS
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
   NAME = "guess_os"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guess_os
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - David Vargas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh