plat4m 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3493a52f0b4f777199e3b7f22f912496d0bd33840782aca042308576343622d7
-  data.tar.gz: 844d89eeae53b9c5de0bcd359d647de97d4096e0256d75785f8888ccab635dc0
+  metadata.gz: 15ad6738f1fff758126da46f89b408b099562c7b63eed44adac9ff1337af8515
+  data.tar.gz: 86e6a9b2dcff17fde635ec71a9b4bf461ced8243d9068e00adef7ed04c83f512
 SHA512:
-  metadata.gz: d718c9b5ccb96cfcd5823aa7c6a94d3b94b9c9e41f78f97c0fef4494534e0e0fe4954416c405e7ab22e27ed8389fb27726de16da8d258841b9f3b69d8eb7e330
-  data.tar.gz: '0104599df035623ef931b5e2c97bec707496a31ffa7d1b099ba15fa8fbd32967491ddbdbcc4d752521e4996c9bcb89e45ccb4ac0fec7bdb942d1b092d02896a7'
+  metadata.gz: c52d3410ee2d848bf2f8506dc00b2c5aea509ec9c58f32058316f9a3caf8a50411d97be36675ced3d1606e8e67f5e055e717492723e00f8a8c9a7759d07fd5d6
+  data.tar.gz: 194f8f5eb5e11358738a11ea72a2f979f65db4286ee01c3103d9afa840adbd9caf23fb23b3d292ec87db4b110ff4e31b26e791078db4deeb4c63a761585f3a17

data/lib/plat4m/sniff/linux.rb

@@ -51,7 +51,7 @@ module Plat4m
                                   data['ID'].to_sym
                                 end,
                        distro: data['ID'].downcase,
-                       release: data['VERSION_ID']
+                       release: data['VERSION_ID'] || data['BUILD_ID']
                      }
                    elsif File.file?('/etc/redhat-release')
                      data = File.read('/etc/redhat-release').strip

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/system.rb

@@ -76,14 +76,14 @@ module Plat4m
       end
 
       def to_s
-        "#{@distro}-#{@release}[#{@id}#{@variant ? " #{@variant}" : ''}}]"
+        "#{@distro}-#{@release}[#{@id}#{@variant ? " #{@variant}" : ''}]"
       end
 
     end
 
     def initialize(platform, os)
       unless platform && platform.complete? && os && os.complete?
-        raise "Invalid system specification [#{os} @ #{platform}]"
+        raise "Invalid system specification : #{os} @ #{platform}"
       end
       @platform = platform
       @os = os

data/lib/plat4m/version.rb

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

metadata

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