Merge remote-tracking branch 'upstream/master'

bin/wappalyzer-build

@@ -17,6 +17,10 @@ jsonlint -ist $'\t' $WAPPALYZER_ROOT/src/apps.json
 
 wappalyzer links
 
+# Npm Module
+mkdir -p $WAPPALYZER_ROOT/build/wappalyzer_npm/
+cp -R $WAPPALYZER_ROOT/src/drivers/npm/* $WAPPALYZER_ROOT/build/wappalyzer_npm/
+
 # Mozilla Firefox
 echo "Building Firefox driver..."
 

src/apps.json

@@ -3285,6 +3285,19 @@
 			"script": "livefyre_init\\.js",
 			"website": "livefyre.com"
 		},
+		"Liveinternet": {
+			"cats": [
+				10
+			],
+			"html": [
+				"<script[^<>]*>[^]{0,128}?src\\s*=\\s*['\"]//counter\\.yadro\\.ru/hit(?:;\\S+)?\\?(?:t\\d+\\.\\d+;)?r",
+				"<!--LiveInternet counter-->",
+				"<!--/LiveInternet-->",
+				"<a href=\"http://www.liveinternet.ru/click\""
+			],
+			"script": "/js/al/common.js\\?[0-9_]+",
+			"website": "liveinternet.ru/rating/"
+		},
 		"Lo-dash": {
 			"cats": [
 				12

src/drivers/npm/index.js

@@ -107,7 +107,7 @@ function runWrappalyer(options, data, cb) {
 	var wappalyzer = null;
 
 	// change depending on the environment
-	if( process.env.NODE_ENV ) {
+	if( process.env.NODE_ENV == 'testing' ) {
 
 		wappalyzer = require('../../wappalyzer').wappalyzer;