hwid 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 838db53f8809add27ff2c04ffc860b1a5c1c643f67d4de1b859c4206bb0de653
-  data.tar.gz: 32aac1b8014de46a4f98b690f3006cad9e5b9f05852cbfd1cebc7a5148ee0f33
+  metadata.gz: 347ac63e9b96d23e4023bf5aadf258d5c80b5a0246361baeae9fea081287602c
+  data.tar.gz: 8dca11a19ca1ad94776702b3be99f0c78887e87af3f26a667b0368d8d85c087b
 SHA512:
-  metadata.gz: 3e2f3db416287f9dd923f7e2d22a1c053b04b24979fa847b31a1af6e94c329cc5dfd2b533bc5dad31b524619e58dfb32ed7b2ae09ffc1c9049ca0067c9ae1b15
-  data.tar.gz: 89b80f249c84c9b8933b43f17b71d7bbd18f3ae4dbb290560e9deb4a9016f07f9e799c0afd0ca89ec39fdc2550afcc4599411ac80991754d23fb78913967f2a4
+  metadata.gz: 1124b3a1888b84ecd94cb80b98d192625b3f9bc7d99d3b22bf39eb88e48e618b72e08ab20d6022b07d351a2c6d9627f90ed31764b3b55a04fbe76abcaa50fd13
+  data.tar.gz: 35fc3b996254f7e2c365bf50121b81da8e6073d26073819515bb0b217cea6653388fbd7769f1e302dbf9ad897bc5856320c10442cd97b38db4fbbcc4b223328d

data/lib/hwid/base.rb

@@ -30,16 +30,18 @@ module Hwid
       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 << "linux" if (/linux/ =~ RUBY_PLATFORM) != nil
       platform
     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,19 @@ 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.gsum(":","")
+      res=res.gsub("\n","")
+      #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.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Scott Sproule
@@ -17,12 +17,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- README.md
 - bin/hwid.rb
-- hwid-0.3.2.gem
-- hwid.gemspec
 - lib/hwid.rb
 - lib/hwid/base.rb
 - test/coverage/assets/0.7.1/application.css

data/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-ruby '2.6.6'
-gem "codeclimate-test-reporter"
-gem "minitest"
-#gem "minitest-rails"
-gemspec

data/Gemfile.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hwid (0.3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    codeclimate-test-reporter (1.0.9)
-      simplecov (<= 0.13)
-    docile (1.1.5)
-    json (2.3.1)
-    minitest (5.14.1)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  codeclimate-test-reporter
-  hwid!
-  minitest
-
-RUBY VERSION
-   ruby 2.6.6p146
-
-BUNDLED WITH
-   1.17.3

data/README.md

@@ -1,19 +0,0 @@
-[![Build Status](https://travis-ci.org/semdinsp/hwid.svg?branch=master)](https://travis-ci.org/semdinsp/hwid)[![Code Climate](https://codeclimate.com/github/semdinsp/hwid/badges/gpa.svg)](https://codeclimate.com/github/semdinsp/hwid)
-[![Gem Version](https://badge.fury.io/rb/hwid.png)](http://badge.fury.io/rb/hwid)
-
-hwid gem
-============
-
-return the hardware id of the system the gem is running on.
-
-Simple hwid id
-=====================
-THis is not secure but gives  a simple way to identify the hardware from a particular client application.
-
-It is a bit slow so perhaps only call it upon startup
-
-Usage
-=======
-
-    Hwid.systemid
-    

data/hwid.gemspec

@@ -1,14 +0,0 @@
-Gem::Specification.new do |s|
-  s.name        = "hwid"
-  s.version     = "0.3.3"
-  s.author      = "Scott Sproule"
-  s.email       = "scott.sproule@ficonab.com"
-  s.homepage    = "http://github.com/semdinsp/hwid"
-  s.summary     = "Hardware id for mac and rasp pi (not secure)"
-  s.description = "Get a rough hardware id of the system that the gem is running on" 
-  s.executables = ['hwid.rb']    #should be "name.rb"
-  s.files        = Dir["{lib,test}/**/*"] +Dir["bin/*.rb"] + Dir["[A-Z]*"] # + ["init.rb"]
-  s.require_path = "lib"
-  s.license = 'MIT'
-  s.required_rubygems_version = ">= 1.3.4"
-end