hwid 0.4.0 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 347ac63e9b96d23e4023bf5aadf258d5c80b5a0246361baeae9fea081287602c
-  data.tar.gz: 8dca11a19ca1ad94776702b3be99f0c78887e87af3f26a667b0368d8d85c087b
+  metadata.gz: b384f4c14d3ebd601ab9522c3af3a6c03f69e27950056fa3301afb3b76dc6a7c
+  data.tar.gz: fc47de366908605cdf864baa2c271c00cb79b537ab236271f5277586952afa7b
 SHA512:
-  metadata.gz: 1124b3a1888b84ecd94cb80b98d192625b3f9bc7d99d3b22bf39eb88e48e618b72e08ab20d6022b07d351a2c6d9627f90ed31764b3b55a04fbe76abcaa50fd13
-  data.tar.gz: 35fc3b996254f7e2c365bf50121b81da8e6073d26073819515bb0b217cea6653388fbd7769f1e302dbf9ad897bc5856320c10442cd97b38db4fbbcc4b223328d
+  metadata.gz: 55c083bbb4e72f07e5a87c49a47e8352b3cf30d699becd0130a33d883f362458616c91e072213c72ebd772b4ee913122065c975e5aaf273c7a469a8bbb5ccc08
+  data.tar.gz: 157ed7d5230b5647ad9727317106f6360a9aa942c85238878200c3ba62bac68b50a6f0fabe764ca0c3d764273251c4a73467c7621f7ab66286423d1016010df1

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,8 @@ module Hwid
     # returns array of platforms
     def get_platform
       platform=[]
+      testos=`uname -a`
+   #   puts "osname is #{testos}"
       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,15 +31,15 @@ module Hwid
       platform << "arm" if (/arm/ =~ RUBY_PLATFORM) != nil
       platform << "x86" if (/x86/ =~ RUBY_PLATFORM) != nil
       platform << "i686" if (/i686/ =~ RUBY_PLATFORM) != nil
-      platform << "debian" if  `uname -a`.include?('Debian')
-      platform << "microsoft" if  `uname -a`.include?('Microsoft')
-      platform << "ubuntu" if  `uname -a`.include?('Ubuntu')
+      platform << "microsoft" if testos.include?('Microsoft')
+      platform << "debian" if  testos.include?('Debian')
+      platform << "ubuntu" if  testos.include?('Ubuntu')
       platform << "linux" if (/linux/ =~ RUBY_PLATFORM) != nil
       platform
     end
     def systemid
       platform=get_platform
-       puts "debug: 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")
@@ -63,8 +65,9 @@ module Hwid
       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.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.4.0
+  version: 0.4.5
 platform: ruby
 authors:
 - Scott Sproule