usbutils 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44280c8cb845604e93470fc9b0ee9c012d281c5c
-  data.tar.gz: f8c12da7e5fd1ebb1cf568fcdaa91201b5b3a7d8
+  metadata.gz: f457bb52154815702f858cad6f446efaff89b0c4
+  data.tar.gz: cbb7883c2b255c2b26f86495686f593a87e80a78
 SHA512:
-  metadata.gz: d9a42ebc0646e43ea12e4ffca7987725e707f9f8969bf47f5bd1c474a264ba2a807267c8c074e4eea5f457b8e0851f6ac47307c56ea3115ed3219b2ee5f67a35
-  data.tar.gz: b5b6a9657b63de970880b70c2d0ed6df9c631ba2116f6ca55da743d099b9488e8fac741e8ac2634942917927de5011bf2c9697907f025181d21e419b3b6c2bb2
+  metadata.gz: 1f8b83a7d53c7f8d90122827eb1ce06f59296d3e4bb2042a9e010d47b5dc7c9bd31183413881e7247479d4bbd1389d862ab211858b09d323b9a38e6adbed6852
+  data.tar.gz: eb1881bdc559095a7c5d6890ca2504e52ac27c8e1e7939a7a37edb3b83ca6b4bf384f1b56f6a8670e40d26eafed5f0e5bd8b5c6c17cdd6c8e8a2784d5c121348

data/README.md

@@ -1,24 +1,30 @@
 # USBUtils
 
-TODO: Write a gem description
+Utilities to control the USB devices.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    $ gem install usbutils
 
-    gem 'usbutils'
+## Usage
 
-And then execute:
+show command list
 
-    $ bundle
+    $ usbutils
+    Commands:
+    usbutils devices            # list all usb devices
+    usbutils help [COMMAND]     # Describe available commands or one specific command
+    usbutils reset <serial no>  # reset device
 
-Or install it yourself as:
+show usb devices
 
-    $ gem install usbutils
+    $ usbutils devices
+    serial=0000:00:06.0	product=OHCI Host Controller	manufacturer=Linux 3.2.0-23-generic ohci_hcd
+    serial=01498A4D15005015	product=Galaxy Nexus	manufacturer=samsung
 
-## Usage
+reset(reconnect) usb device
 
-TODO: Write usage instructions here
+    $ usbutils reset 01498A4D15005015
 
 ## Contributing
 

data/bin/usb-devices

@@ -107,6 +107,7 @@ print_device() {
 	fi
 	speed=`cat speed`
 	maxchild=`cat maxchild`
+	printf "\nPATH: $devpath"
 	printf "\nT:  Bus=%02i Lev=%02i Prnt=%02i Port=%02i Cnt=%02i Dev#=%3i Spd=%-3s MxCh=%2i\n" \
 		$busnum $level $parent $port $count $devnum $speed $maxchild
 

data/lib/usbutils.rb

@@ -6,9 +6,6 @@ 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
@@ -21,14 +18,12 @@ module USBUtils
       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
@@ -36,23 +31,26 @@ module USBUtils
     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

data/lib/usbutils/cli.rb

@@ -4,30 +4,23 @@ require 'thor'
 
 module USBUtils
   class CLI < Thor
-    desc "find_by <by> <value>", "find device"
-    def find_by(by, value)
-      pp USBUtils.find_by(by, value)
-    end
-
-    desc "reset_by <by> <value>", "reset device"
-    def reset_by(by, value)
-      device = USBUtils.find_by(by, value)
-      device[:usbdev].open.reset_device
+    desc "devices", "list all usb devices"
+    option :detail, :aliases => "d"
+    def devices
+      devices = USBUtils.devices
+      USBUtils.devices.each do |device|
+        if options[:detail]
+          pp device
+        else
+          print "serial=#{device[:serial]}\tproduct=#{device[:product]}\tmanufacturer=#{device[:manufacturer]}\n"
+        end
+      end
     end
 
     desc "reset <serial no>", "reset device"
     def reset(serial)
       device = USBUtils.find_by(:serial, serial)
-      p device[:usbdev]
-      p device[:usbdev].open
-      #device[:usbdev].open.reset_device
-    end
-
-    desc "devices", "list all usb devices"
-    def devices
-      USBUtils.devices.each do |device|
-        pp device
-      end
+      device[:usbdev].open.reset_device
     end
   end
 end

data/lib/usbutils/version.rb

@@ -1,3 +1,3 @@
 module USBUtils
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usbutils
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - k-yamada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler