hwid 0.3.6 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df9b22d944cd80752570ecab0e5166e41346de4120ddb27f0bf9a52e9d5e4a43
-  data.tar.gz: b37f213684bf33c0c29e0ced30b4c7fd293e287df608f781812667c36d1c45f8
+  metadata.gz: c96072e38d1e5e0588ee1e07933040f4a73e8575525d5259c94adac3b37196e0
+  data.tar.gz: 912ad6268eb868d51acf35458ee2fcfae60fbfe3515312d798a54fa4f3663ec9
 SHA512:
-  metadata.gz: 7cddbba729bbdfe16009db4847f01e897c24ec712666822a7bfe128105d45c090a527a5584001f33287038a9d457bc4356210ce2f1da70b80ffa062961e426e9
-  data.tar.gz: 6826a8ae18f63f7431c5ebc82b7bde80698d78139ded1e4179c175e22b1fb81484be59a2e5b62dfff6eea4f5ceb4c79b07f24c8f8bb02df09ae62282159455a3
+  metadata.gz: 0076ee5b029f906868342c64c9e46163c10afe5dbf811ff3690bbf9fa075becb110a9660c24e2329f045f1b50039007f6eb6a352399b052b29abc7e7e3813ae7
+  data.tar.gz: 774f65b97b8031f24d03d3ae395cba55335378fa0ea22006af033c26c6304d2ea8628a7a85b99c49d0bf2692cb263b55b85cb39ba5c0b089a50ac87217f1ba7d

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

@@ -22,6 +22,7 @@ module Hwid
     # returns array of platforms
     def get_platform
       platform=[]
+      puts "Unname is `uname -a`"
       platform << "raspberry" if (/arm-linux/ =~ RUBY_PLATFORM) != nil and `uname -a`.include?('armv6')
       platform << "raspberry" if `uname -a`.include?('armv6')
       platform << "raspberry 2" if (/armv7l-linux/ =~ RUBY_PLATFORM) != nil and !`uname -a`.include?('armv6')
@@ -29,6 +30,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,11 +38,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_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")
@@ -60,10 +62,11 @@ module Hwid
     end
     def get_windows_id
       puts "running windows linux sigh"
-      res=run_cmd("lshw -quiet -class network -disable usb -disable pci -disable cpuinfo -disable dmi -disable memory -disable isapnp -disable ide -disable device-tree -disable spd | grep -oP '(serial: )\\K.*'")
+      res=run_cmd("lshw -quiet -class network -disable usb   -disable spd | grep -oP '(serial: )\\K.*'")
       res=res.gsub("0000-","")
-      res=res.gsum(":","")
+      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

metadata

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