lib/usbutils.rb in usbutils-0.0.1 vs lib/usbutils.rb in usbutils-0.0.2

@@ -4,13 +4,10 @@
 require "usbutils/version"
 require "usbutils/cli"
 
 module USBUtils
   class << self
-    def reset(serial)
-    end
-
     def find_by(by, value)
       devices.each do |device|
         return device if device[by.to_sym] == value
       end
       raise "device not found: #{by}:#{value}"
@@ -19,41 +16,42 @@
     def devices
       devices = []
       Dir.glob("/sys/bus/usb/devices/usb*") do |device|
         set_device(devices, device, 0, 0)
       end
-      devices
-
       usb = LIBUSB::Context.new
       usb.devices.each do |usbdev|
         idvendor  = format("%04x", usbdev.idVendor)
-	idproduct = format("%04x", usbdev.idProduct)
+        idproduct = format("%04x", usbdev.idProduct)
         device = devices.select {|item| item[:idvendor] == idvendor && item[:idproduct] == idproduct}.first
-	device[:usbdev] = usbdev
+        device[:usbdev] = usbdev if device
       end
       devices
     end
 
     def set_device(devices, devpath, parent, level)
       return unless FileTest::directory?(devpath)
       Dir.chdir(devpath) do
-        next unless File.exists? "#{devpath}/serial"
-	busnum       = `cat busnum`.chomp
-	devnum       = `cat devnum`.chomp
-	idvendor     = `cat idVendor`.chomp
-	idproduct    = `cat idProduct`.chomp
-        manufacturer = `cat manufacturer`.chomp
-        product      = `cat product`.chomp
-        serial       = `cat serial`.chomp
-        devices << {
-          :serial       => serial,
-          :idvendor     => idvendor,
-          :idproduct    => idproduct,
-          :manufacturer => manufacturer,
-          :product      => product,
-        }
-        Dir.glob("#{busnum}-*") do |subdev|
-          set_device devices, "#{devpath}/#{subdev}", devnum, level + 1
+        next unless File.exists? "busnum"
+        busnum = `cat busnum`.chomp
+        if File.exists? "serial"
+          devnum       = `cat devnum`.chomp
+          idvendor     = `cat idVendor`.chomp
+          idproduct    = `cat idProduct`.chomp
+          manufacturer = `cat manufacturer`.chomp
+          product      = `cat product`.chomp
+          serial       = `cat serial`.chomp
+          devices << {
+            :serial       => serial,
+            :idvendor     => idvendor,
+            :idproduct    => idproduct,
+            :manufacturer => manufacturer,
+            :product      => product,
+          }
+        end
+        Dir.glob("#{devpath}/#{busnum}-*") do |subdev|
+          subdev = subdev.chomp
+          set_device devices, subdev, devnum, level + 1
         end
       end
     end
   end
 end