modbus-cli 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 619dfae9c197b362c05c0b2e09f098505d0ddc3a
-  data.tar.gz: e6680b55e2b2acbddf157c6b7d10c3908f48b638
+SHA256:
+  metadata.gz: 6998ce584b18610adff778b6bff353ebebe5f0f9c546ce6b3983b4f48022d051
+  data.tar.gz: c659a6ec810b73061e670d825fa4c995ecae345fb0140aa4670e47fda4107c2f
 SHA512:
-  metadata.gz: 2079acde76a8b597ec68c24bed2734069d51d255ad7832ff68d51f07433de1fdc54c7fe864a051fc5eff6bf32d68f0bda0f9e93198fa2b76cd787b1368b3b591
-  data.tar.gz: '0198d380c09a329db158cdd5607101a7b69db672bfbbd5d5fe64b3510c27eeca1ee9e588cba5d6b3b6ca3b456326dc40b18dbc874ca8d05b053873a325d6b273'
+  metadata.gz: 5eb7df635473b19964de3767b0991782eb4debfd7d057af013e134156c1dd2370be6c582e94df62f8cb6c906c86eb77585e44a28ed66bce01e3e6b61c7e96ef7
+  data.tar.gz: 67c7ae2a8c915a6f577557a4694ca16339b09b5384ffa362ab816416986f274614be650b4b6f0e887d5132184dca617587fcf0ebfaaba5531c68afd08569b121

data/lib/modbus-cli/read_command.rb

@@ -74,13 +74,15 @@ module Modbus
       end
 
       def execute
-        connect_args =
+        connect_lambda =
           if connect_timeout
-            [host, port, {connect_timeout: connect_timeout}]
+            Proc.new { |&block| ModBus::TCPClient.connect(host, port, connect_timeout: connect_timeout, &block) }
           else
-            [host, port]
+            Proc.new { |&block| ModBus::TCPClient.connect(host, port, &block) }
           end
-        ModBus::TCPClient.connect(*connect_args) do |cl|
+
+
+        connect_lambda.call do |cl|
           cl.with_slave(slave) do |sl|
             sl.debug = true if debug?
             sl.read_retry_timeout = timeout if timeout
@@ -168,7 +170,7 @@ module Modbus
           case addr_type
           when :bit
             (addr + 1).to_s
-          when :word, :int
+          when :word, :int, :dword, :float
             case addr_area
             when :input_registers
               (addr + 300001).to_s

data/lib/modbus-cli/version.rb

@@ -1,5 +1,5 @@
 module Modbus
   module Cli
-    VERSION = "0.0.14"
+    VERSION = "0.0.16"
   end
 end

data/lib/modbus-cli.rb

@@ -8,7 +8,6 @@ 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'

data/modbus-cli.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://www.github.com/tallakt/modbus-cli"
   s.summary     = %q{Modbus command line}
   s.description = %q{Command line interface to communicate over Modbus TCP}
+  s.license     = "MIT"
 
   s.rubyforge_project = "modbus-cli"
 
@@ -20,10 +21,10 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "rmodbus", '~> 1.3'
-  s.add_runtime_dependency "clamp", '~> 1.1'
+  s.add_runtime_dependency "rmodbus", '~> 2.1'
+  s.add_runtime_dependency "clamp", '~> 1.3'
   s.add_runtime_dependency "gserver", '~> 0.0'
-  s.add_development_dependency "rspec", '~> 3.5'
-  s.add_development_dependency "rake", '~> 12.0'
-  s.add_development_dependency "bundler", '~> 1.16'
+  s.add_development_dependency "rspec", '~> 3.13'
+  s.add_development_dependency "rake", '~> 13.2'
+  s.add_development_dependency "bundler", '~> 2.6'
 end

data/spec/write_command_spec.rb

@@ -117,7 +117,7 @@ describe Modbus::Cli::WriteCommand do
   end
 
   it 'has a --connect-timeout flag' do
-    ModBus::TCPClient.should_receive(:connect).with('X', 502, connect_timeout: 99)
+    ModBus::TCPClient.should_receive(:connect).with('X', 502, {connect_timeout: 99})
     cmd.run %w(write --connect-timeout 99 X %MW100 10)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modbus-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - Tallak Tveide
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2025-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmodbus
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: gserver
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.6'
 description: Command line interface to communicate over Modbus TCP
 email:
 - tallak@tveide.net
@@ -121,9 +121,10 @@ files:
 - spec/spec_helper.rb
 - spec/write_command_spec.rb
 homepage: http://www.github.com/tallakt/modbus-cli
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: modbus-cli
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Modbus command line
 test_files: