remove dependency on environment variables coming from tns

tailsu · tailsu · commit 90f31f7c8db8 · 2015-11-03T17:23:08.000+02:00
diff --git a/index.js b/index.js
@@ -1,3 +1,17 @@
+module.exports = function (__dirname) {
+	return {
+		findProjectDir: function () {
+			return findProjectDir(__dirname);
+		},
+		postinstall: function () {
+			return postinstall(__dirname);
+		},
+		preuninstall: function () {
+			return preuninstall(__dirname);
+		}
+	};
+}
+
 var fs = require('fs');
 var os = require('os');
 var path = require('path');
@@ -8,18 +22,38 @@ function generateHookName(pkg, hook) {
 	return pkg.name + '.js';
 }
 
+function findProjectDir(pkgdir) {
+	var candidateDir = pkgdir;
+
+	while (true) {
+		var oldCandidateDir = candidateDir;
+		candidateDir = path.dirname(candidateDir);
+		if (path.basename(candidateDir) === 'node_modules') {
+			continue;
+		}
+		var packageJsonFile = path.join(candidateDir, 'package.json');
+		if (fs.existsSync(packageJsonFile)) {
+			return candidateDir;
+		}
+
+		if (oldCandidateDir === candidateDir) {
+			return;
+		}
+	}
+}
+
 function forEachHook(pkgdir, callback) {
 	var pkg = require(path.join(pkgdir, 'package.json'));
 	var ns = pkg.nativescript;
 	if (!ns) {
 		throw Error('Not a NativeScript development module.');
 	}
 
-	var hooksDir = process.env['TNS_HOOKS_DIR'];
-	if (!hooksDir) {
-		console.warn('This module should be installed through the `tns install` command, not npm.');
-		process.exit(1);
+	var projectDir = findProjectDir(pkgdir);
+	if (!projectDir) {
+		return;
 	}
+	var hooksDir = path.join(projectDir, 'hooks');
 
 	if (ns.hooks) {
 		ns.hooks.forEach(function (hook) {
@@ -28,8 +62,7 @@ function forEachHook(pkgdir, callback) {
 	}
 }
 
-exports.postinstall = function postinstall(pkgdir) {
-	var hookFiles = [];
+function postinstall(pkgdir) {
 	forEachHook(pkgdir, function (hooksDir, pkg, hook) {
 		var hookDir = path.join(hooksDir, hook.type);
 		if (!fs.existsSync(hookDir)) {
@@ -41,22 +74,21 @@ exports.postinstall = function postinstall(pkgdir) {
 		var trampoline = util.format('%srequire("%s/%s");', hook.inject ? 'module.exports = ' : '', pkg.name, hook.script);
 
 		fs.writeFileSync(hookPath, trampoline + os.EOL);
-		hookFiles.push(path.relative(pkgdir, hookPath));
 	});
-
-	fs.writeFileSync(path.join(pkgdir, '_hooks.json'), JSON.stringify(hookFiles));
 }
 
-exports.preuninstall = function preuninstall(pkgdir) {
-	try {
-		var hookFiles = JSON.parse(fs.readFileSync(path.join(pkgdir, '_hooks.json')));
-		hookFiles.forEach(function (hookRelativePath) {
-			var hookFileName = path.join(pkgdir, hookRelativePath);
-			if (fs.existsSync(hookFileName)) {
-				fs.unlinkSync(hookFileName);
+function preuninstall(pkgdir) {
+	forEachHook(pkgdir, function (hooksDir, pkg, hook) {
+		var hookDir = path.join(hooksDir, hook.type);
+		var hookFileName = generateHookName(pkg, hook);
+		var hookPath = path.join(hookDir, hookFileName);
+
+		try {
+			if (fs.existsSync(hookPath)) {
+				fs.unlinkSync(hookPath);
 			}
-		});
-	} catch (err) {
-		console.warn('pkgdir: ' + err.toString());
-	}
+		} catch (err) {
+			console.warn('nativescript-hook: ' + err.toString());
+		}
+	});
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-hook",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Helper module for installing hooks into NativeScript projects",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-hook",`
`3`		`- "version": "0.1.1",`
	`3`	`+ "version": "0.2.0",`
`4`	`4`	`"description": "Helper module for installing hooks into NativeScript projects",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`