plat4m 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4481fa20e386ce17cb2e32497e4751ef06a0c8fe8f6924ccc39123ef39b1d7fc
-  data.tar.gz: abe2c6c42b690c0d62f2172cf7fa105d8f18979f34c5ea0bcf8dc1df2a7c26aa
+  metadata.gz: '0568f72f0ee486986fb69681365388282d6a3ebce70cdd6aa7124b2c5ec7286e'
+  data.tar.gz: 9c6b999ec6a913a576a1ce05f242f6a6a8e8bcff45a9ed67ef81ce0db7f177b7
 SHA512:
-  metadata.gz: fc950cde9aa00a2b3071db15c912bc946b931aeac7afc6f823a7083a21a97bd6d8fdf04eedfd6a6140f9ee3c94132fd6e7f4b75f1b3efb1d67fe9e1c3a295923
-  data.tar.gz: b4d5e19123e3651fdbcb2b6ddc96f817750a809f04add82a7b08353898dfae08f733d3a523fa93954c629a8666aba813e9323a3accf06eabbc862f1f34f412f1
+  metadata.gz: a1bf2e5b82143028990f8dc384228ab58d4bf861d7d2ee826ad40e1b734e7dc86748b0d0ed4ccc298fa56064c889e21ca82148faaf00d7ba831a86915d58ea1e
+  data.tar.gz: e06c38c1caa125f661446fec555ce6da4541259419fe680c4474de1a89a96e21d7dcdc37e4ffc71acf490b2fe722bd35c4e13f2b0939cdda847fdd1aa12d5ef0

data/lib/plat4m/sniff/linux.rb

@@ -94,8 +94,9 @@ module Plat4m
 
       class NixManager < PkgManager
 
-        def initialize(_distro)
+        def initialize(distro)
           super()
+          @distro = distro
           @has_sudo = system('command -v sudo > /dev/null')
         end
 
@@ -176,7 +177,13 @@ module Plat4m
       class Dnf < NixManager
 
         def installed?(pkg)
-          system("dnf list installed #{pkg} >/dev/null 2>&1")
+          if @distro[:release] >= '41'
+            # dnf v5
+            system("dnf list --installed #{pkg} >/dev/null 2>&1")
+          else
+            # dnf <= v4
+            system("dnf list installed #{pkg} >/dev/null 2>&1")
+          end
         end
 
         def available?(pkg)

data/lib/plat4m/sniff/windows.rb

@@ -35,11 +35,18 @@ module Plat4m
           distro = {
             distro: RUBY_PLATFORM.match?(/mingw/i) ? 'mingw' : 'windows'
           }
-          # the 'ver' command returns something like "Microsoft Windows [Version xx.xx.xx.xx]"
-          match = `ver`.strip.match(/\[(.*)\]/)
-          ver = match[1].split.last
-          distro[:release] = ver.split('.').shift
+          # the 'ver' command outputs something like "Microsoft Windows [Version xx.xx.xx.xx]"
+          # the 'for ...' statement parses this and echos only the 'xx.xx.xx.xx' part
+          ver = `for /f "tokens=2 delims=[]" %s in ('ver') do @(for /f "tokens=2" %v in ('echo %s') do @echo %v)`.strip
           distro[:version] = ver
+          build = ver.split('.')[2].to_i
+          distro[:release] = if build >= 22000
+                               '11'
+                             elsif build >= 10240
+                               '10'
+                             else
+                               '<10'
+                             end
           # in case of MingW built Ruby assume availability of RubyInstaller Devkit
           distro[:pkgman] = distro[:distro]=='mingw' ? Pacman.new(distro) : nil
           distro

data/lib/plat4m/version.rb

@@ -8,6 +8,6 @@
 module Plat4m
 
   # Current Plat4m version.
-  VERSION = '1.1.2'
+  VERSION = '1.1.4'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plat4m
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies: []
 description: Plat4m is a simple runtime system platform scouting and support library.
 email: mcorino@m2c-software.nl