Merge pull request #42 from nodenv/npm

Metadata cleanup for npm release

Author: jasonkarns

.gitignore

@@ -1,3 +1,2 @@
-node_modules/
-test/nodenv/
-yarn-error.log
+/node_modules
+/nodenv-nodenv-package-json-engine-*.tgz

package-lock.json

@@ -1,7 +1,6 @@
 {
-  "name": "nodenv-package-json-engine",
+  "name": "@nodenv/nodenv-package-json-engine",
   "version": "3.0.2",
-  "private": true,
   "description": "Activate a nodenv node version from package.json engines",
   "homepage": "https://github.com/nodenv/nodenv-package-json-engine#readme",
   "license": "MIT",
@@ -21,16 +20,24 @@
     "testnodenv": "test/nodenv",
     "test": "test"
   },
+  "files": [
+    "bin",
+    "etc",
+    "libexec"
+  ],
   "scripts": {
     "lint": "git ls-files bin etc libexec test/*.bash | xargs shellcheck",
-    "pretest": "[ -d $npm_package_directories_testnodenv ] || git clone --quiet --depth 1 https://github.com/nodenv/nodenv $npm_package_directories_testnodenv",
-    "test": "PATH=$PWD/$npm_package_directories_testnodenv/bin:$PATH bats ${CI:+--tap} test",
+    "test": "bats ${CI:+--tap} test",
     "posttest": "npm run lint",
-    "publish:brew": "brew-publish $npm_package_name v$npm_package_version",
-    "postversion": "git push --follow-tags && npm run publish:brew"
+    "postversion": "npm publish",
+    "prepublishOnly": "npm run publish:github && npm run publish:brew",
+    "publish:brew": "brew-publish",
+    "publish:github": "git push --follow-tags"
   },
   "devDependencies": {
-    "bats": "^0.4.2",
+    "@nodenv/nodenv": "^1.1.2",
+    "bats": "^1.1.0",
+    "bats-assert": "^1.1.1",
     "brew-publish": "^2.3.1"
   },
   "dependencies": {

package.json

@@ -1,5 +1,4 @@
 #!/usr/bin/env bats
-# Tests of basic usage and functionality
 
 load test_helper
 
@@ -46,7 +45,7 @@ load test_helper
   assert [ "$status" -eq 1 ]
 }
 
-@test 'Prefers `nodenv local` over package.json' {
+@test 'Prefers nodenv-local over package.json' {
   create_version 4.2.1
   create_version 5.0.0
   cd_into_package 4.2.1
@@ -56,7 +55,7 @@ load test_helper
   assert_success "5.0.0 (set by $PWD/.node-version)"
 }
 
-@test 'Prefers `nodenv shell` over package.json' {
+@test 'Prefers nodenv-shell over package.json' {
   create_version 5.0.0
   cd_into_package 4.2.1
   eval "$(nodenv sh-shell 5.0.0)"
@@ -65,7 +64,7 @@ load test_helper
   assert_success "5.0.0 (set by NODENV_VERSION environment variable)"
 }
 
-@test 'Prefers package.json over `nodenv global`' {
+@test 'Prefers package.json over nodenv-global' {
   create_version 4.2.1
   create_version 5.0.0
   cd_into_package 4.2.1
@@ -75,7 +74,7 @@ load test_helper
   assert_success '4.2.1'
 }
 
-@test 'Is not confused by `nodenv shell` shadowing `nodenv global`' {
+@test 'Is not confused by nodenv-shell shadowing nodenv-global' {
   create_version 4.2.1
   create_version 5.0.0
   cd_into_package 4.2.1
@@ -87,6 +86,7 @@ load test_helper
 }
 
 @test 'Does not match babel preset env settings' {
+  create_version 4.2.1
   cd_into_babel_env_package
   run nodenv version-name
   assert_success 'system'

test/nodenv-package-json-engine.bats

@@ -1,52 +1,27 @@
 # shellcheck shell=bash
 
-EXAMPLE_PACKAGE_DIR="$BATS_TMPDIR/example_package"
-TEST_BASENAME="$(basename "$BATS_TEST_DIRNAME")"
-# TODO: Should this just be $(dirname ...) ?
-PLUGIN_ROOT="${BATS_TEST_DIRNAME%${TEST_BASENAME}}"
+load ../node_modules/bats-assert/all
 
 setup() {
-  export NODENV_ROOT="$BATS_TMPDIR/nodenv_root"
-  unset NODENV_VERSION # don't leak version from test runner
-  mkdir -p "$NODENV_ROOT/plugins"
-  ln -s "$PLUGIN_ROOT" "$NODENV_ROOT/plugins/package-json-engine"
-}
+  # common nodenv setup
+  unset NODENV_VERSION
 
-teardown() {
-  rm -r "$EXAMPLE_PACKAGE_DIR"
-  rm -r "$NODENV_ROOT"
-}
+  local node_modules_bin=$BATS_TEST_DIRNAME/../node_modules/.bin
+  local plugin_bin=$BATS_TEST_DIRNAME/../bin
 
-assert() {
-  if ! "$@"; then
-    flunk "failed: $*"
-  fi
-}
+  export PATH="$plugin_bin:$node_modules_bin:/usr/bin:/bin:/usr/sbin:/sbin"
 
-assert_equal() {
-  if [ "$1" != "$2" ]; then
-    { echo "expected: $1"
-      echo "actual:   $2"
-    } | flunk
-  fi
-}
+  export NODENV_ROOT="$BATS_TMPDIR/nodenv_root"
+  export NODENV_HOOK_PATH="$BATS_TEST_DIRNAME/../etc/nodenv.d"
+
+  # unique
 
-assert_output() {
-  local expected
-  if [ $# -eq 0 ]; then expected="$(cat -)"
-  else expected="$1"
-  fi
-  # shellcheck disable=SC2154
-  assert_equal "$expected" "$output"
+  EXAMPLE_PACKAGE_DIR="$BATS_TMPDIR/example_package"
 }
 
-assert_success() {
-  # shellcheck disable=SC2154
-  if [ "$status" -ne 0 ]; then
-    flunk "command failed with exit status $status"
-  elif [ "$#" -gt 0 ]; then
-    assert_output "$1"
-  fi
+teardown() {
+  rm -r "$EXAMPLE_PACKAGE_DIR"
+  rm -r "$NODENV_ROOT"
 }
 
 # cd_into_package nodeVersion [extraArgs]
@@ -85,11 +60,3 @@ create_version() {
   mkdir -p "$d"
   ln -s /bin/echo "$d/node"
 }
-
-flunk() {
-  { if [ "$#" -eq 0 ]; then cat -
-    else echo "$@"
-    fi
-  } >&2
-  return 1
-}