Merge branch 'jxcore'

* jxcore:
  Official manifest URL!
  reject unsupported platforms a bit fuzzier
  Scrape npmjx per jxcore release
  Update usage
  Remove spaces from platform name
  Update jxcore scraper
  drop --no-jxcore
  Run jxscore scraper from libexec/scrape
  Add jxcore scraper

Author: jasonkarns

bin/nodenv-update-version-defs

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 #
-# Summary: Create build definitions from nodejs.org and iojs.org
+# Summary: Create build definitions from nodejs.org, iojs.org and jxcore.com
 #
-# Usage: nodenv update-version-defs [-f] [-d <dir>] [-n] [--nodejs] [--iojs]
+# Usage: nodenv update-version-defs [-f] [-d <dir>] [-n] [--nodejs] [--iojs] [--jxcore]
 #
 # Scrapes nodejs.org and iojs.org to create build definitions for node
 # versions not yet available to node-build
@@ -14,9 +14,11 @@
 #                      without doing so
 #
 #   --nodejs           Scrape nodejs.org for node definitions;
-#                      If none of --nodejs,--iojs are supplied, defaults to all
+#                      If none of --nodejs,--iojs, --jxcore are supplied, defaults to all
 #   --iojs             Scrape iojs.org for node definitions;
-#                      If none of --nodejs,--iojs are supplied, defaults to all
+#                      If none of --nodejs,--iojs, --jxcore are supplied, defaults to all
+#   --jxcore           Scrape jxcore.com for node definitions;
+#                      If none of --nodejs,--iojs, --jxcore are supplied, defaults to all
 #
 
 set -e
@@ -66,6 +68,7 @@ while [ $# -gt 0 ]; do
       echo --help
       echo --iojs
       echo --nodejs
+      echo --jxcore
       exit ;;
     -d | --destination )
       shift
@@ -75,7 +78,7 @@ while [ $# -gt 0 ]; do
       exec nodenv-help update-version-defs ;;
     -f | --force | \
     -n | --dry-run | \
-    --iojs | --nodejs )
+    --iojs | --nodejs | --jxcore )
       SCRAPE_OPTS[${#SCRAPE_OPTS[*]}]="$1" ;;
     * )
       nodenv-help --usage update-version-defs >&2

lib/scraper-jxcore.js

@@ -0,0 +1,122 @@
+var format = require('util').format
+var Build = require('./build')().Build
+var Binary = require('./build')().Binary
+
+module.exports = {
+  name: 'jxcore',
+  distributionListing: 'https://jxcore.s3.amazonaws.com/releases.json',
+  distToBuild: function (release) {
+    release.jxcore = release.jxcore.replace(/^Beta-/, '')
+    var binaries = release.dist
+    .map(normalizePlatform)
+    .filter(supportedPlatforms)
+    .reduce(expandDebianArm, [])
+
+    var v8Build = Object.assign(Object.create(V8Build), {
+      version: release.jxcore,
+      url: release.source.tar.url,
+      shasum: release.source.tar.sha256,
+      binaries: binaries,
+      npm: release.npmjx.url + '#' + release.npmjx.sha256
+    })
+    var spiderMonkeyBuild = Object.assign(Object.create(SMBuild), {
+      version: release.jxcore,
+      url: release.source.tar.url,
+      shasum: release.source.tar.sha256,
+      binaries: binaries,
+      npm: release.npmjx.url + '#' + release.npmjx.sha256
+    })
+
+    return [ v8Build, spiderMonkeyBuild ]
+  }
+}
+
+// private
+
+var JxcoreBuild = Object.create(Build, {
+  binaries: {
+    get: function () {
+      return this._binaries
+    },
+    set: function (binaries) {
+      this._binaries = binaries.filter(engine(this.engine)).map(createBinary)
+    }
+  },
+  install: {
+    get: function () {
+      return format('install_package %s "%s"\n', this.packageName, this.downloadUri)
+    }
+  },
+  name: {
+    get: function () {
+      return 'jxcore+' + this.engine
+    }
+  },
+  packageName: {
+    get: function () {
+      return format('jxcore-%s', this.version)
+    }
+  },
+  preamble: {
+    value: 'after_install_package() {\n  fix_jxcore_directory_structure\n}\n\n'
+  },
+  postamble: {
+    get: function () {
+      return format('install_package npm "%s" jxcore_npm\n', this.npm)
+    }
+  }
+})
+
+var V8Build = Object.create(JxcoreBuild, {
+  engine: { value: 'v8' }
+})
+
+var SMBuild = Object.create(JxcoreBuild, {
+  engine: { value: 'sm' },
+  install: {
+    get: function () {
+      return format('install_package %s "%s" jxcore_spidermonkey standard\n', this.packageName, this.downloadUri)
+    }
+  }
+})
+
+function normalizePlatform (dist) {
+  dist.platform = dist.platform.toLowerCase().replace(/\s/g, '')
+  .replace(/osxintel/, 'darwin')
+  .replace(/rh\/centos\/fedora/, 'redhat')
+  .replace(/ubuntu\/mint/, 'ubuntu')
+
+  dist.arch = (dist.arch || '').toLowerCase()
+  .replace(/ia32/, 'x86')
+
+  return dist
+}
+
+function supportedPlatforms (dist) {
+  return !dist.platform.match(/(?:windows|android|ios)/)
+}
+
+function expandDebianArm (binaries, binary) {
+  if (binary.platform === 'debian' && binary.arch === 'arm') {
+    binaries.push(
+      Object.assign(Object.create(binary), {arch: 'arm64'}),
+      Object.assign(Object.create(binary), {arch: 'armv7l'})
+    )
+  } else {
+    binaries.push(binary)
+  }
+  return binaries
+}
+
+function engine (engine) {
+  return function (dist) { return dist.engine === engine }
+}
+
+function createBinary (dist) {
+  return Object.assign(Object.create(Binary), {
+    arch: dist.arch,
+    os: dist.platform,
+    shasum: dist.sha256,
+    url: dist.url
+  })
+}

libexec/scrape

@@ -4,6 +4,7 @@ var scrape = require('../lib/scraper')
 
 var nodejs = require('../lib/scraper-nodejs')
 var iojs = require('../lib/scraper-iojs')
+var jxcore = require('../lib/scraper-jxcore')
 
 var nodes = {}
 var options = {
@@ -22,17 +23,20 @@ process.argv.forEach(function (arg) {
     case '--dry-run':
       options.dryRun = true
       break
+    case '--iojs':
+      nodes.iojs = iojs
+      break
     case '--nodejs':
       nodes.nodejs = nodejs
       break
-    case '--iojs':
-      nodes.iojs = iojs
+    case '--jxcore':
+      nodes.jxcore = jxcore
       break
   }
 })
 
 if (!Object.keys(nodes).length) {
-  nodes = { nodejs: nodejs, iojs: iojs }
+  nodes = { nodejs: nodejs, iojs: iojs, jxcore: jxcore }
 }
 
 for (var node in nodes) {