Merge pull request #215 from zvezdan/fix-wheel-regex

Fix the regex for wheel file name format.

Author: zvezdan

pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/wheel/FileBackedWheelCache.java

@@ -85,7 +85,7 @@ public Optional<File> findWheel(String library, String version, File pythonExecu
 
         logger.info("Found artifacts: {}", foundWheel);
 
-        return foundWheel.map(it -> it.file);
+        return foundWheel.map(it -> it.getFile());
     }
 
     public File getCacheDir() {
@@ -95,8 +95,8 @@ public File getCacheDir() {
     private boolean wheelMatches(File pythonExecutable, PythonWheelDetails wheelDetails) {
         return supportedWheelFormats.matchesSupportedVersion(
             pythonExecutable,
-            wheelDetails.pythonTag,
-            wheelDetails.abiTag,
-            wheelDetails.platformTag);
+            wheelDetails.getPythonTag(),
+            wheelDetails.getAbiTag(),
+            wheelDetails.getPlatformTag());
     }
 }

pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/wheel/PythonWheelDetails.java

@@ -23,22 +23,36 @@
 public class PythonWheelDetails {
 
     // PEP-0427
-    public static final String WHEEL_FILE_FORMAT = "(?<dist>.*?)-(?<version>.*?)(-(.*?))?-(?<pythonTag>.*?)-(?<abiTag>.*?)-(?<platformTag>.*?).whl";
-
-    final File file;
-    final String dist;
-    final String version;
-    final String pythonTag;
-    final String abiTag;
-    final String platformTag;
-
-    public PythonWheelDetails(File file, Matcher matcher) {
-        this.file = file;
-        this.dist = matcher.group("dist");
-        this.version = matcher.group("version");
-        this.pythonTag = matcher.group("pythonTag");
-        this.abiTag = matcher.group("abiTag");
-        this.platformTag = matcher.group("platformTag");
+    private static final String WHEEL_FILE_FORMAT = "(?<dist>.+?)-(?<version>\\d.*?)(-(\\d.*?))?-(?<pythonTag>.+?)-(?<abiTag>.+?)-(?<platformTag>.+?).whl";
+
+    private static final Pattern WHEEL_PATTERN = Pattern.compile(WHEEL_FILE_FORMAT);
+    private static final Pattern SNAPSHOT_PATTERN = Pattern.compile("_(?<snapshot>[A-Z]+)$");
+
+    private final File file;
+    private final String dist;
+    private final String version;
+    private final String pythonTag;
+    private final String abiTag;
+    private final String platformTag;
+
+    private PythonWheelDetails(File wheelFile, Matcher matcher) {
+        file = wheelFile;
+        dist = matcher.group("dist");
+        String matchedVersion = matcher.group("version");
+        pythonTag = matcher.group("pythonTag");
+        abiTag = matcher.group("abiTag");
+        platformTag = matcher.group("platformTag");
+
+        Matcher snapshotMatcher = SNAPSHOT_PATTERN.matcher(matchedVersion);
+        if (snapshotMatcher.find()) {
+            version = snapshotMatcher.replaceFirst("-" + snapshotMatcher.group("snapshot"));
+        } else {
+            version = matchedVersion;
+        }
+    }
+
+    public File getFile() {
+        return file;
     }
 
     public String getDist() {
@@ -49,6 +63,18 @@ public String getVersion() {
         return version;
     }
 
+    public String getPythonTag() {
+        return pythonTag;
+    }
+
+    public String getAbiTag() {
+        return abiTag;
+    }
+
+    public String getPlatformTag() {
+        return platformTag;
+    }
+
     @Override
     public String toString() {
         return "PythonWheelDetails{"
@@ -61,9 +87,8 @@ public String toString() {
             + '}';
     }
 
-    static public Optional<PythonWheelDetails> fromFile(File file) {
-        Pattern wheelPattern = Pattern.compile(WHEEL_FILE_FORMAT);
-        Matcher matcher = wheelPattern.matcher(file.getName());
+    public static Optional<PythonWheelDetails> fromFile(File file) {
+        Matcher matcher = WHEEL_PATTERN.matcher(file.getName());
         if (!matcher.matches()) {
             return Optional.empty();
         }

pygradle-plugin/src/test/groovy/com/linkedin/gradle/python/wheel/PythonWheelDetailsTest.groovy

@@ -33,11 +33,11 @@ class PythonWheelDetailsTest extends Specification {
 
     def 'can parse wheel file with SNAPSHOT version'() {
         when:
-        def wheelFile = new File("foo-1.0.0-SNAPSHOT-py2-none-any.whl")
+        def wheelFile = new File("foo-1.0.0_SNAPSHOT-py2-none-any.whl")
         PythonWheelDetails pythonWheelDetails = PythonWheelDetails.fromFile(wheelFile).get()
         then:
         pythonWheelDetails.dist == "foo"
-        pythonWheelDetails.version == "1.0.0"
+        pythonWheelDetails.version == "1.0.0-SNAPSHOT"
         pythonWheelDetails.pythonTag == "py2"
         pythonWheelDetails.abiTag == "none"
         pythonWheelDetails.platformTag == "any"