modbus-cli 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd1223c99568138597a15d1bc5ba2761ea8d61ae
-  data.tar.gz: 888fdc04b385310d4dd0bfc112cee60987e43cb3
+  metadata.gz: 619dfae9c197b362c05c0b2e09f098505d0ddc3a
+  data.tar.gz: e6680b55e2b2acbddf157c6b7d10c3908f48b638
 SHA512:
-  metadata.gz: 95b09c57efbbc5928797986aacf72785a8857a4013783db54ad365eeb652f6ff61448871ac05d710028eb9935494a1e944e934be74cd1e0f84b5b4a8b5aac039
-  data.tar.gz: 6788dace2ba90faf4f7a673a32dbd8abefd376c444ed09ef4f5a8bcedf91ba23f7f09eb94d69441f618108192620a02e758d23c5e1b9da6b2b7750515b1e4122
+  metadata.gz: 2079acde76a8b597ec68c24bed2734069d51d255ad7832ff68d51f07433de1fdc54c7fe864a051fc5eff6bf32d68f0bda0f9e93198fa2b76cd787b1368b3b591
+  data.tar.gz: '0198d380c09a329db158cdd5607101a7b69db672bfbbd5d5fe64b3510c27eeca1ee9e588cba5d6b3b6ca3b456326dc40b18dbc874ca8d05b053873a325d6b273'

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
+  - 2.5.1
   - 2.1.0
-  - 1.8.7
   - 1.9.3
   - jruby

data/lib/modbus-cli/commands_common.rb

@@ -53,6 +53,12 @@ module Modbus
             Integer(t)
           end
         end
+
+        def connect_timeout_option
+          option ["-C", "--connect-timeout"], 'TIMEOUT', "Specify the timeout in seconds when connecting to TCP socket" do |t|
+            Integer(t)
+          end
+        end
       end
 
 

data/lib/modbus-cli/read_command.rb

@@ -19,6 +19,7 @@ module Modbus
       option ["-o", "--output"], 'FILE', "write results to file FILE"
       debug_option
       timeout_option
+      connect_timeout_option
       
       parameter 'COUNT', 'number of data to read', :attribute_name => :count do |c|
         result = Integer(c)
@@ -73,7 +74,13 @@ module Modbus
       end
 
       def execute
-        ModBus::TCPClient.connect(host, port) do |cl|
+        connect_args =
+          if connect_timeout
+            [host, port, {connect_timeout: connect_timeout}]
+          else
+            [host, port]
+          end
+        ModBus::TCPClient.connect(*connect_args) do |cl|
           cl.with_slave(slave) do |sl|
             sl.debug = true if debug?
             sl.read_retry_timeout = timeout if timeout

data/lib/modbus-cli/version.rb

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

data/lib/modbus-cli/write_command.rb

@@ -15,6 +15,7 @@ module Modbus
       address_parameter
       debug_option
       timeout_option
+      connect_timeout_option
 
       parameter 'VALUES ...', 'values to write, nonzero counts as true for discrete values' do |v|
         case addr_type
@@ -35,7 +36,13 @@ module Modbus
 
 
       def execute
-        ModBus::TCPClient.connect(host, port) do |cl|
+        connect_args =
+          if connect_timeout
+            [host, port, {connect_timeout: connect_timeout}]
+          else
+            [host, port]
+          end
+        ModBus::TCPClient.connect(*connect_args) do |cl|
           cl.with_slave(slave) do |sl|
             sl.debug = true if debug?
             sl.read_retry_timeout = timeout if timeout

data/modbus-cli.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   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.14'
+  s.add_development_dependency "bundler", '~> 1.16'
 end

data/spec/dump_command_spec.rb

@@ -106,11 +106,4 @@ describe Modbus::Cli::DumpCommand do
     slave.should_receive(:debug=).with(true)
     cmd.run %w(dump --debug dump.yml)
   end
-
 end
-
-
-
-
-
-

data/spec/read_command_spec.rb

@@ -4,49 +4,49 @@ require 'yaml'
 
 
 describe Modbus::Cli::ReadCommand do
-	include OutputCapture
+  include OutputCapture
 
   before(:each) do
     stub_tcpip
   end
 
   it 'can read holding registers' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 10).and_return((0..9).to_a)
     cmd.run %w(read 1.2.3.4 %MW100 10)
     stdout.should match(/^\s*%MW105\s*5$/)
   end
 
   it 'can read input registers' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_input_registers).with(100, 10).and_return((0..9).to_a)
     cmd.run %w(read 1.2.3.4 300101 10)
     stdout.should match(/^\s*300106\s*5$/)
   end
 
   it 'can read floating point numbers' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 4).and_return([52429, 17095, 52429, 17095])
     cmd.run %w(read 1.2.3.4 %MF100 2)
     stdout.should match(/^\s*%MF102\s*99[.]9(00[0-9]*)?$/)
   end
 
   it 'should display numbers with good precision' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).and_return([1049, 16286])
     cmd.run %w(read 1.2.3.4 %MF100 1)
     stdout.should match(/^\s*%MF100\s*1[.]2345\d*$/)
   end
 
   it 'can read double word numbers' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 4).and_return([16959, 15, 16959, 15])
     cmd.run %w(read 1.2.3.4 %MD100 2)
     stdout.should match(/^\s*%MD102\s*999999$/)
   end
 
   it 'can read coils' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_coils).with(100, 10).and_return([1, 0] * 5)
     cmd.run %w(read 1.2.3.4 %M100 10)
     stdout.should match(/^\s*%M105\s*0$/)
@@ -66,14 +66,14 @@ describe Modbus::Cli::ReadCommand do
   end
 
   it 'should split large reads into smaller chunks for words' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 125).and_return([1, 0] * 1000)
     slave.should_receive(:read_holding_registers).with(225, 25).and_return([1, 0] * 1000)
     cmd.run %w(read 1.2.3.4 %MW100 150)
   end
 
   it 'should split large reads into smaller chunks for coils' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_coils).with(100, 1000).and_return([1, 0] * 500)
     slave.should_receive(:read_coils).with(1100, 1000).and_return([1, 0] * 500)
     slave.should_receive(:read_coils).with(2100, 1000).and_return([1, 0] * 500)
@@ -81,39 +81,39 @@ describe Modbus::Cli::ReadCommand do
   end
 
   it 'can read registers as ints' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 1).and_return([0xffff])
     cmd.run %w(read --int 1.2.3.4 %MW100 1)
     stdout.should match(/^\s*%MW100\s*-1$/)
   end
 
   it 'can read registers as floats' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 2).and_return([0,0])
     cmd.run %w(read --float 1.2.3.4 %MW100 1)
   end
 
   it 'can read registers as dwords' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 2).and_return([0,0])
     cmd.run %w(read --dword 1.2.3.4 %MW100 1)
   end
 
   it 'can read registers as words' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 1).and_return([0])
     cmd.run %w(read --word 1.2.3.4 %MD100 1)
   end
 
   it 'accepts Modicon addresses for coils' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_coils).with(100, 10).and_return([1, 0] * 5)
     cmd.run %w(read 1.2.3.4 101 10)
     stdout.should match(/^\s*106\s*0$/)
   end
 
   it 'accepts Modicon addresses for registers' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 10).and_return((0..9).to_a)
     cmd.run %w(read 1.2.3.4 400101 10)
     stdout.should match(/^\s*400106\s*5$/)
@@ -121,14 +121,14 @@ describe Modbus::Cli::ReadCommand do
 
 
   it 'should accept the --modicon option to force modicon output' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 10).and_return((0..9).to_a)
     cmd.run %w(read --modicon 1.2.3.4 %MW100 10)
     stdout.should match(/^\s*400106\s*5$/)
   end
 
   it 'should accept the --schneider option to force schneider output' do 
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 10).and_return((0..9).to_a)
     cmd.run %w(read --schneider 1.2.3.4 400101 10)
     stdout.should match(/^\s*%MW105\s*5$/)
@@ -142,7 +142,7 @@ describe Modbus::Cli::ReadCommand do
   end
 
   it 'can write the output from reading registers to a yaml file using the -o <filename> parameter' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 1).and_return([1])
     file_double = double('file')
     File.should_receive(:open).and_yield(file_double)
@@ -152,7 +152,7 @@ describe Modbus::Cli::ReadCommand do
   end
 
   it 'can write the output from reading coils to a yaml file using the -o <filename> parameter' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_coils).with(100, 1).and_return([1])
     file_double = double('file')
     File.should_receive(:open).and_yield(file_double)
@@ -162,23 +162,22 @@ describe Modbus::Cli::ReadCommand do
   end
 
   it 'has a --debug flag' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_holding_registers).with(100, 10).and_return((0..9).to_a)
     slave.should_receive(:debug=).with(true)
     cmd.run %w(read --debug 1.2.3.4 %MW100 10)
   end
 
   it 'has a --timeout flag' do
-    client, slave = standard_connect_helper '1.2.3.4', 502
+    _client, slave = standard_connect_helper '1.2.3.4', 502
     slave.should_receive(:read_retry_timeout=).with(99)
     slave.should_receive(:read_holding_registers).with(100, 10).and_return((0..9).to_a)
     cmd.run %w(read --timeout 99 1.2.3.4 %MW100 10)
   end
 
-
+  it 'has a --connect-timeout flag' do
+    ModBus::TCPClient.should_receive(:connect).with('X', 502, connect_timeout: 99)
+    cmd.run %w(read --connect-timeout 99 X %MW100 10)
+  end
 end
 
-
-
-
-

data/spec/write_command_spec.rb

@@ -10,26 +10,26 @@ describe Modbus::Cli::WriteCommand do
   end
 
   it 'can write to registers' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_holding_registers).with(100, [1, 2, 3, 4])
     cmd.run %w(write HOST %MW100 1 2 3 4)
   end
 
 
   it 'can write floating point numbers' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_holding_registers).with(100, [52429, 17095, 52429, 17095])
     cmd.run %w(write HOST %MF100 99.9 99.9)
   end
 
   it 'can write double word numbers' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_holding_registers).with(100, [16959, 15, 16959, 15])
     cmd.run %w(write HOST %MD100 999999 999999)
   end
 
   it 'can write to coils' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_multiple_coils).with(100, [1, 0, 1, 0, 1, 0, 0, 1, 1])
     cmd.run %w(write HOST %M100 1 0 1 0 1 0 0 1 1)
   end
@@ -45,14 +45,14 @@ describe Modbus::Cli::WriteCommand do
 
 
   it 'should split large writes in chunks for words' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_holding_registers).with(100, (1..123).to_a)
     slave.should_receive(:write_holding_registers).with(223, (124..150).to_a)
     cmd.run %w(write HOST %MW100) + (1..150).to_a
   end
 
   it 'should split large writes in chunks for coils' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_multiple_coils).with(100, [0, 1] * 400)
     slave.should_receive(:write_multiple_coils).with(900, [0, 1] * 400)
     slave.should_receive(:write_multiple_coils).with(1700, [0, 1] * 200)
@@ -60,37 +60,37 @@ describe Modbus::Cli::WriteCommand do
   end
 
   it 'can write to registers as ints' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_holding_registers).with(100, [0xffff])
     cmd.run %w(write --int HOST %MW100 -1)
   end
 
   it 'can write to registers as floats' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_holding_registers).with(100, [52429, 17095])
     cmd.run %w(write --float HOST %MW100 99.9)
   end
 
   it 'can write to registers as double words' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_holding_registers).with(100, [16959, 15])
     cmd.run %w(write --dword HOST %MW100 999999)
   end
 
   it 'can write to registers as words' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_holding_registers).with(100, [99])
     cmd.run %w(write --word HOST %MF100 99)
   end
 
   it 'can write to registers using Modicon addressing' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_holding_registers).with(100, [1, 2, 3, 4])
     cmd.run %w(write HOST 400101 1 2 3 4)
   end
 
   it 'can write to coils using Modicon addressing' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:write_multiple_coils).with(100, [1, 0, 1, 0, 1, 0, 0, 1, 1])
     cmd.run %w(write HOST 101 1 0 1 0 1 0 0 1 1)
   end
@@ -103,19 +103,23 @@ describe Modbus::Cli::WriteCommand do
   end
 
   it 'has a --debug flag' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:debug=).with(true)
     slave.should_receive(:write_multiple_coils)
     cmd.run %w(write --debug HOST 101 1)
   end
 
   it 'has a --timeout flag' do
-    client, slave = standard_connect_helper 'HOST', 502
+    _client, slave = standard_connect_helper 'HOST', 502
     slave.should_receive(:read_retry_timeout=).with(99)
     slave.should_receive(:write_multiple_coils)
     cmd.run %w(write --timeout 99 HOST 101 1)
   end
 
+  it 'has a --connect-timeout flag' do
+    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.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Tallak Tveide
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmodbus
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.16'
 description: Command line interface to communicate over Modbus TCP
 email:
 - tallak@tveide.net
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: modbus-cli
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Modbus command line