rubyserial 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf9ebb88fab33dab5ecbab092ef61a44e79f68f9
-  data.tar.gz: 8b87a90c0ea75207abd1a42dc39eb03eed3ed17c
+  metadata.gz: 7d014cad0d8238b82bf39b107e4a68c3ff7e2d16
+  data.tar.gz: ee8f9b64e23413ebceab097643078f0df1afb2e5
 SHA512:
-  metadata.gz: f5e575bf1e75f67c330a72429bb6fa6e2140b03d6af89225eeaeb8258bd36e4b7109340d092eff63fe89587859d299335726075f47fd873fe458f8de99b7a983
-  data.tar.gz: c6e97c61f1a61ea9f531d056a5b827ce41bd31d1eafba2bfc55d4a1e6919490a765acffb067a0d48457b30d61904da017f1bcf6e36afbe29364d20d48809d4ff
+  metadata.gz: c4ca69b2cb366a8a86cfcd898010af66f1fb69c33b4ae53a83d52c9e7cc4e5b56ca45bd3a13bd8bef0c3a511bf7a224a9926a63269c544521d1742a5775c00a3
+  data.tar.gz: 22216f7ec08c00d115c1760e104304639a5d86ed721db4cc646b844b64954581e92a350df43343e4edef79d863766542e60088150c811f5bdc4a8804985cadfb

data/.travis.yml

@@ -1,20 +1,28 @@
+dist: trusty
+sudo: false
 language: ruby
+addons:
+  apt:
+    packages:
+      - socat
+env:
+  - RUBYOPT=-rbundler/deprecate # workaround for bundler on rbx
 rvm:
-  - 2.3.1
+  - 2.4
+  - 2.3
   - 2.2
   - 2.1
   - jruby-9.1.2.0
-  - rbx-2
+  - rbx-3
   - ruby-head
   - jruby-head
 matrix:
   allow_failures:
-    - rvm: jruby-head
+    - rvm: rbx-3
     - rvm: ruby-head
+    - rvm: jruby-head
 before_install:
-  - gem query -i -n ^bundler$ -v'>=1.12.5' >/dev/null || gem install bundler
-install:
-  - sudo apt-get update && sudo apt-get install --force-yes socat
+  - gem install bundler --force
 script:
-  - bundle install
-  - CODECLIMATE_REPO_TOKEN=70754a8aa666790236dbbb910727648f4dbb1f73a28f886d0b0c9e39a36b5a79 bundle exec rspec -fd
+  - export CODECLIMATE_REPO_TOKEN=70754a8aa666790236dbbb910727648f4dbb1f73a28f886d0b0c9e39a36b5a79
+  - bundle exec ruby -rbundler/deprecate -S rspec -fd && bundle exec ruby -rbundler/deprecate -S codeclimate-test-reporter

data/Gemfile

@@ -3,4 +3,5 @@ source "http://rubygems.org"
 
 gemspec
 gem 'rspec', '~> 3.0.0'
-gem "codeclimate-test-reporter", group: :test, require: nil
+gem 'simplecov', require: false, group: :test
+gem "codeclimate-test-reporter", '~> 1.0', group: :test, require: false

data/README.md

@@ -28,22 +28,22 @@ serialport = Serial.new '/dev/ttyACM0', 19200, 8, :even
 **write(data : String) -> Int**
 
 Returns the number of bytes written.
-Emits a `RubySerial::Exception` on error.
+Emits a `RubySerial::Error` on error.
 
 **read(length : Int) -> String**
 
 Returns a string up to `length` long. It is not guaranteed to return the entire
 length specified, and will return an empty string if no data is
-available. Emits a `RubySerial::Exception` on error.
+available. Emits a `RubySerial::Error` on error.
 
 **getbyte -> Fixnum or nil**
 
 Returns an 8 bit byte or nil if no data is available.
-Emits a `RubySerial::Exception` on error.
+Emits a `RubySerial::Error` on error.
 
-**RubySerial::Exception**
+**RubySerial::Error**
 
-A wrapper exception type, that returns the underlying system error code.
+A wrapper error type that returns the underlying system error code and inherits from IOError.
 
 ## Running the tests
 

data/appveyor.yml

@@ -4,7 +4,7 @@ platform:
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - ruby -v
-  - gem install bundler
+  - gem install bundler --force
   - bundle install
   - ps: Start-FileDownload https://github.com/hybridgroup/rubyserial/raw/appveyor_deps/com0com.cer
   - ps: C:\"Program Files"\"Microsoft SDKs"\Windows\v7.1\Bin\CertMgr.exe /add com0com.cer /s /r localMachine root
@@ -16,13 +16,14 @@ install:
 
 test_script:
   - SET CODECLIMATE_REPO_TOKEN=70754a8aa666790236dbbb910727648f4dbb1f73a28f886d0b0c9e39a36b5a79
-  - bundle exec rspec -fd
+  - bundle exec rspec -fd && bundle exec codeclimate-test-reporter
 
 environment:
   matrix:
+    - ruby_version: 24
+    - ruby_version: 23
     - ruby_version: 22
     - ruby_version: 21
     - ruby_version: 200
-    - ruby_version: 193
 
 build: off

data/lib/rubyserial.rb

@@ -6,7 +6,7 @@ require 'ffi'
 module RubySerial
   ON_WINDOWS = RbConfig::CONFIG['host_os'] =~ /mswin|windows|mingw/i
   ON_LINUX = RbConfig::CONFIG['host_os'] =~ /linux/i
-  class Exception < Exception
+  class Error < IOError
   end
 end
 

data/lib/rubyserial/linux_constants.rb

@@ -211,12 +211,12 @@ module RubySerial
               :c_ospeed, :uint
     end
 
-    attach_function :ioctl, [ :int, :ulong, RubySerial::Posix::Termios], :int
-    attach_function :tcsetattr, [ :int, :int, RubySerial::Posix::Termios ], :int
-    attach_function :fcntl, [:int, :int, :varargs], :int
-    attach_function :open, [:pointer, :int], :int
-    attach_function :close, [:int], :int
-    attach_function :write, [:int, :pointer,  :int],:int
-    attach_function :read, [:int, :pointer,  :int],:int
+    attach_function :ioctl, [ :int, :ulong, RubySerial::Posix::Termios], :int, blocking: true
+    attach_function :tcsetattr, [ :int, :int, RubySerial::Posix::Termios ], :int, blocking: true
+    attach_function :fcntl, [:int, :int, :varargs], :int, blocking: true
+    attach_function :open, [:pointer, :int], :int, blocking: true
+    attach_function :close, [:int], :int, blocking: true
+    attach_function :write, [:int, :pointer,  :int],:int, blocking: true
+    attach_function :read, [:int, :pointer,  :int],:int, blocking: true
   end
 end

data/lib/rubyserial/osx_constants.rb

@@ -179,11 +179,11 @@ module RubySerial
               :c_ospeed, :ulong
     end
 
-    attach_function :tcsetattr, [ :int, :int, RubySerial::Posix::Termios ], :int
-    attach_function :fcntl, [:int, :int, :varargs], :int
-    attach_function :open, [:pointer, :int], :int
-    attach_function :close, [:int], :int
-    attach_function :write, [:int, :pointer,  :int],:int
-    attach_function :read, [:int, :pointer,  :int],:int
+    attach_function :tcsetattr, [ :int, :int, RubySerial::Posix::Termios ], :int, blocking: true
+    attach_function :fcntl, [:int, :int, :varargs], :int, blocking: true
+    attach_function :open, [:pointer, :int], :int, blocking: true
+    attach_function :close, [:int], :int, blocking: true
+    attach_function :write, [:int, :pointer,  :int],:int, blocking: true
+    attach_function :read, [:int, :pointer,  :int],:int, blocking: true
   end
 end

data/lib/rubyserial/posix.rb

@@ -6,26 +6,26 @@ class Serial
     @fd = RubySerial::Posix.open(address, file_opts)
 
     if @fd == -1
-      raise RubySerial::Exception, RubySerial::Posix::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Posix::ERROR_CODES[FFI.errno]
     else
       @open = true
     end
 
     fl = RubySerial::Posix.fcntl(@fd, RubySerial::Posix::F_GETFL, :int, 0)
     if fl == -1
-      raise RubySerial::Exception, RubySerial::Posix::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Posix::ERROR_CODES[FFI.errno]
     end
 
     err = RubySerial::Posix.fcntl(@fd, RubySerial::Posix::F_SETFL, :int, ~RubySerial::Posix::O_NONBLOCK & fl)
     if err == -1
-      raise RubySerial::Exception, RubySerial::Posix::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Posix::ERROR_CODES[FFI.errno]
     end
 
     @config = build_config(baude_rate, data_bits, parity)
 
     err = RubySerial::Posix.tcsetattr(@fd, RubySerial::Posix::TCSANOW, @config)
     if err == -1
-      raise RubySerial::Exception, RubySerial::Posix::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Posix::ERROR_CODES[FFI.errno]
     end
   end
 
@@ -36,7 +36,7 @@ class Serial
   def close
     err = RubySerial::Posix.close(@fd)
     if err == -1
-      raise RubySerial::Exception, RubySerial::Posix::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Posix::ERROR_CODES[FFI.errno]
     else
       @open = false
     end
@@ -49,7 +49,7 @@ class Serial
       buff = FFI::MemoryPointer.from_string(data[n..-1].to_s)
       i = RubySerial::Posix.write(@fd, buff, buff.size-1)
       if i == -1
-        raise RubySerial::Exception, RubySerial::Posix::ERROR_CODES[FFI.errno]
+        raise RubySerial::Error, RubySerial::Posix::ERROR_CODES[FFI.errno]
       else
         n = n+i
       end
@@ -63,7 +63,7 @@ class Serial
     buff = FFI::MemoryPointer.new :char, size
     i = RubySerial::Posix.read(@fd, buff, size)
     if i == -1
-      raise RubySerial::Exception, RubySerial::Posix::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Posix::ERROR_CODES[FFI.errno]
     end
     buff.get_bytes(0, i)
   end
@@ -72,7 +72,7 @@ class Serial
     buff = FFI::MemoryPointer.new :char, 1
     i = RubySerial::Posix.read(@fd, buff, 1)
     if i == -1
-      raise RubySerial::Exception, RubySerial::Posix::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Posix::ERROR_CODES[FFI.errno]
     end
 
     if i == 0

data/lib/rubyserial/version.rb

@@ -1,7 +1,7 @@
-# Copyright (c) 2014-2016 The Hybrid Group
+# Copyright (c) 2014-2017 The Hybrid Group and Friends
 
 module RubySerial
   unless const_defined?('VERSION')
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/rubyserial/windows.rb

@@ -9,7 +9,7 @@ class Serial
     @fd = RubySerial::Win32.CreateFileA("\\\\.\\#{address}", file_opts, 0, nil, RubySerial::Win32::OPEN_EXISTING, 0, nil)
     err = FFI.errno
     if err != 0
-      raise RubySerial::Exception, RubySerial::Win32::ERROR_CODES[err]
+      raise RubySerial::Error, RubySerial::Win32::ERROR_CODES[err]
     else
       @open = true
     end
@@ -18,7 +18,7 @@ class Serial
       dcb[:dcblength] = RubySerial::Win32::DCB::Sizeof
       err = RubySerial::Win32.GetCommState @fd, dcb
       if err == 0
-        raise RubySerial::Exception, RubySerial::Win32::ERROR_CODES[FFI.errno]
+        raise RubySerial::Error, RubySerial::Win32::ERROR_CODES[FFI.errno]
       end
       dcb[:baudrate] = baude_rate
       dcb[:bytesize] = data_bits
@@ -26,7 +26,7 @@ class Serial
       dcb[:parity]   = RubySerial::Win32::DCB::NOPARITY
       err = RubySerial::Win32.SetCommState @fd, dcb
       if err == 0
-        raise RubySerial::Exception, RubySerial::Win32::ERROR_CODES[FFI.errno]
+        raise RubySerial::Error, RubySerial::Win32::ERROR_CODES[FFI.errno]
       end
     end
 
@@ -38,7 +38,7 @@ class Serial
       timeouts[:write_total_timeout_constant]   = 10
       err = RubySerial::Win32.SetCommTimeouts @fd, timeouts
       if err == 0
-        raise RubySerial::Exception, RubySerial::Win32::ERROR_CODES[FFI.errno]
+        raise RubySerial::Error, RubySerial::Win32::ERROR_CODES[FFI.errno]
       end
     end
   end
@@ -48,7 +48,7 @@ class Serial
     count = FFI::MemoryPointer.new :uint32, 1
     err = RubySerial::Win32.ReadFile(@fd, buff, size, count, nil)
     if err == 0
-      raise RubySerial::Exception, RubySerial::Win32::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Win32::ERROR_CODES[FFI.errno]
     end
     buff.get_bytes(0, count.read_int)
   end
@@ -58,7 +58,7 @@ class Serial
     count = FFI::MemoryPointer.new :uint32, 1
     err = RubySerial::Win32.ReadFile(@fd, buff, 1, count, nil)
     if err == 0
-      raise RubySerial::Exception, RubySerial::Win32::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Win32::ERROR_CODES[FFI.errno]
     end
 
     if count.read_int == 0
@@ -73,7 +73,7 @@ class Serial
     count = FFI::MemoryPointer.new :uint32, 1
     err = RubySerial::Win32.WriteFile(@fd, buff, buff.size-1, count, nil)
     if err == 0
-      raise RubySerial::Exception, RubySerial::Win32::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Win32::ERROR_CODES[FFI.errno]
     end
     count.read_int
   end
@@ -91,7 +91,7 @@ class Serial
   def close
     err = RubySerial::Win32.CloseHandle(@fd)
     if err == 0
-      raise RubySerial::Exception, RubySerial::Win32::ERROR_CODES[FFI.errno]
+      raise RubySerial::Error, RubySerial::Win32::ERROR_CODES[FFI.errno]
     else
       @open = false
     end

data/lib/rubyserial/windows_constants.rb

@@ -263,13 +263,13 @@ module RubySerial
               :write_total_timeout_constant,    :uint32
     end
 
-    attach_function :CreateFileA,     [:pointer, :uint32, :uint32, :pointer, :uint32, :uint32, :pointer], :pointer
-    attach_function :CloseHandle,     [:pointer], :int
-    attach_function :ReadFile,        [:pointer, :pointer, :uint32, :pointer, :pointer], :int32
-    attach_function :WriteFile,       [:pointer, :pointer, :uint32, :pointer, :pointer], :int32
-    attach_function :GetCommState,    [:pointer, RubySerial::Win32::DCB], :int32
-    attach_function :SetCommState,    [:pointer, RubySerial::Win32::DCB], :int32
-    attach_function :GetCommTimeouts, [:pointer, RubySerial::Win32::CommTimeouts], :int32
-    attach_function :SetCommTimeouts, [:pointer, RubySerial::Win32::CommTimeouts], :int32
+    attach_function :CreateFileA,     [:pointer, :uint32, :uint32, :pointer, :uint32, :uint32, :pointer], :pointer, blocking: true
+    attach_function :CloseHandle,     [:pointer], :int, blocking: true
+    attach_function :ReadFile,        [:pointer, :pointer, :uint32, :pointer, :pointer], :int32, blocking: true
+    attach_function :WriteFile,       [:pointer, :pointer, :uint32, :pointer, :pointer], :int32, blocking: true
+    attach_function :GetCommState,    [:pointer, RubySerial::Win32::DCB], :int32, blocking: true
+    attach_function :SetCommState,    [:pointer, RubySerial::Win32::DCB], :int32, blocking: true
+    attach_function :GetCommTimeouts, [:pointer, RubySerial::Win32::CommTimeouts], :int32, blocking: true
+    attach_function :SetCommTimeouts, [:pointer, RubySerial::Win32::CommTimeouts], :int32, blocking: true
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyserial
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Adrian Zankich
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2017-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi