rs_232 3.0.0.pre4 → 3.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f99ca892ac80ba3022c111bccb858a8c96032eaa
-  data.tar.gz: 4ab0094376909cee30c54e131d8f0d26e7d11525
+  metadata.gz: ac888dadace7e7e0225d1c7bb4e9c9b816484493
+  data.tar.gz: 09acd44b4e25022e183b1c2aaa111ef69ecc6626
 SHA512:
-  metadata.gz: cb8209ffaca8ad0c96863e1d57ba74f11fb26c629842f6b68d7a0979ebb47e0481bc5bcecb04aa54b488d49b80b42b94c91884a33d2767b1ee97b705ccef4476
-  data.tar.gz: 5230eef3039911b7a34565f7d877e7c5296dc600ad0fdc9ba803196a5767900279546689018f7a2ffef9ef78c1a42b800c141162f03f20f6096947aa8b9d9c7b
+  metadata.gz: 566e436963f3bd808566f27fabaab010fea424f3a88de1ba99cb0635627d9fd580300516cc8a1420580b78c3d8175fee3ac827be8564f55cb3f38bb69782236e
+  data.tar.gz: bd1dfb14e6f7308c34eeba95622fd7d662e137692ead69ea4c53c0f4cc733f465afd18874f98735bc77a4e4ab8eaa59f62f6f2b348c9ebd29792544a67dc6d46

data/ext/rs_232/extconf.rb

@@ -15,25 +15,24 @@ $CFLAGS << ' -Wall -g'
 $warnflags = '-Wall'
 
 OS = case RbConfig::CONFIG['host_os'].downcase
-     when /linux/
-       'linux'
-     when /darwin/
-       'darwin'
-     when /freebsd/
-       'freebsd'
-     when /openbsd/
-       'openbsd'
-     when /sunos|solaris/
-       'solaris'
-     when /mswin|mingw/
-       'windows'
-     else
-       RbConfig::CONFIG['host_os'].downcase
+       when /linux/
+         'linux'
+       when /darwin/
+         'darwin'
+       when /freebsd/
+         'freebsd'
+       when /openbsd/
+         'openbsd'
+       when /sunos|solaris/
+         'solaris'
+       when /mswin|mingw/
+         'windows'
+       else
+         RbConfig::CONFIG['host_os'].downcase
      end
 
 have_header('ruby.h')
 have_header('stdio.h')
-have_library( 'stdc++' )
 
 if OS == 'windows'
   $VPATH << '$(srcdir)/windows'

data/ext/rs_232/windows/Port.c

@@ -167,7 +167,6 @@ void updateSettings(PortDescriptor *port)
 static int queryStatusIO(VALUE self)
 {
     PortDescriptor *port = NULL;
-    
     Data_Get_Struct(self, PortDescriptor, port);
     
     return port->status;
@@ -176,7 +175,7 @@ static int queryStatusIO(VALUE self)
 
 VALUE isOpenIO(VALUE self)
 {
-    return queryStatusIO(self) != PORT_OPEN ? Qtrue : Qfalse;
+    return queryStatusIO(self) != PORT_OPEN ? Qfalse : Qtrue;
 }
 
 
@@ -228,15 +227,12 @@ VALUE openIO(VALUE self)
     
     if (port->fd == INVALID_HANDLE_VALUE)
     {
-        
         port->status = PORT_CLOSED;
         rb_raise(rb_eIOError, "Unable to open comport: `%s`", port->settings.ComPort);
         
-    } else
-    {
-        
+    } else {
         port->status = PORT_OPEN;
-        rb_iv_set(self, "@open", INT2FIX(port->status));
+        rb_iv_set(self, "@open", isOpenIO(self));
         
         GetCommConfig(port->fd, &port->commConfig, &conf_length);
         GetCommState(port->fd, &(port->commConfig.dcb));
@@ -261,7 +257,6 @@ VALUE openIO(VALUE self)
 
 VALUE writeIO(VALUE self, VALUE message)
 {
-    
     int recv;
     int len;
     PortDescriptor *port = NULL;
@@ -275,31 +270,23 @@ VALUE writeIO(VALUE self, VALUE message)
     strcpy(cStr, RSTRING_PTR(message));
     
     if (!WriteFile(port->fd, cStr, len, (LPDWORD)((void *) &recv), NULL))
-    {
-        rb_raise(rb_eIOError, "IO: writing of the %d bytes has been failed", len);
-    }
-    
-    return (INT2FIX(recv));
+        rb_raise(rb_eIOError, "IO: writing of the %d bytes has been failed. Error #%d", len, (int) GetLastError());
     
+    return INT2FIX(recv);
 }
 
-
 VALUE readIO(VALUE self, VALUE rb_int)
 {
-    
-    {
-        Check_Type(rb_int, T_FIXNUM);
-    }
-    
+    Check_Type(rb_int, T_FIXNUM);
     PortDescriptor *port = NULL;
-    
     Data_Get_Struct(self, PortDescriptor, port);
     
     int n;
     int len = FIX2INT(rb_int);
     char buf[len];
     
-    ReadFile(port->fd, &buf, len, (LPDWORD)((void *) &n), NULL);
+    if(!ReadFile(port->fd, &buf, len, (LPDWORD)((void *) &n), NULL))
+        rb_raise(rb_eIOError, "IO: reading of %d bytes has been failed. Error #%d", len, (int) GetLastError());
     
     if (n > 0)
         return rb_str_new(buf, n);
@@ -310,19 +297,17 @@ VALUE readIO(VALUE self, VALUE rb_int)
 
 VALUE closeIO(VALUE self)
 {
-    
     PortDescriptor *port = NULL;
-    
     Data_Get_Struct(self, PortDescriptor, port);
     
-    flushIO(self);
-    port->status = CloseHandle(port->fd);
-    port->fd     = INVALID_HANDLE_VALUE;
-    
-    rb_iv_set(self, "@open", INT2FIX(port->status));
-    
-    return INT2FIX(port->status);
+    if (port->fd != INVALID_HANDLE_VALUE) {
+        flushIO(self);
+        port->status = CloseHandle(port->fd);
+        port->fd     = INVALID_HANDLE_VALUE;
+        rb_iv_set(self, "@open", isOpenIO(self));
+    }
     
+    return !isOpenIO(self);
 }
 
 

data/lib/rs_232/version.rb

@@ -1,3 +1,3 @@
 module Rs232
-  VERSION = '3.0.0.pre4'.freeze
+  VERSION = '3.0.0.pre5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rs_232
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre4
+  version: 3.0.0.pre5
 platform: ruby
 authors:
 - Roman Lishtaba