From 741e71ac4c7331f8d08f4c6cf499965e607dfc08 Mon Sep 17 00:00:00 2001
From: Nate Prewitt <Nate.Prewitt@gmail.com>
Date: Fri, 27 Jan 2017 09:53:46 -0700
Subject: [PATCH] :| I really don't like this.

---
 Pipfile       |  2 +-
 pipenv/cli.py | 34 ++++++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Pipfile b/Pipfile
index 931d1fb9..efdecc02 100644
--- a/Pipfile
+++ b/Pipfile
@@ -9,5 +9,5 @@ toml = "*"
 requests = "*"
 requirements-parser = "*"
 parse = "*"
-"backports.shutil_get_terminal_size" = "*"
 pipfile = "==0.0.1"
+"backports.shutil-get-terminal-size" = "*"
diff --git a/pipenv/cli.py b/pipenv/cli.py
index 9e760a64..ad8069e8 100644
--- a/pipenv/cli.py
+++ b/pipenv/cli.py
@@ -236,14 +236,36 @@ def do_download_dependencies(dev=False, only=False, bare=False):
         if not bare:
             click.echo(crayons.blue(c.out))
 
-        # store original name with filename
-        filename = parse.search('Saved {file}\n', c.out)
-        if filename:
-            fname = filename['file'].replace('./.venv/downloads/','')
-            name_map[fname]= package_name
+        parsed_output = parse_install_output(c.out)
+        for filename, name in parsed_output:
+            name_map[filename] = name
 
     return name_map
 
+def parse_install_output(output):
+    """Parse output from pip download to get name and file mappings
+    for all dependencies and their sub dependencies.
+
+    This is required for proper file hashing with --require-hashes
+    """
+    output_sections = output.split('Collecting ')
+    names = []
+
+    for section in output_sections:
+        lines = section.split('\n')
+        # strip dependency data wrapped in parens
+        name = lines[0].split('(')[0]
+        for line in lines:
+            r = parse.parse('Saved {file}', line.strip())
+            if r is None:
+                r = parse.parse('Using cached {file}', line.strip())
+            if r is None:
+                continue
+            names.append((r['file'].replace('./.venv/downloads/',''), name))
+                
+    return names
+
+
 def do_create_virtualenv(three=None):
     """Creates a virtualenv."""
     click.echo(crayons.yellow('Creating a virtualenv for this project...'))
@@ -465,7 +487,7 @@ def pip_install(package_name=None, r=None, allow_global=False):
 
 
 def pip_download(package_name):
-    c = delegator.run('{0} download "{1}" --no-deps -d {2}'.format(which_pip(), package_name, project.download_location))
+    c = delegator.run('{0} download "{1}" -d {2}'.format(which_pip(), package_name, project.download_location))
     return c