hwid 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ca05851f024c6658b2155a006897f92f02375c82d157f9c328c7f34cf5367f4
-  data.tar.gz: 82d85fdf8a37df99c581340bdf642e7d1a737128215915d2dfb05d8fd9027fef
+  metadata.gz: f1ddba97eb04afa0e369f6ea6bb0d7fead646b6c659e9248ed199ba32b1d2d51
+  data.tar.gz: f1b3efe3f416d71a3bb80febb9106cd04d2259f9d8b966e310e46e3e13df042c
 SHA512:
-  metadata.gz: 71d25a01a2901a51772f635e0a4606b4f3da3fcabd932d59473485e7cfaef5a788ab2ea9fd6b2c5297a7ec0995d86bfdde0a18eafc23453069a8d572ec96df45
-  data.tar.gz: 11617776ad81ae9349f4df2e2e150ab92014ae848c3bbe0aa488df99d464efb534f33d9e440d6a71a53ca17ab89f48cfec7ee6ac316eebdc21276b0a97aa6dc2
+  metadata.gz: f1dcabb6f5ef8adb5281cdae85a96902b2eb67cf8a882ba242b862d1ad44612b476408f610e061912c1ea6d61d85bfd7aaf5d5cdb19af3d3004aaaad2887b974
+  data.tar.gz: e87d5b4d3524d5d02afffc2d4a0ebe01f3fe9553703f30e724f69a6bad924f2d8c232f056b0fc75722b6da21f6a07fafc5c65be7200e245992f6b763cfa1e00e

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,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.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Scott Sproule
@@ -17,11 +17,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- README.md
 - bin/hwid.rb
-- 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.4"
-  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