modbus-cli 0.0.5 → 0.0.6

data/lib/modbus-cli/commands_common.rb

@@ -43,6 +43,10 @@ module Modbus
 
         def output_option
         end
+
+        def debug_option
+          option ["-D", "--debug"], :flag, "show debug messages"
+        end
       end
 
 

data/lib/modbus-cli/dump_command.rb

@@ -31,6 +31,8 @@ module Modbus
         o
       end
 
+      debug_option
+
       def execute
         host_ids = files.map {|d| d[:host] }.sort.uniq
         host_ids.each {|host_id| execute_host host_id }
@@ -45,6 +47,7 @@ module Modbus
 
       def execute_slave(host_id, slave_id, client)
         client.with_slave(slave_id) do |slave|
+            slave.debug = true if debug?
             files.select {|d| d[:host] == host_id && d[:slave] == slave_id }.each do |file_data|
             execute_single_file slave, file_data
           end

data/lib/modbus-cli/read_command.rb

@@ -17,6 +17,7 @@ module Modbus
       host_option
       address_parameter
       option ["-o", "--output"], 'FILE', "write results to file FILE"
+      debug_option
       
       parameter 'COUNT', 'number of data to read', :attribute_name => :count do |c|
         result = Integer(c)
@@ -73,6 +74,8 @@ module Modbus
       def execute
         ModBus::TCPClient.connect(host, port) do |cl|
           cl.with_slave(slave) do |sl|
+            sl.debug = true if debug?
+
             if output then
               case addr_type
               when :bit

data/lib/modbus-cli/version.rb

@@ -1,5 +1,5 @@
 module Modbus
   module Cli
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/modbus-cli/write_command.rb

@@ -13,6 +13,7 @@ module Modbus
       host_parameter
       host_option
       address_parameter
+      debug_option
 
       parameter 'VALUES ...', 'values to write, nonzero counts as true for discrete values', :attribute_name => :values do |vv|
         case addr_type
@@ -35,6 +36,8 @@ module Modbus
       def execute
         ModBus::TCPClient.connect(host, port) do |cl|
           cl.with_slave(slave) do |sl|
+            sl.debug = true if debug?
+
             case addr_type
             when :bit
               write_coils sl

data/spec/dump_command_spec.rb

@@ -95,6 +95,18 @@ describe Modbus::Cli::DumpCommand do
     slave.should_receive(:write_holding_registers).with(100, [4, 5, 6])
     cmd.run %w(dump --offset %MW100 dump.yml)
   end
+
+   it 'has a --debug flag' do
+    client = mock 'client'
+    slave = mock 'slave'
+    YAML.should_receive(:load_file).with('dump.yml').and_return(:host => '1.2.3.4', :port => 502, :slave => 5, :offset => 400123, :data => [4, 5, 6])
+    ModBus::TCPClient.should_receive(:connect).with('1.2.3.4', 502).and_yield(client)
+    client.should_receive(:with_slave).with(5).and_yield(slave)
+    slave.should_receive(:write_holding_registers).with(122, [4, 5, 6])
+    slave.should_receive(:debug=).with(true)
+    cmd.run %w(dump --debug dump.yml)
+  end
+
 end
 
 

data/spec/read_command_spec.rb

@@ -155,6 +155,13 @@ describe Modbus::Cli::ReadCommand do
     stdout.should_not match(/./)
   end
 
+  it 'has a --debug flag' do
+    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
+
 
 end
 

data/spec/write_command_spec.rb

@@ -101,6 +101,13 @@ describe Modbus::Cli::WriteCommand do
     cmd.run %w(write --slave 99 X 101 1)
   end
 
+  it 'has a --debug flag' do
+    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
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modbus-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-01-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmodbus
-  requirement: &75774940 !ruby/object:Gem::Requirement
+  requirement: &73951000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *75774940
+  version_requirements: *73951000
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &75774550 !ruby/object:Gem::Requirement
+  requirement: &73950700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *75774550
+  version_requirements: *73950700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75774310 !ruby/object:Gem::Requirement
+  requirement: &73950440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *75774310
+  version_requirements: *73950440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &75774000 !ruby/object:Gem::Requirement
+  requirement: &73950160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *75774000
+  version_requirements: *73950160
 description: Command line interface to communicate over Modbus TCP
 email:
 - tallak@tveide.net
@@ -106,3 +106,4 @@ signing_key:
 specification_version: 3
 summary: Modbus command line
 test_files: []
+has_rdoc: