modbus-cli 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8f4ff66a5456651880910145cd8919117d404c80
+  data.tar.gz: 4d09091363edb51efc393e4ca97eec6953856e4a
+SHA512:
+  metadata.gz: c5511ea5098afc1dd9ab931a11b3164eca5c3baa29a6a6970a5b12236131b71b9b5ccb1f9d312c8f21c3ca070e179786ee27d579fc66ebd828ed989d37f097ac
+  data.tar.gz: d946a25b721a6cf072f4ac9fa83f3d43bd82918ca5cf0bf02ab4c3557cce4c342d73c7112a18d888dbd741382baa6f7e970329206c428c35ea2bd5311f7ad245

data/.travis.yml

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

data/README.markdown

@@ -21,7 +21,7 @@ The pure ruby gem should run on most rubies.
 Quick Start
 -----------
 
-Lets start by reading five words from our device startig from address %MW100. 
+Let's start by reading five words from our device starting from address %MW100. 
 
     $ modbus read 192.168.0.1 %MW100 5
 
@@ -187,7 +187,7 @@ License
 
     (The MIT License)
 
-    Copyright (C) 2011 Tallak Tveide
+    Copyright (C) 2011-2015 Tallak Tveide
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to

data/lib/modbus-cli/dump_command.rb

@@ -7,15 +7,13 @@ module Modbus
       extend CommandsCommon::ClassMethods
       include CommandsCommon
 
-      parameter 'FILES ...', 'restore data in FILES to original devices (created by modbus read command)', :attribute_name => :files do |f|
-        f.map do |filename| 
-          YAML.load_file(filename).dup.tap do |ff|
-            #parameter takes presedence
-            ff[:host] = host || ff[:host]
-            ff[:port] = port || ff[:port]
-            ff[:slave] = slave || ff[:slave]
-            ff[:offset] = offset || ff[:offset]
-          end
+      parameter 'FILES ...', 'restore data in FILES to original devices (created by modbus read command)' do |f|
+        YAML.load_file(f).dup.tap do |ff|
+          #parameter takes presedence
+          ff[:host] = host || ff[:host]
+          ff[:port] = port || ff[:port]
+          ff[:slave] = slave || ff[:slave]
+          ff[:offset] = offset || ff[:offset]
         end
       end
 
@@ -34,12 +32,12 @@ module Modbus
       debug_option
 
       def execute
-        host_ids = files.map {|d| d[:host] }.sort.uniq
+        host_ids = files_list.map {|d| d[:host] }.sort.uniq
         host_ids.each {|host_id| execute_host host_id }
       end
 
       def execute_host(host_id)
-        slave_ids =   files.select {|d| d[:host] == host_id }.map {|d| d[:slave] }.sort.uniq
+        slave_ids =   files_list.select {|d| d[:host] == host_id }.map {|d| d[:slave] }.sort.uniq
         ModBus::TCPClient.connect(host_id, port) do |client|
           slave_ids.each {|slave_id| execute_slave host_id, slave_id, client }
         end
@@ -48,7 +46,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|
+            files_list.select {|d| d[:host] == host_id && d[:slave] == slave_id }.each do |file_data|
             execute_single_file slave, file_data
           end
         end

data/lib/modbus-cli/version.rb

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

data/lib/modbus-cli/write_command.rb

@@ -16,19 +16,19 @@ module Modbus
       debug_option
       timeout_option
 
-      parameter 'VALUES ...', 'values to write, nonzero counts as true for discrete values', :attribute_name => :values do |vv|
+      parameter 'VALUES ...', 'values to write, nonzero counts as true for discrete values' do |v|
         case addr_type
 
         when :bit
-          int_parameter vv, 0, 1
+          int_parameter v, 0, 1
         when :word
-          int_parameter vv, 0, 0xffff
+          int_parameter v, 0, 0xffff
         when :int
-          int_parameter vv, -32768, 32767
+          int_parameter v, -32768, 32767
         when :dword
-          int_parameter vv, 0, 0xffffffff
+          int_parameter v, 0, 0xffffffff
         when :float
-          vv.map {|v| Float(v) }
+          Float(v)
         end
       end
 
@@ -55,11 +55,11 @@ module Modbus
       end
 
       def write_coils(sl)
-        sliced_write_coils sl, addr_offset, values
+        sliced_write_coils sl, addr_offset, values_list
       end
 
       def write_words(sl)
-        sliced_write_registers sl, addr_offset, values.pack('S*').unpack('S*')
+        sliced_write_registers sl, addr_offset, values_list.pack('S*').unpack('S*')
       end
 
       def write_floats(sl)
@@ -72,14 +72,12 @@ module Modbus
 
       def pack_and_write(sl, format)
         # the word ordering is wrong. calling reverse two times effectively swaps every pair
-        sliced_write_registers(sl, addr_offset, values.reverse.pack("#{format}*").unpack('n*').reverse)
+        sliced_write_registers(sl, addr_offset, values_list.reverse.pack("#{format}*").unpack('n*').reverse)
       end
 
       def int_parameter(vv, min, max)
-        vv.map {|v| Integer(v) }.tap do |values|
-          values.each do |v|
-            raise ArgumentError, "Value should be in the range #{min}..#{max}" unless (min..max).member? v
-          end
+        Integer(vv).tap do |v|
+          raise ArgumentError, "Value should be in the range #{min}..#{max}" unless (min..max).member? v
         end
       end
     end

data/modbus-cli.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "rmodbus", '~> 1.1'
-  s.add_runtime_dependency "clamp", '~> 0.3'
-  s.add_development_dependency "rspec", '~> 2.7'
+  s.add_runtime_dependency "rmodbus", '~> 1.2'
+  s.add_runtime_dependency "clamp", '~> 0.6.5'
+  s.add_development_dependency "rspec", '~> 3.2'
   s.add_development_dependency "rake", '~> 0.9'
 end

data/spec/dump_command_spec.rb

@@ -8,20 +8,20 @@ describe Modbus::Cli::DumpCommand do
   end
 
   it 'reads the file and write the contents to the original device' do
-    client = mock 'client'
-    slave = mock 'slave'
+    client = double 'client'
+    slave = double '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])
-    cmd.run %w(dump dump.yml)
+    cmd.run %w(dump dump.yml) 
   end
 
   it 'can read two files from separate hosts' do
-    client1 = mock 'client1'
-    client2 = mock 'client2'
-    slave1 = mock 'slave1'
-    slave2 = mock 'slave2'
+    client1 = double 'client1'
+    client2 = double 'client2'
+    slave1 = double 'slave1'
+    slave2 = double 'slave2'
     yml = {:host => 'X', :slave => 5, :offset => 400010, :data => [99]}
     YAML.should_receive(:load_file).with('a.yml').and_return(yml)
     YAML.should_receive(:load_file).with('b.yml').and_return(yml.dup.tap {|y| y[:host] = 'Y' })
@@ -35,9 +35,9 @@ describe Modbus::Cli::DumpCommand do
   end
 
   it 'can dump two files from separate slaves on same host' do
-    client1 = mock 'client1'
-    slave1 = mock 'slave1'
-    slave2 = mock 'slave2'
+    client1 = double 'client1'
+    slave1 = double 'slave1'
+    slave2 = double 'slave2'
     yml = {:host => 'X', :slave => 5, :offset => 400010, :data => [99]}
     YAML.should_receive(:load_file).with('a.yml').and_return(yml)
     YAML.should_receive(:load_file).with('b.yml').and_return(yml.dup.tap {|y| y[:slave] = 99 })
@@ -50,8 +50,8 @@ describe Modbus::Cli::DumpCommand do
   end
 
   it 'can dump two files from one slave' do
-    client1 = mock 'client1'
-    slave1 = mock 'slave1'
+    client1 = double 'client1'
+    slave1 = double 'slave1'
     yml = {:host => 'X', :slave => 5, :offset => 400010, :data => [99]}
     YAML.should_receive(:load_file).with('a.yml').and_return(yml)
     YAML.should_receive(:load_file).with('b.yml').and_return(yml.dup)
@@ -69,7 +69,7 @@ describe Modbus::Cli::DumpCommand do
   end
 
   it 'accepts the --slave <id> parameter' do
-    client = mock 'client'
+    client = double 'client'
     YAML.should_receive(:load_file).with('dump.yml').and_return(:host => '1.2.3.4', :port => 502, :slave => 5, :offset => 123, :data => [4, 5, 6])
     ModBus::TCPClient.should_receive(:connect).with('1.2.3.4', 502).and_yield(client)
     client.should_receive(:with_slave).with(99)
@@ -77,8 +77,8 @@ describe Modbus::Cli::DumpCommand do
   end
 
   it 'accepts the --offset <n> parameter with modicon addressing' do
-    client = mock 'client'
-    slave = mock 'slave'
+    client = double 'client'
+    slave = double 'slave'
     YAML.should_receive(:load_file).with('dump.yml').and_return(:host => '1.2.3.4', :port => 502, :slave => 5, :offset => 123, :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)
@@ -87,8 +87,8 @@ describe Modbus::Cli::DumpCommand do
   end
 
   it 'accepts the --offset <n> parameter with schneider addressing' do
-    client = mock 'client'
-    slave = mock 'slave'
+    client = double 'client'
+    slave = double 'slave'
     YAML.should_receive(:load_file).with('dump.yml').and_return(:host => '1.2.3.4', :port => 502, :slave => 5, :offset => 123, :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)
@@ -97,8 +97,8 @@ describe Modbus::Cli::DumpCommand do
   end
 
    it 'has a --debug flag' do
-    client = mock 'client'
-    slave = mock 'slave'
+    client = double 'client'
+    slave = double '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)

data/spec/read_command_spec.rb

@@ -130,7 +130,7 @@ describe Modbus::Cli::ReadCommand do
   end
 
   it 'has a --slave parameter' do
-    client = mock 'client'
+    client = double 'client'
     ModBus::TCPClient.should_receive(:connect).with('X', 502).and_yield(client)
     client.should_receive(:with_slave).with(99)
     cmd.run %w(read --slave 99 X 101 1)
@@ -139,9 +139,9 @@ describe Modbus::Cli::ReadCommand do
   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
     slave.should_receive(:read_holding_registers).with(100, 1).and_return([1])
-    file_mock = mock('file')
-    File.should_receive(:open).and_yield(file_mock)
-    file_mock.should_receive(:puts).with({:host => '1.2.3.4', :port => 502, :slave => 1, :offset => '400101', :data => [1]}.to_yaml)
+    file_double = double('file')
+    File.should_receive(:open).and_yield(file_double)
+    file_double.should_receive(:puts).with({:host => '1.2.3.4', :port => 502, :slave => 1, :offset => '400101', :data => [1]}.to_yaml)
     cmd.run %w(read --output filename.yml 1.2.3.4 %MW100 1)
     stdout.should_not match(/./)
   end
@@ -149,9 +149,9 @@ describe Modbus::Cli::ReadCommand do
   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
     slave.should_receive(:read_coils).with(100, 1).and_return([1])
-    file_mock = mock('file')
-    File.should_receive(:open).and_yield(file_mock)
-    file_mock.should_receive(:puts).with({:host => '1.2.3.4', :port => 502, :slave => 1, :offset => '101', :data => [1]}.to_yaml)
+    file_double = double('file')
+    File.should_receive(:open).and_yield(file_double)
+    file_double.should_receive(:puts).with({:host => '1.2.3.4', :port => 502, :slave => 1, :offset => '101', :data => [1]}.to_yaml)
     cmd.run %w(read --output filename.yml 1.2.3.4 %M100 1)
     stdout.should_not match(/./)
   end

data/spec/spec_helper.rb

@@ -3,6 +3,17 @@ require 'clamp'
 require 'stringio'
 require 'modbus-cli'
 
+# keep old fashioned should syntax for now, would be better to convert to new 
+# syntax
+RSpec.configure do |config|
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = [:should, :expect]
+  end
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end
+
 # Borrowed from Clamp tests
 module OutputCapture
 
@@ -30,13 +41,14 @@ module OutputCapture
 end
 
 def stub_tcpip
-  TCPSocket.stub!(:new) # prevent comms with actual PLC or device
+  # prevent any real TCP communications
+  allow(TCPSocket).to receive(:new).and_return("TCPSocket")
 end
 
 
 def standard_connect_helper(address, port)
-  client = mock 'client'
-  slave = mock 'slave'
+  client = double 'client'
+  slave = double 'slave'
   ModBus::TCPClient.should_receive(:connect).with(address, port).and_yield(client)
   client.should_receive(:with_slave).with(1).and_yield(slave)
   return client, slave

data/spec/write_command_spec.rb

@@ -96,7 +96,7 @@ describe Modbus::Cli::WriteCommand do
   end
 
   it 'has a --slave parameter' do
-    client = mock 'client'
+    client = double 'client'
     ModBus::TCPClient.should_receive(:connect).with('X', 502).and_yield(client)
     client.should_receive(:with_slave).with(99)
     cmd.run %w(write --slave 99 X 101 1)

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: modbus-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - Tallak Tveide
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmodbus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   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
@@ -83,8 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.markdown
 - Rakefile
@@ -104,27 +95,25 @@ files:
 - tust.yml
 homepage: http://www.github.com/tallakt/modbus-cli
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: modbus-cli
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Modbus command line
 test_files: []
-has_rdoc: