diff --git a/lib/manager/homebrew/extract.js b/lib/manager/homebrew/extract.js index 8f14dc12d00c4e7201d066884eda1ae69eb60b77..03d01794f1288643bb9d1c182342d737424d7c3e 100644 --- a/lib/manager/homebrew/extract.js +++ b/lib/manager/homebrew/extract.js @@ -49,7 +49,7 @@ function extractPackageFile(content) { depName: `${ownerName}/${repoName}`, url, sha256, - ownerName, + managerData: { ownerName }, repoName, currentValue, datasource: 'github', diff --git a/lib/manager/homebrew/update.js b/lib/manager/homebrew/update.js index 89b8679674e0cfac0b9bd62ec6d948924a892b9a..242108fb040e4c854a51b8a592b0b041a95a2d70 100644 --- a/lib/manager/homebrew/update.js +++ b/lib/manager/homebrew/update.js @@ -30,7 +30,7 @@ async function updateDependency(content, upgrade) { return content; } try { - newUrl = `https://github.com/${upgrade.ownerName}/${ + newUrl = `https://github.com/${upgrade.managerData.ownerName}/${ upgrade.repoName }/releases/download/${upgrade.newValue}/${upgrade.repoName}-${coerce( upgrade.newValue @@ -43,7 +43,7 @@ async function updateDependency(content, upgrade) { `Failed to download release download for ${upgrade.depName} - trying archive instead` ); try { - newUrl = `https://github.com/${upgrade.ownerName}/${upgrade.repoName}/archive/${upgrade.newValue}.tar.gz`; + newUrl = `https://github.com/${upgrade.managerData.ownerName}/${upgrade.repoName}/archive/${upgrade.newValue}.tar.gz`; file = (await got(newUrl, { encoding: null })).body; } catch (errInner) { logger.debug( diff --git a/test/manager/homebrew/__snapshots__/extract.spec.js.snap b/test/manager/homebrew/__snapshots__/extract.spec.js.snap index b0f7e161fa00f980eb49e9caf074efd47cfb7f9b..2dd88c55a7c083dcc2d8e0b6350a8911de301305 100644 --- a/test/manager/homebrew/__snapshots__/extract.spec.js.snap +++ b/test/manager/homebrew/__snapshots__/extract.spec.js.snap @@ -7,7 +7,9 @@ Object { "currentValue": "v0.8.2", "datasource": "github", "depName": "bazelbuild/bazel-watcher", - "ownerName": "bazelbuild", + "managerData": Object { + "ownerName": "bazelbuild", + }, "repoName": "bazel-watcher", "sha256": "26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4", "url": "https://github.com/bazelbuild/bazel-watcher/archive/v0.8.2.tar.gz", @@ -23,7 +25,9 @@ Object { "currentValue": "v0.16.1", "datasource": "github", "depName": "aide/aide", - "ownerName": "aide", + "managerData": Object { + "ownerName": "aide", + }, "repoName": "aide", "sha256": "0f2b7cecc70c1a27d35c06c98804fcdb9f326630de5d035afc447122186010b7", "url": "https://github.com/aide/aide/releases/download/v0.16.1/aide-0.16.1.tar.gz", @@ -39,7 +43,9 @@ Object { "currentValue": "v0.8.2", "datasource": "github", "depName": "bazelbuild/bazel-watcher", - "ownerName": "bazelbuild", + "managerData": Object { + "ownerName": "bazelbuild", + }, "repoName": "bazel-watcher", "sha256": "26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4", "url": "https://github.com/bazelbuild/bazel-watcher/archive/v0.8.2.tar.gz", @@ -55,7 +61,9 @@ Object { "currentValue": null, "datasource": null, "depName": "Acmetool", - "ownerName": null, + "managerData": Object { + "ownerName": null, + }, "repoName": null, "sha256": "6f2cf5cfb987a2df2f791c162209039804fd8fd12692da69f52153ec9668e9ca", "skipReason": "unsupported-url", @@ -72,7 +80,9 @@ Object { "currentValue": null, "datasource": null, "depName": "Ibazel", - "ownerName": null, + "managerData": Object { + "ownerName": null, + }, "repoName": null, "sha256": "26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4", "skipReason": "unsupported-url", @@ -89,7 +99,9 @@ Object { "currentValue": null, "datasource": null, "depName": "Ibazel", - "ownerName": null, + "managerData": Object { + "ownerName": null, + }, "repoName": null, "sha256": "26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4", "skipReason": "unsupported-url", @@ -106,7 +118,9 @@ Object { "currentValue": null, "datasource": null, "depName": "Ibazel", - "ownerName": null, + "managerData": Object { + "ownerName": null, + }, "repoName": null, "sha256": "26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4", "skipReason": "unsupported-url", @@ -123,7 +137,9 @@ Object { "currentValue": null, "datasource": null, "depName": "Ibazel", - "ownerName": null, + "managerData": Object { + "ownerName": null, + }, "repoName": null, "sha256": "26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4", "skipReason": "unsupported-url", @@ -140,7 +156,9 @@ Object { "currentValue": "v0.8.2", "datasource": "github", "depName": "bazelbuild/bazel-watcher", - "ownerName": "bazelbuild", + "managerData": Object { + "ownerName": "bazelbuild", + }, "repoName": "bazel-watcher", "sha256": "26f5125218fad2741d3caf937b0229", "skipReason": "invalid-sha256", @@ -157,7 +175,9 @@ Object { "currentValue": "v0.8.2", "datasource": "github", "depName": "bazelbuild/bazel-watcher", - "ownerName": "bazelbuild", + "managerData": Object { + "ownerName": "bazelbuild", + }, "repoName": "bazel-watcher", "sha256": null, "skipReason": "invalid-sha256", @@ -174,7 +194,9 @@ Object { "currentValue": null, "datasource": null, "depName": "Ibazel", - "ownerName": null, + "managerData": Object { + "ownerName": null, + }, "repoName": null, "sha256": "26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4", "skipReason": "unsupported-url", @@ -191,7 +213,9 @@ Object { "currentValue": null, "datasource": null, "depName": "Aalib", - "ownerName": null, + "managerData": Object { + "ownerName": null, + }, "repoName": null, "sha256": "fbddda9230cf6ee2a4f5706b4b11e2190ae45f5eda1f0409dc4f99b35e0a70ee", "skipReason": "unsupported-url", @@ -208,7 +232,9 @@ Object { "currentValue": null, "datasource": null, "depName": "Aap", - "ownerName": null, + "managerData": Object { + "ownerName": null, + }, "repoName": null, "sha256": "3f53b2fc277756042449416150acc477f29de93692944f8a77e8cef285a1efd8", "skipReason": "unsupported-url", diff --git a/test/manager/homebrew/update.spec.js b/test/manager/homebrew/update.spec.js index 43655ea298792886d0a82adfbdfb53508cd0d6e1..816c28cb580589dd2be039dad8dbd166d9d318a2 100644 --- a/test/manager/homebrew/update.spec.js +++ b/test/manager/homebrew/update.spec.js @@ -18,7 +18,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.16.1', depName: 'Aide', - ownerName: 'aide', + managerData: { ownerName: 'aide' }, repoName: 'aide', sha256: '0f2b7cecc70c1a27d35c06c98804fcdb9f326630de5d035afc447122186010b7', @@ -36,7 +36,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.8.2', depName: 'Ibazel', - ownerName: 'bazelbuild', + managerData: { ownerName: 'bazelbuild' }, repoName: 'bazel-watcher', sha256: '26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4', @@ -53,7 +53,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.8.2', depName: 'Ibazel', - ownerName: 'bazelbuild', + managerData: { ownerName: 'bazelbuild' }, repoName: 'bazel-watcher', sha256: '26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4', @@ -72,7 +72,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.8.2', depName: 'Ibazel', - ownerName: 'bazelbuild', + managerData: { ownerName: 'bazelbuild' }, repoName: 'bazel-watcher', sha256: '26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4', @@ -91,7 +91,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.8.2', depName: 'Ibazel', - ownerName: 'bazelbuild', + managerData: { ownerName: 'bazelbuild' }, repoName: 'invalid/repo/name', sha256: '26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4', @@ -114,7 +114,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.8.2', depName: 'Ibazel', - ownerName: 'bazelbuild', + managerData: { ownerName: 'bazelbuild' }, repoName: 'wrong-version/archive/v10.2.3.tar.gz', sha256: '26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4', @@ -144,7 +144,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.8.2', depName: 'Ibazel', - ownerName: 'bazelbuild', + managerData: { ownerName: 'bazelbuild' }, repoName: 'bazel-watcher', sha256: '26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4', @@ -169,7 +169,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.8.2', depName: 'Ibazel', - ownerName: 'bazelbuild', + managerData: { ownerName: 'bazelbuild' }, repoName: 'bazel-watcher', sha256: '26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4', @@ -195,7 +195,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.8.2', depName: 'Ibazel', - ownerName: 'bazelbuild', + managerData: { ownerName: 'bazelbuild' }, repoName: 'bazel-watcher', sha256: '26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4', @@ -220,7 +220,7 @@ describe('manager/homebrew/update', () => { const upgrade = { currentValue: 'v0.8.2', depName: 'Ibazel', - ownerName: 'bazelbuild', + managerData: { ownerName: 'bazelbuild' }, repoName: 'bazel-watcher', sha256: '26f5125218fad2741d3caf937b02296d803900e5f153f5b1f733f15391b9f9b4',