* lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): IO#tty? of

Windows has been fixed at r29969.

* test/rubygems/test_gem_stream_ui.rb: now can run tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2011-06-07 09:56:30 +00:00
Родитель 04b81ae799
Коммит 733be25907
3 изменённых файлов: 9 добавлений и 18 удалений

Просмотреть файл

@ -1,3 +1,10 @@
Tue Jun 7 18:52:55 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): IO#tty? of
Windows has been fixed at r29969.
* test/rubygems/test_gem_stream_ui.rb: now can run tests.
Tue Jun 7 18:36:41 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* test/rubygems/test_gem.rb (TestGem#{test_self_user_home_userprofile,

Просмотреть файл

@ -142,12 +142,8 @@ class Gem::StreamUI
end
def tty?
if RUBY_PLATFORM =~ /mingw|mswin/
@usetty
else
@usetty && @ins.tty?
end
end
@usetty && @ins.tty?
end
##
# Choose from a list of options. +question+ is a prompt displayed above

Просмотреть файл

@ -41,8 +41,6 @@ class TestGemStreamUI < Gem::TestCase
end
def test_ask
skip 'TTY detection broken on windows' if Gem.win_platform?
timeout(1) do
expected_answer = "Arthur, King of the Britons"
@in.string = "#{expected_answer}\n"
@ -52,8 +50,6 @@ class TestGemStreamUI < Gem::TestCase
end
def test_ask_no_tty
skip 'TTY handling is broken on windows' if Gem.win_platform?
@in.tty = false
timeout(0.1) do
@ -63,8 +59,6 @@ class TestGemStreamUI < Gem::TestCase
end
def test_ask_for_password
skip 'Always uses $stdin on windows' if Gem.win_platform?
timeout(1) do
expected_answer = "Arthur, King of the Britons"
@in.string = "#{expected_answer}\n"
@ -74,8 +68,6 @@ class TestGemStreamUI < Gem::TestCase
end
def test_ask_for_password_no_tty
skip 'TTY handling is broken on windows' if Gem.win_platform?
@in.tty = false
timeout(0.1) do
@ -85,8 +77,6 @@ class TestGemStreamUI < Gem::TestCase
end
def test_ask_yes_no_no_tty_with_default
skip 'TTY handling is broken on windows' if Gem.win_platform?
@in.tty = false
timeout(0.1) do
@ -99,8 +89,6 @@ class TestGemStreamUI < Gem::TestCase
end
def test_ask_yes_no_no_tty_without_default
skip 'TTY handling is broken on windows' if Gem.win_platform?
@in.tty = false
timeout(0.1) do