Skip to content

Commit 0fe462c

Browse files
committed
updating common files
updating files: ["lockdown/serverspec/spec_helper.rb", "default/serverspec/spec_helper.rb"]
1 parent 2e4f659 commit 0fe462c

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

default/serverspec/spec_helper.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@
4141
end
4242

4343
if ENV['ASK_LOGIN_USERNAME']
44-
user = ask("\nEnter login username: ") { |q| q.echo = false }
44+
options[:user] = ask("\nEnter login username: ") { |q| q.echo = false }
4545
else
46-
user = ENV['LOGIN_USERNAME'] || ENV['user'] || Etc.getlogin
46+
options[:user] = ENV['LOGIN_USERNAME'] || ENV['user'] || Etc.getlogin
4747
end
4848

49-
if user.nil?
49+
if options[:user].nil?
5050
puts 'specify login user env LOGIN_USERNAME= or user='
5151
exit 1
5252
end
5353

54-
c.host = ENV['TARGET_HOST']
54+
c.host = ENV['TARGET_HOST']
5555
c.ssh_options = options.merge(Net::SSH::Config.for(c.host))
5656

5757
end

lockdown/serverspec/spec_helper.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@
4141
end
4242

4343
if ENV['ASK_LOGIN_USERNAME']
44-
user = ask("\nEnter login username: ") { |q| q.echo = false }
44+
options[:user] = ask("\nEnter login username: ") { |q| q.echo = false }
4545
else
46-
user = ENV['LOGIN_USERNAME'] || ENV['user'] || Etc.getlogin
46+
options[:user] = ENV['LOGIN_USERNAME'] || ENV['user'] || Etc.getlogin
4747
end
4848

49-
if user.nil?
49+
if options[:user].nil?
5050
puts 'specify login user env LOGIN_USERNAME= or user='
5151
exit 1
5252
end
5353

54-
c.host = ENV['TARGET_HOST']
54+
c.host = ENV['TARGET_HOST']
5555
c.ssh_options = options.merge(Net::SSH::Config.for(c.host))
5656

5757
end

0 commit comments

Comments
 (0)