Merge 3735042 into 86fabdc

.gitignore

@@ -1,4 +1,4 @@
 /node_modules
 /.nyc_output
 /test/cache
-npx.1
+libnpx.1

Makefile

@@ -0,0 +1,22 @@
+bin: bin/README.md bin/npx.1 bin/package.json bin/node_modules
+
+bin/README.md: README.md
+	cp $< $@
+
+bin/npx.1: libnpx.1
+	cat $< | sed s/libnpx/npx/ > $@
+
+libnpx.1: README.md
+	npm run docs
+
+bin/package.json: package.json bin/package.template.json
+	cat bin/package.template.json | json -e "this.version = '$$(cat package.json | json version)'" > $@
+	json -I -f $@ -e "this.dependencies.libnpx = '^$$(cat $@ | json version)'"
+
+bin/node_modules: bin/package.json
+	cd bin && npm i
+
+clean:
+	rm -rf bin/README.md bin/npx.1 bin/package.json bin/node_modules bin/package-lock.json libnpx.1
+
+.PHONY: clean

bin/.gitignore

@@ -0,0 +1,5 @@
+/README.md
+/npx.1
+/package.json
+/package-lock.json
+/node_modules

bin/index.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+
+const npx = require('libnpx')
+const path = require('path')
+
+const NPM_PATH = path.join(__dirname, 'node_modules', '.bin', 'npm')
+
+npx(npx.parseArgs(process.argv, NPM_PATH))

bin/package.template.json

@@ -0,0 +1,31 @@
+{
+  "name": "npx",
+  "description": "execute npm package binaries",
+  "main": "index.js",
+  "bin": "index.js",
+  "files": [
+    "./*.js",
+    "./npx.1"
+  ],
+  "keywords": [
+    "npm",
+    "npm exec",
+    "shell",
+    "scripts",
+    "npm bin",
+    "cli"
+  ],
+  "author": "Kat Marchán <kzm@sykosomatic.org>",
+  "license": "CC0-1.0",
+  "dependencies": {
+    "npm": "^5.1.0",
+    "libnpx": ""
+  },
+  "bundleDependencies": [
+    "npm",
+    "libnpx"
+  ],
+  "devDependencies": {
+    "json": "^9.0.6"
+  }
+}

index.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 'use strict'
 
 const Buffer = require('safe-buffer').Buffer
@@ -12,12 +11,9 @@ const which = promisify(require('which'))
 
 const PATH_SEP = process.platform === 'win32' ? ';' : ':'
 
-if (require.main === module) {
-  main(parseArgs())
-}
-
-module.exports = main
-function main (argv) {
+module.exports = npx
+module.exports.parseArgs = parseArgs
+function npx (argv) {
   const shell = argv['shell-auto-fallback']
   if (shell || shell === '') {
     const fallback = require('./auto-fallback.js')(