isaac_toolbelt 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3cd41e1f3660878d8bfe206f73372605af30c3
-  data.tar.gz: 6d3800305608e29d31d7d8715f2cd2950cb441e3
+  metadata.gz: 01eeb3a9a2a8173a9059f47bd45c50d569f050c3
+  data.tar.gz: 6b66188c4c5d9c6f2c0ac090f91545435c5dae6b
 SHA512:
-  metadata.gz: baf6d879abd057b1f05e0be8d273856bfba8038e0bfb6058aa8734c41a88ad5fb8437fd919ce30b565ce9958fb0456b050aa6a4a729e07934031fc93d373fc7e
-  data.tar.gz: c527a6997f2ca7b8ed5f0535f27530cb1d999fcb672a6f7311c570cbe47fda4ddefe2a89aea7f5fcb473ba8c477c28549a2102a1e98ff67abb5021abde1eb832
+  metadata.gz: f2d8cedc9bf9bc326c196088e73e70d2018f987b5913b450802592d72feb9669e556e989bf438d750b806356ce638cd031105fa8c24d8b53d9bb0755daef63c5
+  data.tar.gz: be3a23b24ed7bc56b8cd6e2f816d49f2f95863b200df06f4fa67cfd0650a448447bda83fedfd3dffa0d940535c2071e65eede1216f5c43c17da2f12d747652be

data/lib/isaac_toolbelt.rb

@@ -436,6 +436,7 @@ module IsaacToolbelt
     end
 
     def dfu_download(usb_vid, usb_pid, alt_name, file_path, do_reboot=false)
+      retry_count = 0
       loop do
         params = %W(dfu-util -v -d #{usb_vid}:#{usb_pid} --alt #{alt_name} -D #{file_path})
         params << '-R' if do_reboot
@@ -446,8 +447,13 @@ module IsaacToolbelt
         puts "dfu-util exit with: #{status.to_i}"
         if status.to_i == 0
           break
+        elsif retry_count >= 10
+          STDERR.puts 'USB Error!!!'
+          STDERR.puts 'Please reboot your workstation, then try again.'
+          exit 1
         else
-          sleep 1
+          retry_count += 1
+          sleep 0.1
         end
       end
     end
@@ -479,21 +485,21 @@ module IsaacToolbelt
       `dfu-util -l -d #{usb_vid}:#{usb_pid}`.split("\n").select{|l0|
         l0 =~ /Found/
       }.map {|str|
-        ver = str.slice(/ver=.+?,/).chop.split('=')[1]
-        devnum = str.slice(/devnum=.+?,/).chop.split('=')[1]
-        cfg = str.slice(/cfg=.+?,/).chop.split('=')[1]
-        intf = str.slice(/intf=.+?,/).chop.split('=')[1]
+        #ver = str.slice(/ver=.+?,/).chop.split('=')[1]
+        #devnum = str.slice(/devnum=.+?,/).chop.split('=')[1]
+        #cfg = str.slice(/cfg=.+?,/).chop.split('=')[1]
+        #intf = str.slice(/intf=.+?,/).chop.split('=')[1]
         alt = str.slice(/alt=.+?,/).chop.split('=')[1]
         name = str.slice(/name=.+?,/).gsub('"', '').chop.split('=')[1]
-        serial = str.slice(/serial.+/).gsub('"', '').split('=')[1]
+        #serial = str.slice(/serial.+/).gsub('"', '').split('=')[1]
         {
-          :ver => ver,
-          :devnum => devnum,
-          :cfg => cfg,
-          :intf => intf,
+          #:ver => ver,
+          #:devnum => devnum,
+          #:cfg => cfg,
+          #:intf => intf,
           :alt => alt,
-          :name => name,
-          :serial => serial
+          :name => name
+          #:serial => serial
         }
       }
     end

data/lib/isaac_toolbelt/version.rb

@@ -1,3 +1,3 @@
 module IsaacToolbelt
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isaac_toolbelt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - xshell inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler