df7bb1d29a
Summary: This update does away with the scripts in bin and changes setup.py to use entry_points in cmdline.py for the scripts 'hy' and 'hyc'. This fixes installing and running on Windows. The tests are updated to run the 'hy' script produced by setup.py and not from bin/hy. This is more correct and makes the tox tests run on both Window and *nix. For running hy or nosetests directly in the source tree, you do have to run 'python setup.py develop' first. But since tox runs and builds dists, all tox tests pass on all platforms. Also, since there is no built-in readline on Windows, the setup.py only on Windows requires 'pyreadline' as a replacement. Switched from optparse to argparse in cmdline.py Instead of trying to manually separate args meant for hy from args meant for a hy script, this switches from optparse to argparse for the CLI. argparse automatically peels out args meant for hy and leaves the rest, including the user hy script in options.args. This fixes the issue @paultag found running "hy foo" where foo is not a real file. Also added a test that makes sure trying to run a non-existent script exits instead of dropping the user into the REPL. Added argparse as setup.py resource (and removed from tox.ini) as well as removed uses of deprecated setf
131 lines
3.9 KiB
Python
131 lines
3.9 KiB
Python
#!/usr/bin/env python
|
|
# -*- encoding: utf-8 -*-
|
|
# Copyright (c) 2013 Julien Danjou <julien@danjou.info>
|
|
# Copyright (c) 2013 Will Kahn-Greene <willg@bluesock.org>
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
# copy of this software and associated documentation files (the "Software"),
|
|
# to deal in the Software without restriction, including without limitation
|
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
# and/or sell copies of the Software, and to permit persons to whom the
|
|
# Software is furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in
|
|
# all copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
# DEALINGS IN THE SOFTWARE.
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
|
|
|
|
def run_cmd(cmd, stdin_data=None):
|
|
p = subprocess.Popen(cmd,
|
|
stdin=subprocess.PIPE,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
shell=True)
|
|
stdout = ""
|
|
stderr = ""
|
|
if stdin_data is not None:
|
|
p.stdin.write(stdin_data.encode('ASCII'))
|
|
p.stdin.flush()
|
|
p.stdin.close()
|
|
# Read stdout and stderr otherwise if the PIPE buffer is full, we might
|
|
# wait for ever…
|
|
while p.poll() is None:
|
|
stdout += str(p.stdout.read())
|
|
stderr += str(p.stderr.read())
|
|
return p.returncode, stdout, stderr
|
|
|
|
|
|
def test_bin_hy():
|
|
ret = run_cmd("hy", "")
|
|
assert ret[0] == 0
|
|
|
|
|
|
def test_bin_hy_stdin():
|
|
ret = run_cmd("hy", '(koan)')
|
|
assert ret[0] == 0
|
|
assert "monk" in ret[1]
|
|
|
|
|
|
def test_bin_hy_cmd():
|
|
ret = run_cmd("hy -c \"(koan)\"")
|
|
assert ret[0] == 0
|
|
assert "monk" in ret[1]
|
|
|
|
ret = run_cmd("hy -c \"(koan\"")
|
|
assert ret[0] == 1
|
|
assert "LexException" in ret[1]
|
|
|
|
|
|
def test_bin_hy_icmd():
|
|
ret = run_cmd("hy -i \"(koan)\"", "(ideas)")
|
|
assert ret[0] == 0
|
|
output = ret[1]
|
|
|
|
assert "monk" in output
|
|
assert "figlet" in output
|
|
|
|
|
|
def test_bin_hy_file():
|
|
ret = run_cmd("hy eg/nonfree/halting-problem/halting.hy")
|
|
assert ret[0] == 0
|
|
assert "27" in ret[1]
|
|
|
|
|
|
def test_bin_hy_missing_file():
|
|
ret = run_cmd("hy foobarbaz")
|
|
assert ret[0] == 1
|
|
assert "No such file" in ret[2]
|
|
|
|
|
|
def test_bin_hy_file_with_args():
|
|
ret = run_cmd("hy tests/resources/argparse_ex.hy -h")
|
|
assert ret[0] == 0
|
|
assert "usage" in ret[1]
|
|
ret = run_cmd("hy tests/resources/argparse_ex.hy -c bar")
|
|
assert ret[0] == 0
|
|
assert "got c" in ret[1]
|
|
ret = run_cmd("hy tests/resources/argparse_ex.hy -i foo")
|
|
assert ret[0] == 0
|
|
assert "foo" in ret[1]
|
|
ret = run_cmd("hy tests/resources/argparse_ex.hy -i foo -c bar")
|
|
assert ret[0] == 0
|
|
assert "foo" in ret[1]
|
|
|
|
|
|
def test_hy2py():
|
|
# XXX Astor doesn't seem to support Python3 :(
|
|
if sys.version_info[0] == 3:
|
|
return
|
|
|
|
# and running this script this way doesn't work on Windows
|
|
if os.name == "nt":
|
|
return
|
|
|
|
i = 0
|
|
for dirpath, dirnames, filenames in os.walk("tests/native_tests"):
|
|
for f in filenames:
|
|
if f.endswith(".hy"):
|
|
i += 1
|
|
ret = run_cmd("bin/hy2py " + os.path.join(dirpath, f))
|
|
assert ret[0] == 0, f
|
|
assert len(ret[1]) > 1, f
|
|
assert len(ret[2]) == 0, f
|
|
assert i
|
|
|
|
|
|
def test_bin_hy_builtins():
|
|
import hy.cmdline # NOQA
|
|
|
|
assert str(exit) == "Use (exit) or Ctrl-D (i.e. EOF) to exit"
|
|
assert str(quit) == "Use (quit) or Ctrl-D (i.e. EOF) to exit"
|