rmodbus 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecce0e7d2825aed58c4c71440c7503a22ef5536e
-  data.tar.gz: e146d2b22d73acacb18b86f5726f385e5030460c
+  metadata.gz: 81e104f4823d31c4054dcd5b0aba2daf6b4436fa
+  data.tar.gz: af007cd327a5a3fb9f7e6772bc4e7a8be70eeedb
 SHA512:
-  metadata.gz: 8761eeec49c335bcacb0da9dc1fd2e01b4e3aa8a564649193b1fb95d845346cfe296e2081253081520459656acaf29a8312f9fa2c400cc037a04e440de30c79d
-  data.tar.gz: 2a2c3644dc58fb84d2cdd3063736df405f30ab1d36fecb21942e84eaa44ef17c1b769217508c3a4719ed0a3226e3797c6b3d6ad8ab38babb2db7ae525c364608
+  metadata.gz: d8014693cac52f75394dd88b3ffd5edff75961829878ec2b2b1cbabe9b4db9528b925da17ff3c5c89024addc0029ba03a95aa89a116fb3f36cb03526709a2d07
+  data.tar.gz: 17eaaed42bb65f5c879dfec586dacc2f967aaaee5e4e3d1dcd6c191fb426f14badd6a03bbc5a1d23a0f3015a869de1db7d630d4c189e611830597b4f0c29395a

data/NEWS.md

@@ -1,3 +1,7 @@
+###2016-10-18 Release 1.3.0
+
+1. Turn the following dependencies optional: serialport, gserver
+
 ###2016-09-20 Release 1.2.8
 
 1. Fix warning on ruby 2.3 when calling Timeout.timeout

data/README.md

@@ -1,11 +1,11 @@
-RModBus [![Build Status](https://secure.travis-ci.org/flipback/rmodbus.png)](http://travis-ci.org/flipback/rmodbus) [![Gem Version](https://badge.fury.io/rb/rmodbus.svg)](http://badge.fury.io/rb/rmodbus)
+RModBus [![Build Status](https://secure.travis-ci.org/rmodbus/rmodbus.png)](http://travis-ci.org/rmodbus/rmodbus) [![Gem Version](https://badge.fury.io/rb/rmodbus.svg)](http://badge.fury.io/rb/rmodbus)
 ==========================
 
 **RModBus** - free implementation of ModBus protocol in pure Ruby.
 
 Features
 ---------------------------
-  - Ruby 2.1, 2.2 and JRuby (without serial ModBus RTU)
+  - Ruby 2.2, 2.3 and JRuby (without serial ModBus RTU)
   - TCP, RTU, RTU over TCP protocols
   - Client(master) and server(slave)
   - 16, 32 -bit and float registers
@@ -31,6 +31,29 @@ Download and install RModBus with the following:
 gem install rmodbus
 ```
 
+Or if you are using bundler, add to your Gemfile:
+
+```
+gem 'rmodbus'
+```
+
+If you want to use ModBus over serial, you will also need to install the 'serialport' gem.
+If you are using bundler, add to your Gemfile:
+
+```
+gem 'serialport'
+```
+
+If you want to use ModBus::TCPServer or ModBus::RTUViaTCPServer and are using Ruby >= 2.2,
+you will also need to install the 'gserver' gem. If you are using bundler, add to your Gemfile:
+
+```
+gem 'gserver'
+```
+
+Please note that GServer is deprecated, and I'm looking for a better solution.
+Contributions are welcome!
+
 Example
 ------------------------------------
 
@@ -54,13 +77,18 @@ Example
     end
   ```
 
-GitHub
+Versioning
 ----------------------------------
 
-You can checkout source code from GitHub repository:
+This project will follow http://semver.org/
 
 ```
-git clone git://github.com/flipback/RModBus.git
+Given a version number MAJOR.MINOR.PATCH, increment the:
+
+MAJOR version when you make incompatible API changes,
+MINOR version when you add functionality in a backwards-compatible manner, and
+PATCH version when you make backwards-compatible bug fixes.
+Additional labels for pre-release and build metadata are available as extensions to the MAJOR.MINOR.PATCH format.
 ```
 
 Reference
@@ -68,6 +96,6 @@ Reference
 
 Home page: http://rmodbus.flipback.net
 
-RModBus on GitHub: http://github.com/flipback/RModBus
+RModBus on GitHub: http://github.com/rmodbus/rmodbus
 
 ModBus specifications: http://www.modbus.org/specs.php

data/lib/rmodbus/sp.rb

@@ -12,6 +12,12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+begin
+  require 'serialport'
+rescue Exception => e
+  warn "[WARNING] Install `serialport` gem for use RTU protocols"
+end
+
 module ModBus
   module SP
     attr_reader :port, :baud, :data_bits, :stop_bits, :parity, :read_timeout
@@ -42,4 +48,3 @@ module ModBus
     end
   end
 end
-

data/lib/rmodbus/version.rb

@@ -13,5 +13,5 @@
 # GNU General Public License for more details.
 module ModBus
   # Package version
-  VERSION = '1.2.8'
+  VERSION = '1.3.0'
 end

data/lib/rmodbus.rb

@@ -9,31 +9,28 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-require 'rmodbus/errors'
-require 'rmodbus/ext'
-require 'rmodbus/debug'
-require 'rmodbus/options'
-require 'rmodbus/rtu'
-require 'rmodbus/tcp'
-require 'rmodbus/slave'
-require 'rmodbus/client'
-require 'rmodbus/server'
-require 'rmodbus/tcp_slave'
-require 'rmodbus/tcp_client'
-require 'rmodbus/tcp_server'
-
-begin
-  require 'serialport'
-  require 'rmodbus/sp'
-  require 'rmodbus/rtu_slave'
-  require 'rmodbus/rtu_client'
-  require 'rmodbus/rtu_server'
-rescue Exception => e
-  warn "[WARNING] Install `serialport` gem for use RTU protocols"
-end
 
-require 'rmodbus/rtu_via_tcp_slave'
-require 'rmodbus/rtu_via_tcp_client'
-require 'rmodbus/rtu_via_tcp_server'
+require 'rmodbus/ext'
 require 'rmodbus/proxy'
 require 'rmodbus/version'
+
+module ModBus
+  autoload :Errors, 'rmodbus/errors'
+  autoload :Debug, 'rmodbus/debug'
+  autoload :Options, 'rmodbus/options'
+  autoload :SP, 'rmodbus/sp'
+  autoload :RTU, 'rmodbus/rtu'
+  autoload :TCP, 'rmodbus/tcp'
+  autoload :Slave, 'rmodbus/slave'
+  autoload :Client, 'rmodbus/client'
+  autoload :Server, 'rmodbus/server'
+  autoload :TCPSlave, 'rmodbus/tcp_slave'
+  autoload :TCPClient, 'rmodbus/tcp_client'
+  autoload :TCPServer, 'rmodbus/tcp_server'
+  autoload :RTUSlave, 'rmodbus/rtu_slave'
+  autoload :RTUClient, 'rmodbus/rtu_client'
+  autoload :RTUServer, 'rmodbus/rtu_server'
+  autoload :RTUViaTCPSlave, 'rmodbus/rtu_via_tcp_slave'
+  autoload :RTUViaTCPClient, 'rmodbus/rtu_via_tcp_client'
+  autoload :RTUViaTCPServer, 'rmodbus/rtu_via_tcp_server'
+end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 # -*- coding: ascii
 require "rmodbus"
 
-
 class RaiseResponseMismatch
   def initialize(message, request, response)
     @expected_message, @expected_request, @expected_response = message, request, response

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmodbus
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - A.Timin, J. Sanders, K. Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,30 +84,30 @@ dependencies:
   name: serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gserver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 description: 
 email: atimin@gmail.com
 executables: []