rubyserial 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2f04ee25b99a43446963e07bc51a82bab7fc6b2
-  data.tar.gz: 0df2b7cbbde4edc8f268d1b78c744ff88d608a45
+  metadata.gz: bf9ebb88fab33dab5ecbab092ef61a44e79f68f9
+  data.tar.gz: 8b87a90c0ea75207abd1a42dc39eb03eed3ed17c
 SHA512:
-  metadata.gz: 764b79276ea5b8d352dda64d5ade0f9a0b260af4c45c845c45addd8c184b760e10e0eba0cd9ab2e2648fae84264a8c050c462e4702f7a45dd72ca0993e34b8d0
-  data.tar.gz: 510df41b207862690ce47456763ea0a8bcfeb0ccf19b7989e7defaeb52f98ed4ed0823468854e6483b82182b3abc7060c58fe81ee99cb27cebbcd835af470267
+  metadata.gz: f5e575bf1e75f67c330a72429bb6fa6e2140b03d6af89225eeaeb8258bd36e4b7109340d092eff63fe89587859d299335726075f47fd873fe458f8de99b7a983
+  data.tar.gz: c6e97c61f1a61ea9f531d056a5b827ce41bd31d1eafba2bfc55d4a1e6919490a765acffb067a0d48457b30d61904da017f1bcf6e36afbe29364d20d48809d4ff

data/.travis.yml

@@ -1,19 +1,18 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
+  - 2.3.1
   - 2.2
+  - 2.1
+  - jruby-9.1.2.0
+  - rbx-2
   - ruby-head
-  - jruby
   - jruby-head
-  - rbx-2
 matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
 before_install:
-  - gem update bundler
+  - 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
 script:

data/README.md

@@ -18,7 +18,9 @@ The interface to RubySerial should be (mostly) compatible with other Ruby serial
 
 ```ruby
 require 'rubyserial'
+serialport = Serial.new '/dev/ttyACM0' # Defaults to 9600 baud, 8 data bits, and no parity
 serialport = Serial.new '/dev/ttyACM0', 57600
+serialport = Serial.new '/dev/ttyACM0', 19200, 8, :even
 ```
 
 ## Methods

data/appveyor.yml

@@ -20,7 +20,9 @@ test_script:
 
 environment:
   matrix:
-    - ruby_version: "200-x64"
-    - ruby_version: "21-x64"
+    - ruby_version: 22
+    - ruby_version: 21
+    - ruby_version: 200
+    - ruby_version: 193
 
 build: off

data/lib/rubyserial.rb

@@ -2,18 +2,19 @@
 
 require 'rbconfig'
 require 'ffi'
-include RbConfig
 
 module RubySerial
+  ON_WINDOWS = RbConfig::CONFIG['host_os'] =~ /mswin|windows|mingw/i
+  ON_LINUX = RbConfig::CONFIG['host_os'] =~ /linux/i
   class Exception < Exception
   end
 end
 
-if CONFIG['host_os'] =~ /mswin|windows|mingw/i
+if RubySerial::ON_WINDOWS
   require 'rubyserial/windows_constants'
   require 'rubyserial/windows'
 else
-  if CONFIG['host_os'] =~ /linux/i
+  if RubySerial::ON_LINUX
     require 'rubyserial/linux_constants'
   else
     require 'rubyserial/osx_constants'

data/lib/rubyserial/linux_constants.rb

@@ -14,6 +14,8 @@ module RubySerial
     TCSANOW = 0
     TCSETS = 0x5402
     IGNPAR = 0000004
+    PARENB = 0000400
+    PARODD = 0001000
     CREAD = 0000200
     CLOCAL = 0004000
     VMIN = 6
@@ -60,6 +62,12 @@ module RubySerial
       4000000 => 0010017
     }
 
+    PARITY = {
+      :none => 0000000,
+      :even => PARENB,
+      :odd => PARENB | PARODD,
+    }
+
     ERROR_CODES = {
       1 => "EPERM",
       2 => "ENOENT",

data/lib/rubyserial/osx_constants.rb

@@ -11,6 +11,8 @@ module RubySerial
     F_GETFL = 3
     F_SETFL = 4
     IGNPAR = 0x00000004
+    PARENB = 0x00001000
+    PARODD = 0x00002000
     VMIN = 16
     VTIME = 17
     CLOCAL = 0x00008000
@@ -51,6 +53,12 @@ module RubySerial
       230400 => 230400
     }
 
+    PARITY = {
+      :none => 0x00000000,
+      :even => PARENB,
+      :odd => PARENB | PARODD,
+    }
+
     ERROR_CODES = {
       1 => "EPERM",
       2 => "ENOENT",

data/lib/rubyserial/posix.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2014-2016 The Hybrid Group
 
 class Serial
-  def initialize(address, baude_rate=9600, data_bits=8)
+  def initialize(address, baude_rate=9600, data_bits=8, parity=:none)
     file_opts = RubySerial::Posix::O_RDWR | RubySerial::Posix::O_NOCTTY | RubySerial::Posix::O_NONBLOCK
     @fd = RubySerial::Posix.open(address, file_opts)
 
@@ -21,7 +21,7 @@ class Serial
       raise RubySerial::Exception, RubySerial::Posix::ERROR_CODES[FFI.errno]
     end
 
-    @config = build_config(baude_rate, data_bits)
+    @config = build_config(baude_rate, data_bits, parity)
 
     err = RubySerial::Posix.tcsetattr(@fd, RubySerial::Posix::TCSANOW, @config)
     if err == -1
@@ -108,7 +108,7 @@ class Serial
     bytes.map { |e| e.chr }.join
   end
 
-  def build_config(baude_rate, data_bits)
+  def build_config(baude_rate, data_bits, parity)
     config = RubySerial::Posix::Termios.new
 
     config[:c_iflag]  = RubySerial::Posix::IGNPAR
@@ -117,7 +117,8 @@ class Serial
     config[:c_cflag]  = RubySerial::Posix::DATA_BITS[data_bits] |
       RubySerial::Posix::CREAD |
       RubySerial::Posix::CLOCAL |
-      RubySerial::Posix::BAUDE_RATES[baude_rate]
+      RubySerial::Posix::BAUDE_RATES[baude_rate] |
+      RubySerial::Posix::PARITY[parity]
 
     config[:cc_c][RubySerial::Posix::VMIN] = 0
 

data/lib/rubyserial/version.rb

@@ -2,6 +2,6 @@
 
 module RubySerial
   unless const_defined?('VERSION')
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/rubyserial/windows.rb

@@ -1,7 +1,10 @@
 # Copyright (c) 2014-2016 The Hybrid Group
 
 class Serial
-  def initialize(address, baude_rate=9600, data_bits=8)
+  def initialize(address, baude_rate=9600, data_bits=8, parity=:none)
+    if parity != :none
+      warn "warning: parity #{parity} is not supported on Windows.  Ignoring."
+    end
     file_opts = RubySerial::Win32::GENERIC_READ | RubySerial::Win32::GENERIC_WRITE
     @fd = RubySerial::Win32.CreateFileA("\\\\.\\#{address}", file_opts, 0, nil, RubySerial::Win32::OPEN_EXISTING, 0, nil)
     err = FFI.errno

data/spec/rubyserial_spec.rb

@@ -3,8 +3,7 @@ require 'rubyserial'
 describe "rubyserial" do
   before do
     @ports = []
-    require 'rbconfig'
-    if RbConfig::CONFIG['host_os'] =~ /mswin|windows|mingw/i
+    if RubySerial::ON_WINDOWS
       # NOTE: Tests on windows require com0com
       # https://github.com/hybridgroup/rubyserial/raw/appveyor_deps/setup_com0com_W7_x64_signed.exe
       @ports[0] = "\\\\.\\CNCA0"
@@ -130,4 +129,24 @@ describe "rubyserial" do
       expect(@sp2.gets('')).to eql("Something \n Something else \n\n")
     end
   end
+
+  describe 'config' do
+    it 'should accept EVEN parity' do
+      @sp2.close
+      @sp.close
+      @sp2 = Serial.new(@ports[0], 19200, 8, :even)
+      @sp = Serial.new(@ports[1], 19200, 8, :even)
+      @sp.write("Hello!\n")
+      expect(@sp2.gets).to eql("Hello!\n")
+    end
+
+    it 'should accept ODD parity' do
+      @sp2.close
+      @sp.close
+      @sp2 = Serial.new(@ports[0], 19200, 8, :odd)
+      @sp = Serial.new(@ports[1], 19200, 8, :odd)
+      @sp.write("Hello!\n")
+      expect(@sp2.gets).to eql("Hello!\n")
+    end
+  end
 end

metadata

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