rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
Code Issues Releases Activity

Correctly handle "-snapshot" and "+build" in semantic versioning

Browse Source 
This fix a regression introduced in:

048a8a61 (VersionHelper now correctly strip snapshot info)

actually neither 048a8a61 nor the version before are correct becuase:

048a8a61 - strips all the extra `-snapshot` and `+build`
previous - doesn't handle the case `x.y-snapshot`

Now both are handled correctly and a test has been added to verify this.

To be completely semver compliant we should deny versions in the
format `x.y`, but this will break all legacy version that have been
published until now, so this changed should be postponed for the next
major release of the IDE.

Fix #5251
This commit is contained in:
Cristian Maglie 2016-08-16 10:44:02 +02:00
parent 0272252e6a
commit 49b98959c5
2 changed files with 74 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/test/cc/arduino/contributions/VersionHelperTest.java Normal file
View File

@ -0,0 +1,57 @@
/*
* This file is part of Arduino.
*
* Copyright 2016 Arduino LLC (http://www.arduino.cc/)
*
* Arduino is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* As a special exception, you may use this file as part of a free software
* library without restriction. Specifically, if other files instantiate
* templates or use macros or inline functions from this file, or you compile
* this file and link it with other files to produce an executable, this
* file does not by itself cause the resulting executable to be covered by
* the GNU General Public License. This exception does not however
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*/
package cc.arduino.contributions;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
public class VersionHelperTest {
@Test
public void testVersions() throws Exception {
assertEquals("1.0.0", VersionHelper.valueOf("1.0.0").toString());
assertEquals("1.0.0", VersionHelper.valueOf("1.0").toString());
assertEquals("1.0.0", VersionHelper.valueOf("1").toString());
assertEquals("1.0.0-abc", VersionHelper.valueOf("1.0.0-abc").toString());
assertEquals("1.0.0-abc", VersionHelper.valueOf("1.0-abc").toString());
assertEquals("1.0.0-abc", VersionHelper.valueOf("1-abc").toString());
assertEquals("1.0.0+abc", VersionHelper.valueOf("1.0.0+abc").toString());
assertEquals("1.0.0+abc", VersionHelper.valueOf("1.0+abc").toString());
assertEquals("1.0.0+abc", VersionHelper.valueOf("1+abc").toString());
assertEquals("1.0.0-def+abc", VersionHelper.valueOf("1.0.0-def+abc").toString());
assertEquals("1.0.0-def+abc", VersionHelper.valueOf("1.0-def+abc").toString());
assertEquals("1.0.0-def+abc", VersionHelper.valueOf("1-def+abc").toString());
assertEquals("1.0.0+def-abc", VersionHelper.valueOf("1.0.0+def-abc").toString());
assertEquals("1.0.0+def-abc", VersionHelper.valueOf("1.0+def-abc").toString());
assertEquals("1.0.0+def-abc", VersionHelper.valueOf("1+def-abc").toString());
}
}

28
arduino-core/src/cc/arduino/contributions/VersionHelper.java
View File

@ -38,20 +38,26 @@ public class VersionHelper {
return null;
}
try {
if (ver.contains("-")) {
// Strip snapshot info
ver = ver.split("-")[0];
// Allow x.y-something, assuming x.y.0-something
// Allow x-something, assuming x.0.0-something
String version = ver;
String extra = "";
String split[] = ver.split("[+-]", 2);
if (split.length == 2) {
version = split[0];
extra = ver.substring(version.length()); // includes separator + or -
}
String[] verParts = ver.split("\\.");
if (verParts.length < 3) {
if (verParts.length == 2) {
return Version.forIntegers(Integer.valueOf(verParts[0]), Integer.valueOf(verParts[1]));
} else {
return Version.forIntegers(Integer.valueOf(verParts[0]));
}
} else {
String[] parts = version.split("\\.");
if (parts.length >= 3) {
return Version.valueOf(ver);
}
if (parts.length == 2) {
version += ".0";
}
if (parts.length == 1) {
version += ".0.0";
}
return Version.valueOf(version + extra);
} catch (Exception e) {
System.err.println("Invalid version found: " + ver);
return null;