modbus-cli 0.0.8 → 0.0.9

data/lib/modbus-cli/commands_common.rb

@@ -47,6 +47,12 @@ module Modbus
         def debug_option
           option ["-D", "--debug"], :flag, "show debug messages"
         end
+
+        def timeout_option
+          option ["-T", "--timeout"], 'TIMEOUT', "Specify the timeout in seconds when talking to the slave" do |t|
+            Integer(t)
+          end
+        end
       end
 
 

data/lib/modbus-cli/read_command.rb

@@ -18,6 +18,7 @@ module Modbus
       address_parameter
       option ["-o", "--output"], 'FILE', "write results to file FILE"
       debug_option
+      timeout_option
       
       parameter 'COUNT', 'number of data to read', :attribute_name => :count do |c|
         result = Integer(c)
@@ -75,6 +76,7 @@ module Modbus
         ModBus::TCPClient.connect(host, port) do |cl|
           cl.with_slave(slave) do |sl|
             sl.debug = true if debug?
+            sl.read_retry_timeout = timeout if timeout
 
             if output then
               case addr_type

data/lib/modbus-cli/version.rb

@@ -1,5 +1,5 @@
 module Modbus
   module Cli
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/modbus-cli/write_command.rb

@@ -14,6 +14,7 @@ module Modbus
       host_option
       address_parameter
       debug_option
+      timeout_option
 
       parameter 'VALUES ...', 'values to write, nonzero counts as true for discrete values', :attribute_name => :values do |vv|
         case addr_type
@@ -37,6 +38,7 @@ module Modbus
         ModBus::TCPClient.connect(host, port) do |cl|
           cl.with_slave(slave) do |sl|
             sl.debug = true if debug?
+            sl.read_retry_timeout = timeout if timeout
 
             case addr_type
             when :bit

data/spec/read_command_spec.rb

@@ -163,6 +163,13 @@ describe Modbus::Cli::ReadCommand do
     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
+    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
+
 
 end
 

data/spec/write_command_spec.rb

@@ -53,8 +53,9 @@ describe Modbus::Cli::WriteCommand do
 
   it 'should split large writes in chunks for coils' do
     client, slave = standard_connect_helper 'HOST', 502
-    slave.should_receive(:write_multiple_coils).with(100, [0, 1] * 984)
-    slave.should_receive(:write_multiple_coils).with(2068, [0, 1] * 16)
+    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)
     cmd.run %w(write HOST %M100) + [0, 1] * 1000
   end
 
@@ -108,6 +109,13 @@ describe Modbus::Cli::WriteCommand do
     cmd.run %w(write --debug HOST 101 1)
   end
 
+  it 'has a --timeout flag' do
+    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
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modbus-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmodbus
-  requirement: &269490210 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *269490210
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &269489830 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *269489830
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &269489270 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *269489270
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &269488600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *269488600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Command line interface to communicate over Modbus TCP
 email:
 - tallak@tveide.net
@@ -102,13 +122,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: modbus-cli
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Modbus command line
-test_files:
-- spec/dump_command_spec.rb
-- spec/modbus_cli_spec.rb
-- spec/read_command_spec.rb
-- spec/spec_helper.rb
-- spec/write_command_spec.rb
+test_files: []
+has_rdoc: