rmodbus 1.3.3 → 2.1.2

data/lib/rmodbus.rb

@@ -1,24 +1,23 @@
-require 'rmodbus/ext'
-require 'rmodbus/proxy'
-require 'rmodbus/version'
+# frozen_string_literal: true
+
+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'
+  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 :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 :RTUViaTCPServer, "rmodbus/rtu_via_tcp_server"
 end

metadata

@@ -1,115 +1,143 @@
 --- !ruby/object:Gem::Specification
 name: rmodbus
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.1.2
 platform: ruby
 authors:
-- A.Timin, J. Sanders, K. Reynolds, F. Luizão
+- A.Timin, J. Sanders, K. Reynolds, F. Luizão, C. Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: ccutrer-serialport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: gserver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
-  name: serialport
+  name: rubocop-inst
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: gserver
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: digest-crc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: 
-email: atimin@gmail.com
+email: cody@cutrer.us
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -118,15 +146,15 @@ extra_rdoc_files:
 files:
 - NEWS.md
 - README.md
-- Rakefile
 - examples/perfomance_rtu.rb
 - examples/perfomance_rtu_via_tcp.rb
 - examples/perfomance_tcp.rb
-- examples/simple-xpca-gateway.rb
+- examples/simple_xpca_gateway.rb
 - examples/use_rtu_via_tcp_modbus.rb
 - examples/use_tcp_modbus.rb
 - lib/rmodbus.rb
 - lib/rmodbus/client.rb
+- lib/rmodbus/client/slave.rb
 - lib/rmodbus/debug.rb
 - lib/rmodbus/errors.rb
 - lib/rmodbus/ext.rb
@@ -136,36 +164,22 @@ files:
 - lib/rmodbus/rtu_client.rb
 - lib/rmodbus/rtu_server.rb
 - lib/rmodbus/rtu_slave.rb
-- lib/rmodbus/rtu_via_tcp_client.rb
 - lib/rmodbus/rtu_via_tcp_server.rb
-- lib/rmodbus/rtu_via_tcp_slave.rb
 - lib/rmodbus/server.rb
-- lib/rmodbus/slave.rb
+- lib/rmodbus/server/slave.rb
 - lib/rmodbus/sp.rb
 - lib/rmodbus/tcp.rb
 - lib/rmodbus/tcp_client.rb
 - lib/rmodbus/tcp_server.rb
 - lib/rmodbus/tcp_slave.rb
 - lib/rmodbus/version.rb
-- spec/client_spec.rb
-- spec/exception_spec.rb
-- spec/ext_spec.rb
-- spec/logging_spec.rb
-- spec/proxy_spec.rb
-- spec/read_rtu_response_spec.rb
-- spec/response_mismach_spec.rb
-- spec/rtu_client_spec.rb
-- spec/rtu_server_spec.rb
-- spec/rtu_via_tcp_client_spec.rb
-- spec/rtu_via_tcp_server_spec.rb
-- spec/slave_spec.rb
-- spec/spec_helper.rb
-- spec/tcp_client_spec.rb
-- spec/tcp_server_spec.rb
-homepage: http://www.rubydoc.info/github/rmodbus/rmodbus
+homepage: https://github.com/rmodbus/rmodbus
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/rmodbus/rmodbus/blob/main/NEWS.md
+  source_code_uri: https://github.com/rmodbus/rmodbus
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options:
 - "--title"
@@ -179,15 +193,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: RModBus - free implementation of protocol ModBus

data/Rakefile

@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'rake'
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-  begin
-    require 'serialport'
-  rescue LoadError => e
-    spec.pattern.exclude("spec/rtu_client_spec.rb", "spec/rtu_server_spec.rb")
-  end
-end
-
-task :default => :spec
-
-task :pry do
-  sh "bundle exec pry -r ./lib/rmodbus.rb"
-end

data/examples/simple-xpca-gateway.rb

@@ -1,84 +0,0 @@
-=begin
-It's very simple example of implementation XPCA gateway (see http://www.xpca.org)
-for communication with TCP ModBus devices
-It receives  REST requests (e.g http://127.0.0.1:4567/mb/127.0.0.1/8502/1/coils/6/17 )
-and returns data in JSON format addr : data:
-{"coils": {
-  "6":{
-    "value":0,
-    "timestamp":"2011-07-12 18:11:03 +0000",
-    "quality":"good"
-  },
-  "7":{
-    "value":0,
-    "timestamp":"2011-07-12 18:11:03 +0000",
-    "quality":"good"
-    }
-  ...
-}
-
-This code requies gems: rmodbus, sinatra and json
-2011 (c) Aleksey Timin
-=end
-
-require 'rubygems'
-require 'rmodbus'
-require 'sinatra'
-require 'json'
-
-# Launche TCP ModBus server for test
-IP = '127.0.0.1'
-PORT = 8502
-
-@srv = ModBus::TCPServer.new(PORT,1)
-
-@srv.holding_registers = Array.new(100) { |i| i = i + 1  }
-@srv.input_registers = Array.new(100) { |i| i = i + 1  }
-@srv.coils = Array.new(100) { |i| i = 0 }
-@srv.discrete_inputs = Array.new(100) { |i| i = 0  }
-
-@srv.start
-
-
-# Calc a GET request
-# @example
-# http://127.0.0.1:4567/mb/127.0.0.1/8502/1/coils/6/17
-#
-# HTTP route: GET http://localhost/mb/:ip/:port/:slave/:dataplace/:firstaddr/:lastaddr
-#
-# :ip - ip addr of ModBus TCP Server
-# :port - port of ModBUs TCP Server
-# :slave - id of slave device
-# :dataplace - valid values: coils, discrete_inputs, input_registers, holding_registers
-# :firstaddr - first addr of registers(contacts)
-# :lastaddr - last addr of registers(contacts)
-get '/mb/:ip/:port/:slave/:dataplace/:firstaddr/:lastaddr' do
-  resp = {}
-  begin
-    data = []
-    ModBus::TCPClient.new(params[:ip].to_s, params[:port].to_i) do |cl|
-      cl.with_slave(params[:slave].to_i) do |slave|
-        slave.debug = true
-        dataplace = slave.send params[:dataplace]
-        data = dataplace[params[:firstaddr].to_i .. params[:lastaddr].to_i]
-      end
-    end
-
-    resp = { params[:dataplace] => {}}
-    data.each_with_index do |v,i|
-      resp[params[:dataplace]][params[:firstaddr].to_i + i] = {
-        :value => v,
-        :timestamp => Time.now.utc.strftime("%Y-%m-%d %H:%M:%S %z"),
-        :quality => "good"
-      }
-    end
-  rescue Exception => e
-    resp = { :error => {
-      :type => e.class,
-      :message => e.message }
-    }
-  end
-
-  content_type "application/json"
-  resp.to_json
-end

data/lib/rmodbus/rtu_via_tcp_client.rb

@@ -1,26 +0,0 @@
-module ModBus
-  # RTU over TCP client implementation
-  # @example
-  #   RTUViaTCPClient.connect('127.0.0.1', 10002) do |cl|
-  #     cl.with_slave(uid) do |slave|
-  #       slave.holding_registers[0..100]
-  #     end
-  #   end
-  #
-  # @see TCP#open_tcp_connection
-  # @see Client#initialize
-  class RTUViaTCPClient < Client
-		include RTU
-		include TCP
-
-    protected
-		# Open TCP\IP connection
-    def open_connection(ipaddr, port = 10002, opts = {})
-      io = open_tcp_connection(ipaddr, port, opts)
-		end
-
-    def get_slave(uid, io)
-      RTUViaTCPSlave.new(uid, io)
-    end
-	end
-end

data/lib/rmodbus/rtu_via_tcp_slave.rb

@@ -1,29 +0,0 @@
-module ModBus
-  # RTU over TCP slave implementation
-  # @example
-  #   RTUViaTCP.connect('127.0.0.1', 10002) do |cl|
-  #     cl.with_slave(uid) do |slave|
-  #       slave.holding_registers[0..100]
-  #     end
-  #   end
-  #
-  # @see RTUViaTCPClient#open_connection
-  # @see Client#with_slave
-  # @see Slave
-  class RTUViaTCPSlave < Slave
-		include RTU
-
-    private
-    # overide method for RTU implamentaion
-    # @see Slave#query
-    def send_pdu(pdu)
-      send_rtu_pdu(pdu)
-    end
-
-    # overide method for RTU implamentaion
-    # @see Slave#query
-    def read_pdu
-      read_rtu_pdu
-    end
-	end
-end