Changeset 280640 in webkit

Timestamp:

Aug 4, 2021, 10:58:51 AM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkitcorepy] Add shared terminal input code
​https://bugs.webkit.org/show_bug.cgi?id=226024
<rdar://problem/78261645>

Reviewed by Dewei Zhu.

• Scripts/libraries/webkitcorepy/setup.py: Bump version.
• Scripts/libraries/webkitcorepy/webkitcorepy/init.py: Export Terminal object, bump version.
• Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py:

(credentials): Use Terminal.input.

• Scripts/libraries/webkitcorepy/webkitcorepy/mocks/init.py:
• Scripts/libraries/webkitcorepy/webkitcorepy/mocks/terminal.py: Added.

(Terminal):
(Terminal.input): Mocking input and raw_input requires so specialized knowledge,
so we should generalize it.

• Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py: Added.

(Terminal):
(Terminal.input): Python 2/3 compatible input function.
(Terminal.choose): Generic multiple-choice input prompt.

• Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py: Added.

(TerminalTests):
(TerminalTests.test_choose_basic):
(TerminalTests.test_choose_strict):
(TerminalTests.test_choose_default):
(TerminalTests.test_choose_triple):
(TerminalTests.test_choose_number):

• Scripts/webkitpy/common/system/user.py:

(User.prompt): Use Terminal.input.
(User.prompt_with_multiple_lists): Ditto.
(User.prompt_with_list): Ditto.
(User.confirm): Ditto.

• Scripts/webkitpy/common/system/user_mock.py:

(MockUser.prompt): Use Terminal.input.
(MockUser.prompt_with_list): Ditto.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitcorepy/setup.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py (modified) (3 diffs)
• Scripts/libraries/webkitcorepy/webkitcorepy/mocks/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/mocks/terminal.py (copied) (copied from trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/mocks/__init__.py ) (2 diffs)
• Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py (added)
• Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py (added)
• Scripts/webkitpy/common/system/user.py (modified) (6 diffs)
• Scripts/webkitpy/common/system/user_mock.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-04  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitcorepy] Add shared terminal input code
+        https://bugs.webkit.org/show_bug.cgi?id=226024
+        <rdar://problem/78261645>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Export Terminal object, bump version.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py:
+        (credentials): Use Terminal.input.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/mocks/__init__.py:
+        * Scripts/libraries/webkitcorepy/webkitcorepy/mocks/terminal.py: Added.
+        (Terminal):
+        (Terminal.input): Mocking input and raw_input requires so specialized knowledge,
+        so we should generalize it.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/terminal.py: Added.
+        (Terminal):
+        (Terminal.input): Python 2/3 compatible input function.
+        (Terminal.choose): Generic multiple-choice input prompt.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/tests/terminal_unittest.py: Added.
+        (TerminalTests):
+        (TerminalTests.test_choose_basic):
+        (TerminalTests.test_choose_strict):
+        (TerminalTests.test_choose_default):
+        (TerminalTests.test_choose_triple):
+        (TerminalTests.test_choose_number):
+        * Scripts/webkitpy/common/system/user.py:
+        (User.prompt): Use Terminal.input.
+        (User.prompt_with_multiple_lists): Ditto.
+        (User.prompt_with_list): Ditto.
+        (User.confirm): Ditto.
+        * Scripts/webkitpy/common/system/user_mock.py:
+        (MockUser.prompt): Use Terminal.input.
+        (MockUser.prompt_with_list): Ditto.
+
 2021-08-04  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Tools/Scripts/libraries/webkitcorepy/setup.py

@@ -31 +31 @@
 setup(
     name='webkitcorepy',
-    version='0.7.4',
+    version='0.8.0',
     description='Library containing various Python support classes and functions.',
     long_description=readme(),

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py

@@ -36 +36 @@
 from webkitcorepy.output_capture import LoggerCapture, OutputCapture, OutputDuplicate
 from webkitcorepy.task_pool import TaskPool
+from webkitcorepy.terminal import Terminal
 from webkitcorepy.credentials import credentials
 from webkitcorepy.measure_time import MeasureTime
 from webkitcorepy.nested_fuzzy_dict import NestedFuzzyDict
 
-version = Version(0, 7, 4)
+version = Version(0, 8, 0)
 
 from webkitcorepy.autoinstall import Package, AutoInstall

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/credentials.py

@@ -26 +26 @@
 
 from subprocess import CalledProcessError
-from webkitcorepy import OutputCapture
+from webkitcorepy import OutputCapture, Terminal
 
 _cache = dict()
@@ -65 +65 @@
             sys.stderr.write("Authentication required to use {}\n".format(prompt or name))
             sys.stderr.write('Username: ')
-            username = (input if sys.version_info > (3, 0) else raw_input)()
+            username = Terminal.input()
             username_prompted = True
 
@@ -86 +86 @@
     if keyring and (username_prompted or key_prompted):
         sys.stderr.write('Store username and {} in system keyring for {}? (Y/N): '.format(key_name, url))
-        response = (input if sys.version_info > (3, 0) else raw_input)()
+        response = Terminal.input()
         if response.lower() in ['y', 'yes', 'ok']:
             sys.stderr.write('Storing credentials...\n')

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/mocks/__init__.py

@@ -26 +26 @@
 
 from webkitcorepy.mocks.requests_ import Response, Requests
+from webkitcorepy.mocks.terminal import Terminal

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/mocks/terminal.py

@@ -1 @@
-# Copyright (C) 2020 Apple Inc. All rights reserved.
+# Copyright (C) 2021 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -21 +21 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from webkitcorepy.mocks.context_stack import ContextStack
-from webkitcorepy.mocks.time_ import Time
-from webkitcorepy.mocks.subprocess import ProcessCompletion, Subprocess
+import sys
 
-from webkitcorepy.mocks.requests_ import Response, Requests
+
+class Terminal(object):
+    index = 0
+
+    @classmethod
+    def input(cls, *args):
+        from mock import patch
+
+        cls.index = 0
+
+        def function(output):
+            print(output)
+            cls.index += 1
+            return args[cls.index - 1]
+
+        if sys.version_info > (3, 0):
+            return patch('builtins.input', new=function)
+
+        import __builtin__
+        return patch.object(__builtin__, 'raw_input', new=function)

trunk/Tools/Scripts/webkitpy/common/system/user.py

@@ -37 +37 @@
 import webbrowser
 
+from webkitcorepy import Terminal
+
 from webkitpy.common.system.executive import Executive
 from webkitpy.common.system.platforminfo import PlatformInfo
@@ -51 +53 @@
         _log.warn("Unable to import readline.")
 
-if sys.version_info > (3, 0):
-    input_func = input
-else:
-    input_func = raw_input
-
 
 class User(object):
@@ -68 +65 @@
     # FIXME: These are @classmethods because bugzilla.py doesn't have a Tool object (thus no User instance).
     @classmethod
-    def prompt(cls, message, repeat=1, raw_input=input_func):
+    def prompt(cls, message, repeat=1, raw_input=Terminal.input):
         response = None
         while (repeat and not response):
@@ -80 +77 @@
 
     @classmethod
-    def prompt_with_multiple_lists(cls, list_title, subtitles, lists, can_choose_multiple=False, raw_input=input_func):
+    def prompt_with_multiple_lists(cls, list_title, subtitles, lists, can_choose_multiple=False, raw_input=Terminal.input):
         item_index = 0
         cumulated_list = []
@@ -120 +117 @@
 
     @classmethod
-    def prompt_with_list(cls, list_title, list_items, can_choose_multiple=False, raw_input=input_func):
+    def prompt_with_list(cls, list_title, list_items, can_choose_multiple=False, raw_input=Terminal.input):
         print(list_title)
         i = 0
@@ -162 +159 @@
             pass
 
-    def confirm(self, message=None, default=DEFAULT_YES, raw_input=input_func):
+    def confirm(self, message=None, default=DEFAULT_YES, raw_input=Terminal.input):
         if not message:
             message = "Continue?"

trunk/Tools/Scripts/webkitpy/common/system/user_mock.py

@@ -30 +30 @@
 import sys
 
+from webkitcorepy import Terminal
+
 _log = logging.getLogger(__name__)
-
-if sys.version_info < (3, 0):
-    input = raw_input
 
 
@@ -39 +38 @@
 
     @classmethod
-    def prompt(cls, message, repeat=1, raw_input=input):
+    def prompt(cls, message, repeat=1, raw_input=Terminal.input):
         return "Mock user response"
 
     @classmethod
-    def prompt_with_list(cls, list_title, list_items, can_choose_multiple=False, raw_input=input):
+    def prompt_with_list(cls, list_title, list_items, can_choose_multiple=False, raw_input=Terminal.input):
         pass