Skip to content

Fixed split ball with extended build version info #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alquerci wants to merge 2 commits into
base: 1.1
Choose a base branch
from
Open

Fixed split ball with extended build version info #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47724c3
Added failling test for split ball with extended build version info
alquerci May 19, 2015
f4999e3
Fixed split ball with extended build version info
alquerci May 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/cygapt/cygapt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,16 +239,20 @@ def try_itoa(x):
);

def _stringToVersion(self, s):
dashPosition = s.find('-');
build = s[dashPosition + 1:];
s = s[:dashPosition];
s = re.sub(r"([^0-9][^0-9]*)", " \\1 ", s);
s = re.sub(r"[ _.-][ _.-]*", " ", s);
s = s.rstrip(' ');
def try_atoi(x):
if re.match(r"^[0-9]*$", x):
return int(x);
return x
return tuple(map(try_atoi, (s.split(' '))));
return tuple(map(try_atoi, s.split(' ') + [build]));

def _splitBall(self, p):
m = re.match(r"^(.*)-([0-9].*-[0-9]+)(.tar.(bz2|xz))?$", p);
m = re.match(r"^(.*)-([0-9].*-[0-9]+[.\w]*?)(.tar.(bz2|xz))?$", p);
if not m:
print("splitBall: {0}".format(p));
return (p[:2], (0, 0));
Expand Down
60 changes: 39 additions & 21 deletions src/cygapt/test/test_cygapt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,30 +180,48 @@ def testRunScript(self):
self.obj._runScript(script, False);
self.assertTrue(os.path.exists(map_script_done));

def testVersionToString(self):
versiont = [1,12,3,1];
out = "1.12.3-1";
ret = self.obj._versionToString(versiont);
self.assertEqual(ret, out);

def testStringToVersion(self):
string = "1.12.3-1";
out = [1,12,3,1];
ret = self.obj._stringToVersion(string);
self.assertEqual(list(ret), out);

def testSplitBall(self):
value = "pkgball-1.12.3-1.tar.bz2";
output = ["pkgball", (1,12,3,1)];
@dataProvider('getVersionToStringData')
def testVersionToString(self, value, expected):
ret = self.obj._versionToString(value);
self.assertEqual(ret, expected);

def getVersionToStringData(self):
return [
[[1, 12, 3, 1], "1.12.3-1"],
[[1, 12, 3, "1.23foo45"], "1.12.3-1.23foo45"],
];

@dataProvider('getVersionToStringData')
def testStringToVersion(self, expected, value):
ret = self.obj._stringToVersion(value);
self.assertEqual(list(ret), expected);

@dataProvider('getSplitBallData')
def testSplitBall(self, value, expected):
ret = self.obj._splitBall(value);
self.assertEqual(list(ret), output);
self.assertEqual(list(ret), expected);

def testJoinBall(self):
value = ["pkgball", [1,12,3,1]];
output = "pkgball-1.12.3-1";
def getSplitBallData(self):
return [
["pkgball-1.12.3-1.tar.bz2", ["pkgball", (1, 12, 3, 1)]],
["pkgball-1.2-1.tar.xz", ["pkgball", (1, 2, 1)]],
["pkgball-1.12.3-1.23foo45.tar.bz2", ["pkgball", (1, 12, 3, "1.23foo45")]],
["pkgball-1.2.34c-56.tar.bz2", ["pkgball", (1, 2, 34, "c", 56)]],
["pkgball-1.2.34.c-56.tar.bz2", ["pkgball", (1, 2, 34, "c", 56)]],
];

@dataProvider('getJoinBallData')
def testJoinBall(self, expected, value):
ret = self.obj._joinBall(value);
self.assertEqual(ret, output);

self.assertEqual(ret, expected);

def getJoinBallData(self):
return [
["pkgball-1.12.3-1", ["pkgball", (1, 12, 3, 1)]],
["pkgball-1.12.3-1.23foo45", ["pkgball", (1, 12, 3, "1.23foo45")]],
["pkgball-1.2.34.c-56", ["pkgball", (1, 2, 34, "c", 56)]],
];

def testGetSetupIni(self):
self.obj.setDists(0);
self.obj._getSetupIni();
Expand Down