ffi-serial 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3202efbedc0fb5ee6984b9f2f338b2594e216788
-  data.tar.gz: 759504a859ecc078d47316b89eb19a5f25940d41
+  metadata.gz: 4df3ee55c469455ed931dcfd49c71841ff9e990a
+  data.tar.gz: 96dac10a98e36b7109978e98cc600caf9d2d5a22
 SHA512:
-  metadata.gz: 06650bbfcf4d148d086a475b2d13779a184f7c126f44363fe475c4e272e45e0266834f02d68b4afb78371e5f2109ea282ff27b2ab37e6932afa582caa1a2e37c
-  data.tar.gz: 0bebc5200e44b6fb342429a9f82f500d2fa5f5951edb1c653780544d05d30146eef3062474d6cbd388b38b254a7c8053220f2f09d7dee687fea35112b2a31a19
+  metadata.gz: 0ba5fa92d9da8438db7474d90c32e57ecd1df4b4b125f592169da0f97a2946eecedaf430e32e23b0329306b7fc7e20b0957e4f6d38a83f5bd1f06e928ea34f4e
+  data.tar.gz: f6406a1f629b0ecc288ba678de3085947f04846da621f06b32bba3997189b9b1b91fdec671bee471ef13bf06f143696b711428d61ff4159607a1b671b712b218

data/lib/ffi-serial/posix.rb

@@ -35,6 +35,7 @@ module Serial #:nodoc:
       end
       LIBC.cfsetispeed(termios, baud)
       LIBC.cfsetospeed(termios, baud)
+
       termios.data_bits = data_bits
       termios.stop_bits = stop_bits
       termios.parity = parity
@@ -48,12 +49,7 @@ module Serial #:nodoc:
         termios[:c_iflag] = (termios[:c_iflag] | LIBC::CONSTANTS['IXON'] | LIBC::CONSTANTS['IXOFF'] | LIBC::CONSTANTS['IXANY'])
         termios[:c_cflag] = (termios[:c_cflag] | LIBC::CONSTANTS['CLOCAL'] | LIBC::CONSTANTS['CREAD'] | LIBC::CONSTANTS['HUPCL'])
 
-        # non-blocking read
-        termios[:cc_c][LIBC::CONSTANTS['VMIN']] = 0
-        termios[:cc_c][LIBC::CONSTANTS['VTIME']] = 0
-
         LIBC.tcsetattr(io,  termios)
-
         io.extend(self)
       rescue Exception
         begin; io.close; rescue Exception; end
@@ -62,6 +58,42 @@ module Serial #:nodoc:
       io
     end
 
+    # It seems like VMIN and VTIME is broken :(
+    # So this seems to be the only way to implement read the way it should be
+    def read(length = nil, buffer = nil) #:nodoc:
+      if length.nil?
+        IO.select([self]) # Block
+
+        if buffer.nil?
+          return super
+        else
+          return super(nil, buffer)
+        end
+      end
+
+      read_count = 0
+      data_read = []
+      while(length > read_count)
+        IO.select([self]) # Block
+        data_read << (partial_read = super(length))
+        read_count += partial_read.length
+      end
+
+      data_read = data_read.join
+      return data_read if buffer.nil?
+      buffer.gsub!(buffer, data_read) # :sigh: not sure how to do this better
+      buffer
+    end
+
+    def readpartial(length, buffer = nil) #:nodoc:
+      IO.select([self]) # Block
+      if buffer.nil?
+        super(length)
+      else
+        super(length, buffer)
+      end
+    end
+
     def baud #:nodoc:
       LIBC::CONSTANTS['BAUD_'].fetch(LIBC.cfgetispeed(LIBC.tcgetattr(self)))
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-serial
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Johan van der Vyver