summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklós Fazekas <mfazekas@szemafor.com>2016-03-27 10:37:33 +0200
committerMiklós Fazekas <mfazekas@szemafor.com>2016-03-27 10:37:33 +0200
commit66ab0bbc30c784734cfbbad737e68fc675728777 (patch)
tree67a3d756d170729ea9c14d9b403e3377dd052097
parent58851c5c2673ce0ba9a29f89196a31d7ac09c061 (diff)
parent429529bda8db013808f4277e74d78f0d46291453 (diff)
downloadnet-ssh-multi-66ab0bbc30c784734cfbbad737e68fc675728777.tar.gz
Merge pull request #18 from eugeneius/fix_warnings
Fix warnings
-rw-r--r--lib/net/ssh/multi/pending_connection.rb2
-rw-r--r--lib/net/ssh/multi/server.rb1
-rw-r--r--lib/net/ssh/multi/session_actions.rb4
-rw-r--r--test/channel_test.rb2
-rw-r--r--test/session_actions_test.rb2
5 files changed, 6 insertions, 5 deletions
diff --git a/lib/net/ssh/multi/pending_connection.rb b/lib/net/ssh/multi/pending_connection.rb
index 268ae3c..5faaf70 100644
--- a/lib/net/ssh/multi/pending_connection.rb
+++ b/lib/net/ssh/multi/pending_connection.rb
@@ -43,7 +43,7 @@ module Net; module SSH; module Multi
def replay_on(session)
forward = session.forward
- @recordings.each {|args| forward.send *args}
+ @recordings.each { |args| forward.send(*args) }
end
end
diff --git a/lib/net/ssh/multi/server.rb b/lib/net/ssh/multi/server.rb
index 58083e3..0094982 100644
--- a/lib/net/ssh/multi/server.rb
+++ b/lib/net/ssh/multi/server.rb
@@ -56,6 +56,7 @@ module Net; module SSH; module Multi
@gateway = @options.delete(:via)
@failed = false
+ @session = @ready_session = nil
end
# Returns the value of the server property with the given +key+. Server
diff --git a/lib/net/ssh/multi/session_actions.rb b/lib/net/ssh/multi/session_actions.rb
index 2d87392..c6b1355 100644
--- a/lib/net/ssh/multi/session_actions.rb
+++ b/lib/net/ssh/multi/session_actions.rb
@@ -118,8 +118,8 @@ module Net; module SSH; module Multi
# end
def exec(command, &block)
open_channel do |channel|
- channel.exec(command) do |ch, success|
- raise "could not execute command: #{command.inspect} (#{ch[:host]})" unless success
+ channel.exec(command) do |c, success|
+ raise "could not execute command: #{command.inspect} (#{c[:host]})" unless success
channel.on_data do |ch, data|
if block
diff --git a/test/channel_test.rb b/test/channel_test.rb
index 2c08573..475c59b 100644
--- a/test/channel_test.rb
+++ b/test/channel_test.rb
@@ -3,7 +3,7 @@ require 'net/ssh/multi/channel'
class ChannelTest < Minitest::Test
def test_each_should_iterate_over_each_component_channel
- channels = [c1 = mock('channel'), c2 = mock('channel'), c3 = mock('channel')]
+ channels = [mock('channel'), mock('channel'), mock('channel')]
channel = Net::SSH::Multi::Channel.new(mock('session'), channels)
result = []
channel.each { |c| result << c }
diff --git a/test/session_actions_test.rb b/test/session_actions_test.rb
index e6de5b1..c9e29d6 100644
--- a/test/session_actions_test.rb
+++ b/test/session_actions_test.rb
@@ -94,7 +94,7 @@ class SessionActionsTest < Minitest::Test
c.expects(:on_extended_data).yields(c, 1, "stderr")
c.expects(:on_request)
results = {}
- @session.exec("something") do |c, stream, data|
+ @session.exec("something") do |_, stream, data|
results[stream] = data
end
assert_equal({:stdout => "stdout", :stderr => "stderr"}, results)