modbus-cli 0.0.15 → 0.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/modbus-cli/read_command.rb +6 -4
  3. data/lib/modbus-cli/version.rb +1 -1
  4. data/lib/modbus-cli.rb +0 -1
  5. data/modbus-cli.gemspec +5 -5
  6. data/spec/write_command_spec.rb +1 -1
  7. metadata +15 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b7cc8d3a460a2a3f9598b6cab601b69e1541aca060e06b530588db86b1680682
4
- data.tar.gz: 3c6f3332b694b6832f02063b0c42652f2d0402da78fe40a6268426033a355208
3
+ metadata.gz: 6998ce584b18610adff778b6bff353ebebe5f0f9c546ce6b3983b4f48022d051
4
+ data.tar.gz: c659a6ec810b73061e670d825fa4c995ecae345fb0140aa4670e47fda4107c2f
5
5
  SHA512:
6
- metadata.gz: 40b414e97d709f231e1772d45136237ac37db742188cf190590a056168c7af421fe890691a45f7684afd23a6e5ae2e9a56f7b3eb5f060062ac8228915f11b804
7
- data.tar.gz: e7d765873fe608ad3e0bcacc797cf3109c9b89157af435d2294ef17eb5e0e8f2084e182bbb1c3a09ce731ab4fb85ab1368fba4296e47663f3b496d0d3bf05a87
6
+ metadata.gz: 5eb7df635473b19964de3767b0991782eb4debfd7d057af013e134156c1dd2370be6c582e94df62f8cb6c906c86eb77585e44a28ed66bce01e3e6b61c7e96ef7
7
+ data.tar.gz: 67c7ae2a8c915a6f577557a4694ca16339b09b5384ffa362ab816416986f274614be650b4b6f0e887d5132184dca617587fcf0ebfaaba5531c68afd08569b121
data/lib/modbus-cli/read_command.rb CHANGED
@@ -74,13 +74,15 @@ module Modbus
74
74
  end
75
75
 
76
76
  def execute
77
- connect_args =
77
+ connect_lambda =
78
78
  if connect_timeout
79
- [host, port, {connect_timeout: connect_timeout}]
79
+ Proc.new { |&block| ModBus::TCPClient.connect(host, port, connect_timeout: connect_timeout, &block) }
80
80
  else
81
- [host, port]
81
+ Proc.new { |&block| ModBus::TCPClient.connect(host, port, &block) }
82
82
  end
83
- ModBus::TCPClient.connect(*connect_args) do |cl|
83
+
84
+
85
+ connect_lambda.call do |cl|
84
86
  cl.with_slave(slave) do |sl|
85
87
  sl.debug = true if debug?
86
88
  sl.read_retry_timeout = timeout if timeout
data/lib/modbus-cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Modbus
2
2
  module Cli
3
- VERSION = "0.0.15"
3
+ VERSION = "0.0.16"
4
4
  end
5
5
  end
data/lib/modbus-cli.rb CHANGED
@@ -8,7 +8,6 @@ require 'rmodbus/debug'
8
8
  require 'rmodbus/options'
9
9
  require 'rmodbus/rtu'
10
10
  require 'rmodbus/tcp'
11
- require 'rmodbus/slave'
12
11
  require 'rmodbus/client'
13
12
  require 'rmodbus/server'
14
13
  require 'rmodbus/tcp_slave'
data/modbus-cli.gemspec CHANGED
@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
21
21
 
22
22
  # specify any dependencies here; for example:
23
23
  # s.add_development_dependency "rspec"
24
- s.add_runtime_dependency "rmodbus", '~> 1.3'
25
- s.add_runtime_dependency "clamp", '~> 1.1'
24
+ s.add_runtime_dependency "rmodbus", '~> 2.1'
25
+ s.add_runtime_dependency "clamp", '~> 1.3'
26
26
  s.add_runtime_dependency "gserver", '~> 0.0'
27
- s.add_development_dependency "rspec", '~> 3.5'
28
- s.add_development_dependency "rake", '~> 12.0'
29
- s.add_development_dependency "bundler", '~> 1.16'
27
+ s.add_development_dependency "rspec", '~> 3.13'
28
+ s.add_development_dependency "rake", '~> 13.2'
29
+ s.add_development_dependency "bundler", '~> 2.6'
30
30
  end
data/spec/write_command_spec.rb CHANGED
@@ -117,7 +117,7 @@ describe Modbus::Cli::WriteCommand do
117
117
  end
118
118
 
119
119
  it 'has a --connect-timeout flag' do
120
- ModBus::TCPClient.should_receive(:connect).with('X', 502, connect_timeout: 99)
120
+ ModBus::TCPClient.should_receive(:connect).with('X', 502, {connect_timeout: 99})
121
121
  cmd.run %w(write --connect-timeout 99 X %MW100 10)
122
122
  end
123
123
  end
metadata CHANGED
@@ -1,11 +1,11 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: modbus-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.15
4
+ version: 0.0.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tallak Tveide
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
  date: 2025-04-20 00:00:00.000000000 Z
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.3'
19
+ version: '2.1'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.3'
26
+ version: '2.1'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: clamp
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '1.1'
33
+ version: '1.3'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '1.1'
40
+ version: '1.3'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: gserver
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,42 @@ dependencies:
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '3.5'
61
+ version: '3.13'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '3.5'
68
+ version: '3.13'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '12.0'
75
+ version: '13.2'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '12.0'
82
+ version: '13.2'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bundler
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '1.16'
89
+ version: '2.6'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '1.16'
96
+ version: '2.6'
97
97
  description: Command line interface to communicate over Modbus TCP
98
98
  email:
99
99
  - tallak@tveide.net
@@ -124,7 +124,7 @@ homepage: http://www.github.com/tallakt/modbus-cli
124
124
  licenses:
125
125
  - MIT
126
126
  metadata: {}
127
- post_install_message:
127
+ post_install_message:
128
128
  rdoc_options: []
129
129
  require_paths:
130
130
  - lib
@@ -139,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
139
139
  - !ruby/object:Gem::Version
140
140
  version: '0'
141
141
  requirements: []
142
- rubygems_version: 3.0.3.1
143
- signing_key:
142
+ rubygems_version: 3.4.10
143
+ signing_key:
144
144
  specification_version: 4
145
145
  summary: Modbus command line
146
146
  test_files: