rmodbus 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81e104f4823d31c4054dcd5b0aba2daf6b4436fa
-  data.tar.gz: af007cd327a5a3fb9f7e6772bc4e7a8be70eeedb
+  metadata.gz: 527837e39897ba74bd43ca15325a17e931fea9a8
+  data.tar.gz: e244ecaa6b7ae3d0c2a80798ad4f799f58458a30
 SHA512:
-  metadata.gz: d8014693cac52f75394dd88b3ffd5edff75961829878ec2b2b1cbabe9b4db9528b925da17ff3c5c89024addc0029ba03a95aa89a116fb3f36cb03526709a2d07
-  data.tar.gz: 17eaaed42bb65f5c879dfec586dacc2f967aaaee5e4e3d1dcd6c191fb426f14badd6a03bbc5a1d23a0f3015a869de1db7d630d4c189e611830597b4f0c29395a
+  metadata.gz: 127f4c8fa6f2958425a750f144d70223747dc1b058a1e7954bad9bf1d1a15d8378e592c9f017f38807fbf66683790274a3e0fe9f782ee31a00634a48c95fa3d7
+  data.tar.gz: 54a418c81c178a32890040396f2658fc123d561cfd4821044b3f75168bf254c50a8bf32d388b78f12ac614f0192022dc108040ff55e183363b1d0e8d0d8863cc

data/README.md

@@ -88,14 +88,28 @@ 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
+Contributing
 ----------------------------------
 
-Home page: http://rmodbus.flipback.net
+See [CONTRIBUTING](CONTRIBUTING.md).
+
+Reference
+----------------------------------
 
 RModBus on GitHub: http://github.com/rmodbus/rmodbus
 
+Documentation: http://www.rubydoc.info/github/rmodbus/rmodbus
+
 ModBus specifications: http://www.modbus.org/specs.php
+
+License
+----------------------------------
+
+BSD-3-Clause
+
+Credits
+----------------------------------
+
+Aleksey Timin - original author

data/lib/rmodbus.rb

@@ -1,15 +1,3 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-# Copyright (C) 2008 - 2011 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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/ext'
 require 'rmodbus/proxy'
 require 'rmodbus/version'

data/lib/rmodbus/client.rb

@@ -1,17 +1,3 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-#
-# Copyright (C) 2008-2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-
 module ModBus
   # @abstract
   class Client
@@ -28,7 +14,7 @@ module ModBus
     # @yield return client object and close it before exit
     # @return [Client] client object
     def initialize(*args, &block)
-      # Defaults 
+      # Defaults
       @debug = false
       @raise_exception_on_mismatch = false
       @read_retry_timeout = 1

data/lib/rmodbus/debug.rb

@@ -1,22 +1,7 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2010-2011  Timin Aleksey
-# Copyright (C) 2010  Kelley Reynolds
-#
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-
 module ModBus
   module Debug
-    attr_accessor :debug, :raise_exception_on_mismatch, 
-                  :read_retries, :read_retry_timeout 
+    attr_accessor :debug, :raise_exception_on_mismatch,
+                  :read_retries, :read_retry_timeout
 
 
     private
@@ -45,4 +30,3 @@ module ModBus
     end
   end
 end
-

data/lib/rmodbus/errors.rb

@@ -1,56 +1,42 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-#
-# Copyright (C) 2008-2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-module ModBus
-
-  module Errors
-    class ProxyException < StandardError
-    end
-
-    class ModBusException < StandardError
-    end
-
-    class IllegalFunction < ModBusException
-    end
-
-    class IllegalDataAddress < ModBusException
-    end
-
-    class IllegalDataValue < ModBusException
-    end
-
-    class SlaveDeviceFailure < ModBusException
-    end
-
-    class Acknowledge < ModBusException
-    end
-
-    class SlaveDeviceBus < ModBusException
-    end
-
-    class MemoryParityError < ModBusException
-    end
-
-    class ModBusTimeout < ModBusException
-    end
-
+module ModBus
+  module Errors
+    class ProxyException < StandardError
+    end
+
+    class ModBusException < StandardError
+    end
+
+    class IllegalFunction < ModBusException
+    end
+
+    class IllegalDataAddress < ModBusException
+    end
+
+    class IllegalDataValue < ModBusException
+    end
+
+    class SlaveDeviceFailure < ModBusException
+    end
+
+    class Acknowledge < ModBusException
+    end
+
+    class SlaveDeviceBus < ModBusException
+    end
+
+    class MemoryParityError < ModBusException
+    end
+
+    class ModBusTimeout < ModBusException
+    end
+
     class ResponseMismatch < ModBusException
       attr_reader :request, :response
-      def initialize(msg, request, response)
+      def initialize(msg, request, response)
         super(msg)
         @request = request
         @response = response
-      end 
-    end
-  end
-end
+      end
+    end
+  end
+end

data/lib/rmodbus/ext.rb

@@ -1,94 +1,79 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-#
-# Copyright (C) 2009  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-
-class String
-
-  if RUBY_VERSION < "1.9"
-    def getbyte(index)
-      self[index].to_i
-    end
-  end
-
-  def unpack_bits
-    array_bit = []
-    self.unpack('b*')[0].each_char do |c|
-        array_bit << c.to_i
-    end
-    array_bit
-  end
- 
-  # Get word by index
-  # @param [Integer] i index first bytes of word
-  # @return unpacked word
-  def getword(i)
-    self[i,2].unpack('n')[0]
-  end
-end
-
-class Integer
-
-  # Shortcut or turning an integer into a word
-  def to_word
-    [self].pack('n')
-  end
-
-end
-
-class Array
-
-  # Given an array of 16bit Fixnum, we turn it into 32bit Int in big-endian order, halving the size
-  def to_32f
-    raise "Array requires an even number of elements to pack to 32bits: was #{self.size}" unless self.size.even?
-    self.each_slice(2).map { |(lsb, msb)| [msb, lsb].pack('n*').unpack('g')[0] }
-  end
-    
-  # Given an array of 32bit Floats, we turn it into an array of 16bit Fixnums, doubling the size
-  def from_32f
-    self.pack('g*').unpack('n*').each_slice(2).map { |arr| arr.reverse }.flatten
-  end
-
-  # Given an array of 16bit Fixnum, we turn it into 32bit Float in big-endian order, halving the size
-  def to_32i
-    raise "Array requires an even number of elements to pack to 32bits: was #{self.size}" unless self.size.even?
-    self.each_slice(2).map { |(lsb, msb)| [msb, lsb].pack('n*').unpack('N')[0] }
-  end
-
-  # Given an array of 32bit Fixnum, we turn it into an array of 16bit fixnums, doubling the size
-  def from_32i
-    self.pack('N*').unpack('n*').each_slice(2).map { |arr| arr.reverse }.flatten
-  end
-
-  def pack_to_word
-    word = 0
-    s = ""
-    mask = 0x01
-
-    self.each do |bit| 
-      word |= mask if bit > 0
-      mask <<= 1
-      if mask  == 0x100
-        mask = 0x01
-        s << word.chr
-        word = 0
-      end
-    end
-    unless mask == 0x01
-      s << word.chr
-    else
-      s
-    end
-  end
-
-end
-
+class String
+
+  if RUBY_VERSION < "1.9"
+    def getbyte(index)
+      self[index].to_i
+    end
+  end
+
+  def unpack_bits
+    array_bit = []
+    self.unpack('b*')[0].each_char do |c|
+        array_bit << c.to_i
+    end
+    array_bit
+  end
+
+  # Get word by index
+  # @param [Integer] i index first bytes of word
+  # @return unpacked word
+  def getword(i)
+    self[i,2].unpack('n')[0]
+  end
+end
+
+class Integer
+
+  # Shortcut or turning an integer into a word
+  def to_word
+    [self].pack('n')
+  end
+
+end
+
+class Array
+
+  # Given an array of 16bit Fixnum, we turn it into 32bit Int in big-endian order, halving the size
+  def to_32f
+    raise "Array requires an even number of elements to pack to 32bits: was #{self.size}" unless self.size.even?
+    self.each_slice(2).map { |(lsb, msb)| [msb, lsb].pack('n*').unpack('g')[0] }
+  end
+
+  # Given an array of 32bit Floats, we turn it into an array of 16bit Fixnums, doubling the size
+  def from_32f
+    self.pack('g*').unpack('n*').each_slice(2).map { |arr| arr.reverse }.flatten
+  end
+
+  # Given an array of 16bit Fixnum, we turn it into 32bit Float in big-endian order, halving the size
+  def to_32i
+    raise "Array requires an even number of elements to pack to 32bits: was #{self.size}" unless self.size.even?
+    self.each_slice(2).map { |(lsb, msb)| [msb, lsb].pack('n*').unpack('N')[0] }
+  end
+
+  # Given an array of 32bit Fixnum, we turn it into an array of 16bit fixnums, doubling the size
+  def from_32i
+    self.pack('N*').unpack('n*').each_slice(2).map { |arr| arr.reverse }.flatten
+  end
+
+  def pack_to_word
+    word = 0
+    s = ""
+    mask = 0x01
+
+    self.each do |bit|
+      word |= mask if bit > 0
+      mask <<= 1
+      if mask  == 0x100
+        mask = 0x01
+        s << word.chr
+        word = 0
+      end
+    end
+    unless mask == 0x01
+      s << word.chr
+    else
+      s
+    end
+  end
+
+end

data/lib/rmodbus/options.rb

@@ -1,21 +1,6 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-
 module ModBus
   module Options
-    attr_accessor :raise_exception_on_mismatch, 
-                  :read_retries, :read_retry_timeout 
+    attr_accessor :raise_exception_on_mismatch,
+                  :read_retries, :read_retry_timeout
   end
 end
-

data/lib/rmodbus/proxy.rb

@@ -1,16 +1,3 @@
-# ReadOnly and ReadWrite hash interface for modbus registers and coils
-#
-# Copyright (C) 2010  Kelley Reynolds
-#
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
 module ModBus
   # Given a slave and a type of operation, execute a single or multiple read using hash syntax
   class ReadOnlyProxy
@@ -31,7 +18,7 @@ module ModBus
       end
     end
   end
-  
+
   class ReadWriteProxy < ReadOnlyProxy
     # Write single or multiple values to a modbus slave depending on whether a Fixnum or a Range was given.
     # Note that in the case of multiples, a pluralized version of the method is sent to the slave. Also when
@@ -51,4 +38,4 @@ module ModBus
     end
   end
 
-end
+end

data/lib/rmodbus/rtu.rb

@@ -1,18 +1,3 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2010 - 2011  Timin Aleksey
-# Copyright (C) 2010  Kelley Reynolds
-#
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-
 module ModBus
   module RTU
     private
@@ -47,7 +32,7 @@ module ModBus
     def clean_input_buff
       # empty the input buffer
       if @io.class.public_method_defined? :flush_input
-        @io.flush_input 
+        @io.flush_input
       else
         @io.flush
       end
@@ -56,8 +41,8 @@ module ModBus
     def send_rtu_pdu(pdu)
       msg = @uid.chr + pdu
       msg << crc16(msg).to_word
-      
-      clean_input_buff  
+
+      clean_input_buff
       @io.write msg
 
       log "Tx (#{msg.size} bytes): " + logging_bytes(msg)
@@ -177,4 +162,3 @@ module ModBus
 
   end
 end
-

data/lib/rmodbus/rtu_client.rb

@@ -1,16 +1,3 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2009-2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
 module ModBus
   # RTU client implementation
   # @example

data/lib/rmodbus/rtu_server.rb

@@ -1,17 +1,3 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2010-2011 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-#
 module ModBus
   # RTU server implementation
   # @example

data/lib/rmodbus/rtu_slave.rb

@@ -1,16 +1,3 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
 module ModBus
   # RTU slave implementation
   # @example

data/lib/rmodbus/rtu_via_tcp_client.rb

@@ -1,17 +1,3 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2009-2011  Timin Aleksey
-# Copyright (C) 2010  Kelley Reynolds
-#
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
 module ModBus
   # RTU over TCP client implementation
   # @example

data/lib/rmodbus/rtu_via_tcp_server.rb

@@ -1,19 +1,8 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2010  Timin Aleksey
-# Copyright (C) 2010  Kelley Reynolds
-#
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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 'gserver'
+begin
+  require 'gserver'
+rescue
+  warn "[WARNING] Install `gserver` gem for use RTUViaTCPServer"
+end
 
 module ModBus
   # RTU over TCP server implementation
@@ -33,14 +22,14 @@ module ModBus
     # Init server
     # @param [Integer] port listen port
     # @param [Integer] uid slave device
-    # @param [Hash] opts options of server
+    # @param [Hash] opts options of server
     # @option opts [String] :host host of server default '127.0.0.1'
     # @option opts [Float, Integer] :max_connection max of TCP connection with server default 4
-    def initialize(port = 10002, uid = 1, opts = {})
-			@uid = uid
-      opts[:host] = DEFAULT_HOST unless opts[:host]
-      opts[:max_connection] = 4 unless opts[:max_connection]
-			super(port, host = opts[:host], maxConnection = opts[:max_connection])
+    def initialize(port = 10002, uid = 1, opts = {})
+			@uid = uid
+      opts[:host] = DEFAULT_HOST unless opts[:host]
+      opts[:max_connection] = 4 unless opts[:max_connection]
+			super(port, host = opts[:host], maxConnection = opts[:max_connection])
 		end
 
     protected

data/lib/rmodbus/rtu_via_tcp_slave.rb

@@ -1,16 +1,3 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
 module ModBus
   # RTU over TCP slave implementation
   # @example

data/lib/rmodbus/server.rb

@@ -1,18 +1,3 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2010  Timin Aleksey
-# Copyright (C) 2010  Kelley Reynolds
-#
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-
 module ModBus
   # Module for implementation ModBus server
   module Server

data/lib/rmodbus/slave.rb

@@ -1,18 +1,3 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-#
-# Copyright (C) 2008-2011  Timin Aleksey
-# Copyright (C) 2010  Kelley Reynolds
-#
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-
 module ModBus
   class Slave
     include Errors

data/lib/rmodbus/sp.rb

@@ -1,17 +1,3 @@
-# RModBus - free implementation of ModBus protocol in Ruby.
-#
-# Copyright (C) 2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
-
 begin
   require 'serialport'
 rescue Exception => e

data/lib/rmodbus/tcp.rb

@@ -1,16 +1,3 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-#
-# Copyright (C) 2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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 'socket'
 require 'timeout'
 
@@ -45,4 +32,4 @@ module ModBus
       io
     end
   end
-end
+end

data/lib/rmodbus/tcp_client.rb

@@ -1,16 +1,3 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-#
-# Copyright (C) 2008-2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
 module ModBus
   # TCP client implementation
   # @example

data/lib/rmodbus/tcp_server.rb

@@ -1,17 +1,8 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-#
-# Copyright (C) 2008-2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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 'gserver'
+begin
+  require 'gserver'
+rescue
+  warn "[WARNING] Install `gserver` gem for use TCPServer"
+end
 
 module ModBus
   # TCP server implementation

data/lib/rmodbus/tcp_slave.rb

@@ -1,16 +1,3 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-#
-# Copyright (C) 2011  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
 module ModBus
   # TCP slave implementation
   # @example
@@ -47,7 +34,7 @@ module ModBus
     # overide method for RTU over TCP implamentaion
     # @see Slave#query
     def read_pdu
-      loop do 
+      loop do
         header = @io.read(7)
         if header
           trn = header[0,2].unpack('n')[0]
@@ -55,11 +42,11 @@ module ModBus
           msg = @io.read(len-1)
 
           log "Rx (#{(header + msg).size} bytes): " + logging_bytes(header + msg)
-          
+
           if trn == @transaction
             return msg
           else
-            log "Transaction number mismatch. A packet is ignored."        
+            log "Transaction number mismatch. A packet is ignored."
           end
         end
       end

data/lib/rmodbus/version.rb

@@ -1,17 +1,4 @@
-# RModBus - free implementation of ModBus protocol on Ruby.
-#
-# Copyright (C) 2012-2015  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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# 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.
 module ModBus
   # Package version
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmodbus
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
-- A.Timin, J. Sanders, K. Reynolds
+- A.Timin, J. Sanders, K. Reynolds, F. Luizão
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-12-23 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: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: gserver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 description: 
 email: atimin@gmail.com
 executables: []
@@ -162,9 +162,9 @@ files:
 - spec/spec_helper.rb
 - spec/tcp_client_spec.rb
 - spec/tcp_server_spec.rb
-homepage: http://rmodbus.flipback.net
+homepage: http://www.rubydoc.info/github/rmodbus/rmodbus
 licenses:
-- GPL v2.0
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: