Skip to content
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.

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

fix(gradle-wrapper): parse prerelease and milestones #9261

Merged
merged 3 commits into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-milestone-1-bin.zip
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7-rc-1-bin.zip
17 changes: 14 additions & 3 deletions lib/manager/gradle-wrapper/__snapshots__/extract.spec.ts.snap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`lib/manager/gradle-wrapper/extract extractPackageFile() extracts all version line 1`] = `
exports[`manager/gradle-wrapper/extract extractPackageFile() extracts all version line 1`] = `
Array [
Object {
"currentValue": "4.10.3",
Expand All @@ -11,7 +11,7 @@ Array [
]
`;

exports[`lib/manager/gradle-wrapper/extract extractPackageFile() extracts bin version line 1`] = `
exports[`manager/gradle-wrapper/extract extractPackageFile() extracts bin version line 1`] = `
Array [
Object {
"currentValue": "4.8",
Expand All @@ -22,7 +22,18 @@ Array [
]
`;

exports[`lib/manager/gradle-wrapper/extract extractPackageFile() handles whitespace 1`] = `
exports[`manager/gradle-wrapper/extract extractPackageFile() extracts prerelease version line 1`] = `
Array [
Object {
"currentValue": "7.0-milestone-1",
"datasource": "gradle-version",
"depName": "gradle",
"versioning": "gradle",
},
]
`;

exports[`manager/gradle-wrapper/extract extractPackageFile() handles whitespace 1`] = `
Array [
Object {
"currentValue": "4.10.3",
Expand Down
23 changes: 22 additions & 1 deletion lib/manager/gradle-wrapper/extract.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { readFileSync } from 'fs';
import { resolve } from 'upath';
import { getName } from '../../../test/util';
import { extractPackageFile } from './extract';

const propertiesFile1 = readFileSync(
Expand All @@ -10,12 +11,20 @@ const propertiesFile2 = readFileSync(
resolve(__dirname, './__fixtures__/gradle-wrapper-2.properties'),
'utf8'
);
const propertiesFile3 = readFileSync(
resolve(__dirname, './__fixtures__/gradle-wrapper-3.properties'),
'utf8'
);
const propertiesFile4 = readFileSync(
resolve(__dirname, './__fixtures__/gradle-wrapper-4.properties'),
'utf8'
);
const whitespacePropertiesFile = readFileSync(
resolve(__dirname, './__fixtures__/gradle-wrapper-whitespace.properties'),
'utf8'
);

describe('lib/manager/gradle-wrapper/extract', () => {
describe(getName(__filename), () => {
describe('extractPackageFile()', () => {
it('returns null for empty', () => {
expect(extractPackageFile('nothing here')).toBeNull();
Expand All @@ -30,6 +39,18 @@ describe('lib/manager/gradle-wrapper/extract', () => {
const res = extractPackageFile(propertiesFile2);
expect(res.deps).toMatchSnapshot();
});

it('extracts prerelease version line', () => {
const res = extractPackageFile(propertiesFile3);
expect(res.deps).toMatchSnapshot();
expect(res.deps[0].currentValue).toBe('7.0-milestone-1');
});

it('ignores invalid', () => {
const res = extractPackageFile(propertiesFile4);
expect(res).toBeNull();
});

it('handles whitespace', () => {
const res = extractPackageFile(whitespacePropertiesFile);
expect(res.deps).toMatchSnapshot();
Expand Down
6 changes: 5 additions & 1 deletion lib/manager/gradle-wrapper/extract.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import * as datasourceGradleVersion from '../../datasource/gradle-version';
import { logger } from '../../logger';
import { regEx } from '../../util/regex';
import * as gradleVersioning from '../../versioning/gradle';
import type { PackageDependency, PackageFile } from '../types';

const DISTRIBUTION_URL_REGEX = /^(?<assignment>distributionUrl\s*=\s*)\S*-(?<version>(\d|\.)+)-(?<type>bin|all)\.zip\s*$/;
// https://regex101.com/r/1GaQ2X/1
const DISTRIBUTION_URL_REGEX = regEx(
'^(?:distributionUrl\\s*=\\s*)\\S*-(?<version>\\d+\\.\\d+(?:\\.\\d+)?(?:-\\w+)*)-(?<type>bin|all)\\.zip\\s*$'
);

export function extractPackageFile(fileContent: string): PackageFile | null {
logger.debug('gradle-wrapper.extractPackageFile()');
Expand Down