Merge pull request #4 from sndrs/env

Update env

Author: sndrs

.gitignore

@@ -2,3 +2,4 @@
 
 node_modules
 dist
+*.log

README.md

@@ -1,19 +1,21 @@
-# ok 
+# ok
 
-> 🙇‍♂️ Obliging task runner 
+> 🙇‍♂️ An obliging task runner
 
-Automatically run a project’s `package.json` scripts in the right environment with no additional installation or config.
+Run `npm-scripts` in the correct environment without further installation or config.
 
 <img src="demo.gif" width="444">
 
-## Install 
+## Install
 
 <a href="https://npmjs.org/package/@sndrs/ok" title="View this project on NPM"><img src="https://img.shields.io/npm/v/@sndrs/ok.svg" alt="NPM version" /></a>
 
 ```bash
 $ yarn global add @sndrs/ok
 ```
+
 or
+
 ```bash
 $ npm install -g @sndrs/ok
 ```
@@ -25,7 +27,7 @@ $ npm install -g @sndrs/ok
     -   [x] `engines`
 -   [x] use project package manager (`yarn` or `npm`)
     -   [x] use the checked in yarn version if present
-    -   [ ] use `engines` npm if present
+    -   [x] use `engines` npm if present
 -   [x] always run tasks with up-to-date dependencies
 
 ### No dependencies

ok.code-workspace

@@ -0,0 +1,17 @@
+{
+    "folders": [
+		{
+			"name": "ok",
+			"path": "."
+		},
+		{
+			"name": "ok-test-yarn",
+			"path": "/Users/alexsanders/Dev/ok-test-yarn"
+		},
+		{
+			"name": "ok-test-npm",
+			"path": "/Users/alexsanders/Dev/ok-test-npm"
+		}
+	],
+    "settings": {}
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@sndrs/ok",
 	"version": "0.1.2",
-	"description": "Cli app that runs `package.json` scripts in the specified environment without configuring yours.",
+	"description": "Run `npm-scripts` in the correct environment without further installation or config.",
 	"homepage": "https://github.com/sndrs/ok#readme",
 	"bugs": {
 		"url": "https://github.com/sndrs/ok/issues"

src/env.ts

@@ -0,0 +1,69 @@
+import execa from 'execa'
+import fs from 'fs'
+import path from 'path'
+import satisfies from 'semver/functions/satisfies'
+import validRange from 'semver/ranges/valid'
+import { error, info } from './log'
+
+const cwd = process.cwd()
+const engines = require(path.resolve(cwd, 'package.json'))?.engines
+
+let packageManager = fs.existsSync(path.resolve(cwd, 'yarn.lock'))
+	? 'yarn'
+	: fs.existsSync(path.resolve(cwd, 'package-lock.json'))
+	? 'npm'
+	: engines?.yarn
+	? 'yarn'
+	: engines?.npm
+	? 'npm'
+	: 'yarn'
+
+export const getEnv = async () => {
+	if (engines && engines[packageManager]) {
+		const { stdout: packageManagerVersion } = await execa(
+			packageManager,
+			['-v'],
+			{
+				preferLocal: true,
+			},
+		)
+		console.log(packageManagerVersion)
+
+		if (!satisfies(packageManagerVersion, engines[packageManager])) {
+			if (packageManager === 'npm') {
+				info('Installing npm')
+				await execa('npm', [
+					'install',
+					'--no-save',
+					'--silent',
+					`npm@${engines[packageManager]}`,
+				])
+			} else {
+				error(`Invalid yarn version:`)
+				info(
+					`Found ${packageManagerVersion} but package.json specifies ${engines[packageManager]} in \`engines.${packageManager}\`.`,
+				)
+				process.exit(1)
+			}
+		}
+	}
+
+	const nvmrcPath = path.resolve(cwd, '.nvmrc')
+
+	const nvmrcNode = fs.existsSync(nvmrcPath)
+		? validRange(fs.readFileSync(nvmrcPath, 'utf8').trim())
+		: undefined
+
+	if (nvmrcNode === null) {
+		error('Your .nvmrc version is not supported.')
+		info('Please use a valid semver version range:')
+		info('https://github.com/npm/node-semver#versions')
+		process.exit(1)
+	}
+
+	const nodeRange = [engines?.node, nvmrcNode, '*'].filter(Boolean).join(' ')
+
+	const useCurrentNode = satisfies(process.version, nodeRange)
+
+	return { nodeRange, useCurrentNode, packageManager }
+}

src/get-node-range.ts

@@ -1,11 +1,8 @@
 import chalk from 'chalk'
 import execa from 'execa'
-import fs from 'fs'
 import nvexeca from 'nvexeca'
-import path from 'path'
 import coerce from 'semver/functions/coerce'
-import satisfies from 'semver/functions/satisfies'
-import { getNodeRange } from './get-node-range'
+import { getEnv } from './env'
 import { info } from './log'
 
 const tick = chalk.green('✓')
@@ -14,12 +11,7 @@ const workingEnv = (node: string, pm: string) =>
 	`${tick} Using ${pm} and Node v${coerce(node)}`
 
 export const run = async (tasks: string[] = []) => {
-	const nodeRange = getNodeRange()
-
-	const useCurrentNode = satisfies(process.version, nodeRange)
-
-	const yarnLockPath = path.resolve(process.cwd(), 'yarn.lock')
-	const packageManager = fs.existsSync(yarnLockPath) ? 'yarn' : 'npm'
+	const { nodeRange, packageManager, useCurrentNode } = await getEnv()
 
 	const _execa = (args: string[]) =>
 		useCurrentNode