hwid 0.3.5 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e14d5b2a5b55c8620bb2794d533748f233327f0d011a96b91fc0f96efb57c9b
-  data.tar.gz: d602cac4bf9e8109142f78c617a7e3089453f9e686bfc45376733d393b2e25a6
+  metadata.gz: 0cb3bf633548d93535b3a554aace9057ddd3cb9ed1e5484a152fe5190d4d2ade
+  data.tar.gz: 28446f39bbb19c5ab0bbdff17e1159a4ad1a08549dd90ef36cf5c33dbf1188f9
 SHA512:
-  metadata.gz: 7b1e76c3c7b0233c815afa593732fb2fe4c6a422d3e4e879e6d8a712a8ddba61cb8693c9f85ea80a872d09d5db5ddca35928a762858c34033d0fb49b51ade482
-  data.tar.gz: 064d2fc7614ba90648a0840be814d04580e07943bcf2897c30388ad56f0aab38c65180edc89078766dee8337b6dccda0db19dfd0b2be684971e9a9f105a358e6
+  metadata.gz: 9210faac3bb9d089dda264736ad52706be7d123a168d764d308910951be2658059ba8229d53c99b204d84aae9b9ab744ae9203eb69212aa59d969bc8aa5852f2
+  data.tar.gz: 4030153236dea31bda129bfff3ed44f5903938722a733403d3e64b97ae626126a77a28f127c9d85a210512ace7c4671b1f017b07bc5ac9c7711d43dd83e76160

data/bin/hwid.rb

@@ -2,4 +2,4 @@
 require 'rubygems'
 require 'hwid'
 puts 'System id is: ' + Hwid.systemid.to_s
-puts "Platform is:" + Hwid.platform.join(',')
+puts "Platform is: " + Hwid.platform.join(',')

data/lib/hwid.rb

@@ -3,5 +3,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   Dir[File.join(File.dirname(__FILE__), 'hwid/**/*.rb')].sort.each { |lib| require lib }
 
 module Hwid
-  VERSION = '0.0.1'
+  VERSION = '0.4.1'
 end

data/lib/hwid/base.rb

@@ -29,6 +29,7 @@ module Hwid
       platform << "arm" if (/arm/ =~ RUBY_PLATFORM) != nil
       platform << "x86" if (/x86/ =~ RUBY_PLATFORM) != nil
       platform << "i686" if (/i686/ =~ RUBY_PLATFORM) != nil
+      platform << "microsoft" if `uname -a`.include?('Microsoft')
       platform << "debian" if  `uname -a`.include?('Debian')
       platform << "ubuntu" if  `uname -a`.include?('Ubuntu')
       platform << "linux" if (/linux/ =~ RUBY_PLATFORM) != nil
@@ -36,10 +37,11 @@ module Hwid
     end
     def systemid
       platform=get_platform
-      # puts "platform is #{platform} #{RUBY_PLATFORM}"
+      puts "debug: platform is #{platform} #{RUBY_PLATFORM}"
       return get_rasp_id if platform.include?("raspberry")
       return get_rasp_id if platform.include?("raspberry 2")
       return get_mac_id if platform.include?("mac")
+      return get_windows_id if platform.include?("microsoft")
       return get_linuxdebian_id if platform.include?("debian")  #virtaul box ??
       return get_linuxdebian_id if platform.include?("ubuntu")  #virtaul box ??
       return get_linux_id if platform.include?("linux")
@@ -57,6 +59,20 @@ module Hwid
       res=run_cmd('grep Serial  /proc/cpuinfo')
       self.parse(res)
     end
+    def get_windows_id
+      puts "running windows linux sigh"
+      res=run_cmd("lshw -quiet -class network -disable usb   -disable spd | grep -oP '(serial: )\\K.*'")
+      res=res.gsub("0000-","")
+      res=res.gsub(":","")
+      res=res.gsub("\n","")
+      res=res.gsub(" ","")
+      #res=run_cmd("lshw | grep -A 10 '*-cpu' | grep -oP '(serial: )\\K.*'")
+      #puts "Interim result is #{res.inspect}"
+      res=res.chomp
+      puts "windows command result: #{res}"
+      res
+    end
+    
     def get_mac_id
       res=run_cmd('/usr/sbin/system_profiler SPHardwareDataType -timeout 5 | grep Serial')
       self.parse(res)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hwid
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.2
 platform: ruby
 authors:
 - Scott Sproule