Skip to content

Commit 0987a83

Browse files
authored
Merge pull request #11 from nodenv/nodejs-rcs
Scrape nodejs Release Candidates
2 parents d572829 + f928b99 commit 0987a83

File tree

5 files changed

+28
-13
lines changed

5 files changed

+28
-13
lines changed

bin/nodenv-update-version-defs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ while [ $# -gt 0 ]; do
6969
NODE_BUILD_DEFINITIONS="$(abs_dirname "${1%/}/"):${NODE_BUILD_DEFINITIONS}" ;;
7070
-f | --force | \
7171
-n | --dry-run | \
72-
--nodejs )
72+
--nodejs | \
73+
--nodejs-rcs )
7374
SCRAPE_OPTS[${#SCRAPE_OPTS[*]}]="$1" ;;
7475
* )
7576
nodenv-help --usage update-version-defs >&2

lib/build-node.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module.exports = function (name, baseUri) {
4949
// private
5050

5151
function sourcePackage (shasumData) {
52-
var result = shasumData.match(/^(\w{64}) {2}(?:\.\/)?(node-v\d+\.\d+\.\d+).tar.gz$/im)
52+
var result = shasumData.match(/^(\w{64}) {2}(?:\.\/)?(node-v\d+\.\d+\.\d+(?:-rc\.\d+)?).tar.gz$/im)
5353

5454
if (result) {
5555
return {
@@ -63,7 +63,7 @@ module.exports = function (name, baseUri) {
6363

6464
function binaryPackages (shasumData) {
6565
var matches = []
66-
var regex = new RegExp(/^(\w{64}) {2}(?:\.\/)?((?:node-(v\d+\.\d+\.\d+))-(.+)-(.+)).tar.gz$/gim)
66+
var regex = new RegExp(/^(\w{64}) {2}(?:\.\/)?((?:node-(v\d+\.\d+\.\d+(?:-rc\.\d+)?))-(.+)-(.+)).tar.gz$/gim)
6767

6868
var result
6969
while (result = regex.exec(shasumData)) {

lib/scraper-nodejs-rcs.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
var Build = require('./build-node')('node', 'https://nodejs.org/download/rc/').Build
2+
3+
module.exports = {
4+
name: 'nodejs',
5+
distributionListing: 'https://nodejs.org/download/rc/index.json',
6+
distToBuild: function (release) {
7+
return Object.create(Build, {
8+
version: { value: release.version }
9+
})
10+
}
11+
}

libexec/scrape

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
var scrape = require('../lib/scraper')
44

55
var nodejs = require('../lib/scraper-nodejs')
6+
var nodejsRcs = require('../lib/scraper-nodejs-rcs')
67

7-
var nodes = {}
8+
var nodesToScrape = []
89
var options = {
910
dryRun: false,
1011
overwrite: false,
@@ -22,17 +23,18 @@ process.argv.forEach(function (arg) {
2223
options.dryRun = true
2324
break
2425
case '--nodejs':
25-
nodes.nodejs = nodejs
26+
nodesToScrape.push(nodejs)
27+
break
28+
case '--nodejs-rcs':
29+
nodesToScrape.push(nodejsRcs)
2630
break
2731
}
2832
})
2933

30-
if (!Object.keys(nodes).length) {
31-
nodes = { nodejs: nodejs }
34+
if (!nodesToScrape.length) {
35+
nodesToScrape = [ nodejs, nodejsRcs ]
3236
}
3337

34-
for (var node in nodes) {
35-
if (nodes.hasOwnProperty(node)) {
36-
scrape(nodes[node], options)
37-
}
38-
}
38+
nodesToScrape.forEach(function(node){
39+
scrape(node, options)
40+
})

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
},
2424
"scripts": {
2525
"publish:brew": "brew-publish $npm_package_name v$npm_package_version",
26-
"postversion": "git push --follow-tags && npm run publish:brew"
26+
"postversion": "git push --follow-tags && npm run publish:brew",
27+
"update:dryrun": "$npm_package_directories_bin/nodenv-update-version-defs --dry-run"
2728
},
2829
"devDependencies": {
2930
"brew-publish": "^2.0.0"

0 commit comments

Comments
 (0)