Added 'hyper' command as CLI

Author: t2y

hyper/cli.py

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+"""
+hyper/cli
+~~~~~~~~~
+
+Command line interface for hyper.
+"""
+import argparse
+import logging
+import sys
+
+from hyper import HTTP20Connection
+
+log = logging.getLogger('hyper')
+
+_ARGUMENT_DEFAULTS = {
+    'encoding': 'utf-8',
+    'host': None,
+    'nullout': False,
+    'method': 'GET',
+    'path': '/',
+    'verbose': False,
+}
+
+
+def parse_argument(argv=None):
+    parser = argparse.ArgumentParser()
+    parser.set_defaults(**_ARGUMENT_DEFAULTS)
+
+    # positional arguments
+    parser.add_argument('host', help='set host to request')
+    parser.add_argument(
+        'path', nargs='?',
+        help='set path to resource (default: /)')
+
+    # optional arguments
+    parser.add_argument(
+        '-e', '--encoding',
+        help='set charset for content-type')
+    parser.add_argument(
+        '-n', '--nullout', action='store_true',
+        help='do not show response data')
+    parser.add_argument(
+        '-m', '--method',
+        help='set http method (default: GET)')
+    parser.add_argument(
+        '-v', '--verbose', action='store_true',
+        help='set verbose mode (loglevel=DEBUG)')
+
+    args = parser.parse_args(sys.argv[1:] if argv is None else argv)
+    return args
+
+
+def request(args):
+    conn = HTTP20Connection(args.host)
+    conn.request(args.method, args.path)
+    response = conn.getresponse()
+    return response.read()
+
+
+def main(argv=None):
+    args = parse_argument(argv)
+    if args.verbose:
+        handler = logging.StreamHandler()
+        handler.setLevel(logging.DEBUG)
+        log.addHandler(handler)
+        log.setLevel(logging.DEBUG)
+
+    data = request(args)
+    if not args.nullout:
+        print(data.decode(args.encoding))
+
+
+if __name__ == '__main__':
+    main()

hyper/http20/tls.py

@@ -5,10 +5,12 @@
 
 Contains the TLS/SSL logic for use in hyper.
 """
+import logging
 import os.path as path
 
 from ..compat import ignore_missing, ssl
 
+log = logging.getLogger(__name__)
 
 NPN_PROTOCOL = 'h2-16'
 H2_NPN_PROTOCOLS = [NPN_PROTOCOL, 'h2-15', 'h2-14']  # All h2s we support.
@@ -41,7 +43,9 @@ def wrap_socket(sock, server_hostname):
         ssl.match_hostname(ssl_sock.getpeercert(), server_hostname)
 
     with ignore_missing():
-        assert ssl_sock.selected_npn_protocol() in H2_NPN_PROTOCOLS
+        selected_npn = ssl_sock.selected_npn_protocol()
+        log.debug('Selected NPN: %s' % selected_npn)
+        assert selected_npn in H2_NPN_PROTOCOLS
 
     return ssl_sock
 

setup.py

@@ -63,4 +63,9 @@ def resolve_install_requires():
         'Programming Language :: Python :: Implementation :: CPython',
     ],
     install_requires=resolve_install_requires(),
+    entry_points={
+        'console_scripts': [
+            'hyper = hyper.cli:main',
+        ],
+    },
 )

test/test_cli.py

@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+from hyper.cli import _ARGUMENT_DEFAULTS
+from hyper.cli import main, parse_argument
+
+import pytest
+
+
+@pytest.mark.parametrize('argv', [
+    ['example.com'],
+    ['example.com', '/home'],
+    ['-v', 'example.com'],
+    ['-n', 'example.com'],
+], ids=[
+    'specified host',
+    'specified host with path',
+    'specified host with "-v/--verbose" option',
+    'specified host with "-n/--nullout" option',
+])
+def test_cli_normal(monkeypatch, argv):
+    monkeypatch.setattr('hyper.cli.HTTP20Connection', DummyConnection)
+    main(argv)
+    assert True
+
+
+@pytest.mark.parametrize('argv', [
+    [],
+    ['-h'],
+], ids=[
+    'specified no argument',
+    'specified "-h" option',
+])
+def test_cli_with_system_exit(argv):
+    with pytest.raises(SystemExit):
+        main(argv)
+
+
+@pytest.mark.parametrize('argv', [
+    {'host': 'example.com'},
+    {'host': 'example.com', 'path': '/home'},
+    {'host': 'example.com', 'encoding': 'latin-1'},
+    {'host': 'example.com', 'nullout': True},
+    {'host': 'example.com', 'method': 'POST'},
+    {'host': 'example.com', 'verbose': True},
+], ids=[
+    'specified host',
+    'specified host with path',
+    'specified host with "-e/--encoding" option',
+    'specified host with "-m/--method" option',
+    'specified host with "-n/--nullout" option',
+    'specified host with "-v/--verbose" option',
+])
+def test_cli_parse_argument(argv):
+    d = _ARGUMENT_DEFAULTS.copy()
+    d.update(argv)
+    _argv = ['-e', d['encoding'], '-m', d['method']]
+    for key, value in d.items():
+        if isinstance(value, bool) and value is True:
+            _argv.append('--%s' % key)
+    _argv.extend([d['host'], d['path']])
+
+    args = parse_argument(_argv)
+    for key in d.keys():
+        assert getattr(args, key) == d[key]
+
+
+def test_cli_with_main(monkeypatch):
+    monkeypatch.setattr('sys.argv', ['./hyper'])
+    import imp
+    import hyper.cli
+    with pytest.raises(SystemExit):
+        imp.load_source('__main__', hyper.cli.__file__)
+
+
+# mock for testing
+class DummyResponse(object):
+    def read(self):
+        return b'<html>dummy</html>'
+
+
+class DummyConnection(object):
+    def __init__(self, host):
+        self.host = host
+
+    def request(self, method, path):
+        return method, path
+
+    def getresponse(self):
+        return DummyResponse()