rmodbus 1.1.4 → 1.1.5

data/NEWS.md

@@ -1,3 +1,7 @@
+###2012-07-17 Release 1.1.5
+
+1. Fixed issue [#24](https://github.com/flipback/rmodbus/issues/24) for RTUClient.
+
 ###2012-06-28 Release 1.1.4
 
 1. Fixed issue [#23](https://github.com/flipback/rmodbus/issues/23).

data/Rakefile

@@ -31,3 +31,7 @@ task :default => :spec
 
 require 'yard'
 YARD::Rake::YardocTask.new
+
+task :pry do
+  sh "bundle exec pry -r ./lib/rmodbus.rb"
+end

data/lib/rmodbus/sp.rb

@@ -36,6 +36,7 @@ module ModBus
       @read_timeout = opts[:read_timeout] unless opts[:read_timeout].nil?
 
       io = SerialPort.new(@port, @baud, @data_bits, @stop_bits, @parity)
+      io.flow_control = SerialPort::NONE
       io.read_timeout = @read_timeout
       io
     end

data/lib/rmodbus/version.rb

@@ -1,6 +1,6 @@
 # RModBus - free implementation of ModBus protocol on Ruby.
 #
-# Copyright (C) 2011  Timin Aleksey
+# Copyright (C) 2012  Timin Aleksey
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,5 +13,5 @@
 # GNU General Public License for more details.
 module ModBus
   # Package version
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/spec/logging_spec.rb

@@ -42,7 +42,7 @@ begin
       @sp = mock('Serial port')
       SerialPort.should_receive(:new).with("/dev/port1", 9600, 7, 2, SerialPort::ODD).and_return(@sp)    
       
-      @sp.stub!(:read_timeout)
+      @sp.should_receive(:flow_control=).with(SerialPort::NONE)
       @sp.stub!(:read_timeout=)
       
       @slave = ModBus::RTUClient.new("/dev/port1", 9600, :data_bits => 7, :stop_bits => 2, :parity => SerialPort::ODD).with_slave(1)

data/spec/rtu_client_spec.rb

@@ -5,7 +5,7 @@ describe ModBus::RTUClient do
     @sp = mock('Serial port')
     SerialPort.should_receive(:new).with("/dev/port1", 9600, 8, 1, 0).and_return(@sp)    
     @sp.stub!(:read_timeout=)
-    @sp.stub!(:read_timeout)
+    @sp.should_receive(:flow_control=).with(SerialPort::NONE)
     @sp.stub!(:read_nonblock)
 
     @cl = ModBus::RTUClient.new("/dev/port1", 9600, :data_bits => 8, :stop_bits => 1, :parity => SerialPort::NONE)
@@ -43,6 +43,7 @@ describe ModBus::RTUClient do
     SerialPort.should_receive(:new).with(port, baud, 8, 1, SerialPort::NONE).and_return(@sp)    
     @sp.should_receive(:closed?).and_return(false)
     @sp.should_receive(:close)
+    @sp.should_receive(:flow_control=).with(SerialPort::NONE)
     ModBus::RTUClient.connect(port, baud) do |cl|
       cl.port.should == port
       cl.baud.should == baud

data/spec/rtu_server_spec.rb

@@ -5,6 +5,7 @@ describe ModBus::RTUServer do
     @sp = mock "SerialPort"
     SerialPort.should_receive(:new).with('/dev/ttyS0', 4800, 7, 2, SerialPort::NONE).and_return(@sp)
     @sp.stub!(:read_timeout=)
+    @sp.should_receive(:flow_control=).with(SerialPort::NONE)
 
     @server = ModBus::RTUServer.new('/dev/ttyS0', 4800, 1, :data_bits => 7, :stop_bits => 2)
     @server.coils = [1,0,1,1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmodbus
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake