diff options
author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-19 07:02:32 +0000 |
---|---|---|
committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-19 07:02:32 +0000 |
commit | 69172a0900e61d105b486a35064da329c66b6094 (patch) | |
tree | 8d93cfdd44ba2daed88f76e09c8aca8142744e3c | |
parent | 58f3e5c51bd48a44ac6faab9451edce862fefab3 (diff) | |
download | ruby-69172a0900e61d105b486a35064da329c66b6094.tar.gz |
Expand abbreviated option names.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/net/ftp.rb | 36 | ||||
-rw-r--r-- | test/net/ftp/test_ftp.rb | 8 |
2 files changed, 23 insertions, 21 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 0ecd9a7e4f..4c15e230ef 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -174,20 +174,22 @@ module Net # # The available options are: # - # port:: Port number (default value is 21) - # ssl:: If options[:ssl] is true, then an attempt will be made - # to use SSL (now TLS) to connect to the server. For this to - # work OpenSSL [OSSL] and the Ruby OpenSSL [RSSL] extensions - # need to be installed. If options[:ssl] is a hash, it's - # passed to OpenSSL::SSL::SSLContext#set_params as parameters. + # port:: Port number (default value is 21) + # ssl:: If options[:ssl] is true, then an attempt will be made + # to use SSL (now TLS) to connect to the server. For this + # to work OpenSSL [OSSL] and the Ruby OpenSSL [RSSL] + # extensions need to be installed. If options[:ssl] is a + # hash, it's passed to OpenSSL::SSL::SSLContext#set_params + # as parameters. # private_data_connection:: If true, TLS is used for data connections. # Default: +true+ when options[:ssl] is true. - # user:: Username for login. If options[:user] is the string - # "anonymous" and the options[:password] is +nil+, - # "anonymous@" is used as a password. - # passwd:: Password for login. - # acct:: Account information for ACCT. - # passive:: When +true+, the connection is in passive mode. Default: +true+. + # username:: Username for login. If options[:user] is the string + # "anonymous" and the options[:password] is +nil+, + # "anonymous@" is used as a password. + # password:: Password for login. + # account:: Account information for ACCT. + # passive:: When +true+, the connection is in passive mode. Default: + # +true+. # debug_mode:: When +true+, all traffic to and from the server is # written to +$stdout+. Default: +false+. # @@ -198,9 +200,9 @@ module Net rescue NoMethodError # for backward compatibility options = {} - options[:user] = user_or_options - options[:passwd] = passwd - options[:acct] = acct + options[:username] = user_or_options + options[:password] = passwd + options[:account] = acct end @host = nil if options[:ssl] @@ -250,8 +252,8 @@ module Net # the number of arguments passed to connect.... connect(host) end - if options[:user] - login(options[:user], options[:passwd], options[:acct]) + if options[:username] + login(options[:username], options[:password], options[:account]) end end end diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb index f514efb182..6acaf87216 100644 --- a/test/net/ftp/test_ftp.rb +++ b/test/net/ftp/test_ftp.rb @@ -239,9 +239,9 @@ class FTPTest < Test::Unit::TestCase begin ftp = Net::FTP.new(SERVER_ADDR, port: server.port, - user: "foo", - passwd: "bar", - acct: "baz") + username: "foo", + password: "bar", + account: "baz") assert_equal("USER foo\r\n", commands.shift) assert_equal("PASS bar\r\n", commands.shift) assert_equal("ACCT baz\r\n", commands.shift) @@ -267,7 +267,7 @@ class FTPTest < Test::Unit::TestCase sock.print("200 Switching to Binary mode.\r\n") } begin - Net::FTP.open(SERVER_ADDR, port: server.port, user: "anonymous") do + Net::FTP.open(SERVER_ADDR, port: server.port, username: "anonymous") do end assert_equal("USER anonymous\r\n", commands.shift) assert_equal("PASS anonymous@\r\n", commands.shift) |