da_funk 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f293775e3af0f13bdb16ca16cda1d7dc7d9635b9
-  data.tar.gz: 7685609eade74e2810a7b4340c6ff852fc7f4491
+  metadata.gz: 9c887fe92fba65392534eb8a45739e53b1a7933e
+  data.tar.gz: b2ef0569959b2c769527b43eedae47a939dc4da1
 SHA512:
-  metadata.gz: e1ed56328ba17d28b857dc1b1d5e28cb931b6a39102c7768dffb89e9c349f1cf793ef6711970fa2eede9b7e1f390b64bc55312b33fcf1e2368c07e4b5659a491
-  data.tar.gz: b488c910836f039199d477209130ff146b17d0ece3213f1fc90a7b7b2bf60db5fc60ccac6a897c19ef5b79a43c14f4605dc9975c06cde339902e72de9d5ed7b3
+  metadata.gz: b009cc3a5b57cd7f5268a40ea1f85839499fddf7ad7c3150a13c4e247666328d7dcd2613ffc802705eb0acf5b8341be11c7f3676eb5d66f43e6aa473ba5651b6
+  data.tar.gz: 2dcd7f1a3b0047dc070e863cc77e36fc7336142d52dd7f3d3e673c52d20fe853fcb6bf6d93a8b4c482c7b9bd7fd4da8aa494005bbcd2d08c614161cfdedff236

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (0.27.0)
+    da_funk (0.28.0)
       archive-zip (~> 0.5)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.6)
@@ -22,7 +22,7 @@ GEM
     io-like (0.3.0)
     posxml_parser (0.29.0)
       funky-emv (~> 0.3)
-    rake (12.0.0)
+    rake (12.3.0)
     yard (0.9.12)
 
 PLATFORMS

data/RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # DaFunk
 
+### 0.28.0 - 2017-12-07
+
+- Support to interrupt file download if KEY CANCEL pressed.
+
 ### 0.27.0 - 2017-12-04
 
 - Update rake dependency.

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="0.27.0"
+  VERSION="0.28.0"
 end
 

data/lib/device/transaction/download.rb

@@ -113,7 +113,7 @@ class Device
         # Send Request
         socket.write(@request)
 
-        return COMMUNICATION_ERROR if (response_size = get_response_size(socket.read(4))) <= 0
+        return COMMUNICATION_ERROR if (response_size = get_response_size(read_header_size(socket))) <= 0
 
         return MAPREDUCE_RESPONSE_ERROR unless @first_packet = get_binary_term_beginning(response_size)
 
@@ -151,6 +151,36 @@ class Device
 
       private
 
+      def read_header_size(socket)
+        buf, error = socket_read(socket, 4, Device::Setting.tcp_recv_timeout.to_i, 0)
+        case error
+        when nil
+          buf
+        else
+          ""
+        end
+      end
+
+      def socket_read(socket, size, timeout_seconds, total_attempts)
+        total_buffer = ""
+        error = nil
+        attempts = 0
+        timeout = Time.now + timeout_seconds
+        loop do
+          buf = socket.recv_nonblock(size - total_buffer.size)
+          total_buffer << buf.to_s
+          break if total_buffer.size >= size
+          break(error = :socket_closed) if buf.nil?
+          if (Time.now > timeout)
+            attempts+=1
+            timeout = Time.now + timeout_seconds
+            break(error = :attempts_exceeded) if attempts > total_attempts
+          end
+          break(error = :user_cancel) if (getc(200) == Device::IO::CANCEL)
+        end
+        [total_buffer, error]
+      end
+
       def get_response_size(bytes)
         return -1 if bytes.to_s.size <= 0
         bytes.to_s.unpack("N*").first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake