Extract extras from fragment's egg when vcs is specified

requirements/fragment.py

@@ -27,3 +27,10 @@ def get_hash_info(d):
             return key, d[key]
 
     return None, None
+
+
+def parse_extras_require(egg):
+    if egg is not None and ('[' and ']') in egg:
+        name, _, extras = egg.partition('[')
+        return name, [extra.strip() for extra in extras[:-1].split(',')]
+    return egg, []

requirements/requirement.py

@@ -2,7 +2,7 @@
 import re
 from pkg_resources import Requirement as Req
 
-from .fragment import get_hash_info, parse_fragment
+from .fragment import get_hash_info, parse_fragment, parse_extras_require
 from .vcs import VCS, VCS_SCHEMES
 
 
@@ -107,7 +107,8 @@ def parse_editable(cls, line):
             req.revision = groups['revision']
             if groups['fragment']:
                 fragment = parse_fragment(groups['fragment'])
-                req.name = fragment.get('egg')
+                egg = fragment.get('egg')
+                req.name, req.extras = parse_extras_require(egg)
                 req.hash_name, req.hash = get_hash_info(fragment)
             for vcs in VCS:
                 if req.uri.startswith(vcs):
@@ -118,7 +119,8 @@ def parse_editable(cls, line):
             req.local_file = True
             if groups['fragment']:
                 fragment = parse_fragment(groups['fragment'])
-                req.name = fragment.get('egg')
+                egg = fragment.get('egg')
+                req.name, req.extras = parse_extras_require(egg)
                 req.hash_name, req.hash = get_hash_info(fragment)
             req.path = groups['path']
 
@@ -148,7 +150,8 @@ def parse_line(cls, line):
             req.revision = groups['revision']
             if groups['fragment']:
                 fragment = parse_fragment(groups['fragment'])
-                req.name = fragment.get('egg')
+                egg = fragment.get('egg')
+                req.name, req.extras = parse_extras_require(egg)
                 req.hash_name, req.hash = get_hash_info(fragment)
             for vcs in VCS:
                 if req.uri.startswith(vcs):
@@ -158,7 +161,8 @@ def parse_line(cls, line):
             req.uri = '{scheme}://{path}'.format(**groups)
             if groups['fragment']:
                 fragment = parse_fragment(groups['fragment'])
-                req.name = fragment.get('egg')
+                egg = fragment.get('egg')
+                req.name, req.extras = parse_extras_require(egg)
                 req.hash_name, req.hash = get_hash_info(fragment)
             if groups['scheme'] == 'file':
                 req.local_file = True
@@ -169,6 +173,8 @@ def parse_line(cls, line):
             req.local_file = True
             if groups['fragment']:
                 fragment = parse_fragment(groups['fragment'])
+                egg = fragment.get('egg')
+                name, extras = parse_extras_require(egg)
                 req.name = fragment.get('egg')
                 req.hash_name, req.hash = get_hash_info(fragment)
             req.path = groups['path']

tests/reqfiles/vcs_git_extras_require.expected

@@ -0,0 +1,17 @@
+[
+ {
+  "specifier": false,
+  "local_file": false,
+  "name": "MyProject",
+  "editable": false,
+  "uri": "git+https://git.myproject.org/MyProject.git",
+  "extras": ["security"],
+  "vcs": "git",
+  "path": null,
+  "line":  "git+https://git.myproject.org/[email protected]#egg=MyProject[security]",
+  "hash_name": null,
+  "hash": null,
+  "specs": [],
+  "revision": "v0.1"
+ }
+]

tests/reqfiles/vcs_git_extras_require.txt

@@ -0,0 +1 @@
+git+https://git.myproject.org/[email protected]#egg=MyProject[security]