From 28907ef29c6c8c88c5aaf5480dbc9e2304b7f98f Mon Sep 17 00:00:00 2001
From: Dan Ryan <dan@danryan.co>
Date: Tue, 14 Nov 2017 21:08:01 -0500
Subject: [PATCH 1/2] Stop writing unparseable requirements to Pipfiles

- Add better exception handling and error messaging for parse errors
- Add test to verify this is now being handled correctly
- Fixes #1056
---
 pipenv/cli.py        | 17 ++++++++++++++++-
 tests/test_pipenv.py |  8 ++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pipenv/cli.py b/pipenv/cli.py
index 88d706be..a28b9f2f 100644
--- a/pipenv/cli.py
+++ b/pipenv/cli.py
@@ -1352,7 +1352,22 @@ def pip_install(
             f.write(package_name)
 
     # Install dependencies when a package is a VCS dependency.
-    if get_requirement(package_name.split('--hash')[0].split('--trusted-host')[0]).vcs:
+    try:
+        req = get_requirement(package_name.split('--hash')[0].split('--trusted-host')[0]).vcs
+    except (pip._vendor.pyparsing.ParseException, ValueError) as e:
+        click.echo('{0}: {1}'.format(crayons.red('WARNING'), e), err=True)
+        click.echo(
+            '{0}... You will have to reinstall any packages that failed to install.'.format(
+                crayons.red('ABORTING INSTALL')
+            ), err=True
+        )
+        click.echo(
+            'You may have to manually run {0} when you are finished.'.format(
+                crayons.normal('pipenv lock', bold=True)
+            )
+        )
+        sys.exit(1)
+    if req:
         no_deps = False
 
         # Don't specify a source directory when using --system.
diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py
index 8a0d6812..355bbd51 100644
--- a/tests/test_pipenv.py
+++ b/tests/test_pipenv.py
@@ -174,6 +174,14 @@ class TestPipenv:
             c = p.pipenv('--man')
             assert c.return_code == 0 or c.err
 
+    @pytest.mark.cli
+    @pytest.mark.install
+    def test_install_parse_error(self):
+        with PipenvInstance() as p:
+            c = p.pipenv('install tablib --upgrade')
+            assert c.return_code != 0
+            assert '--upgrade' not in p.pipfile['packages']
+
     @pytest.mark.install
     @pytest.mark.setup
     @pytest.mark.skip(reason="this doesn't work on travis")

From 7f26c16102d41363249614e41ae2e917a3b33aca Mon Sep 17 00:00:00 2001
From: Dan Ryan <dan@danryan.co>
Date: Wed, 15 Nov 2017 19:05:00 -0500
Subject: [PATCH 2/2] Update test to not test for anything like cli arg

- Use a clearly unparseable package name instead
---
 tests/test_pipenv.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py
index 355bbd51..280b1df0 100644
--- a/tests/test_pipenv.py
+++ b/tests/test_pipenv.py
@@ -178,9 +178,11 @@ class TestPipenv:
     @pytest.mark.install
     def test_install_parse_error(self):
         with PipenvInstance() as p:
-            c = p.pipenv('install tablib --upgrade')
+            # Make sure unparseable packages don't wind up in the pipfile
+            # Escape $ for shell input
+            c = p.pipenv('install tablib u/\\/p@r\$34b13+pkg')
             assert c.return_code != 0
-            assert '--upgrade' not in p.pipfile['packages']
+            assert 'u/\\/p@r$34b13+pkg' not in p.pipfile['packages']
 
     @pytest.mark.install
     @pytest.mark.setup