From 586019514818e15f37b932266b567d6781f996ae Mon Sep 17 00:00:00 2001
From: Konstantin Mochalov <incredible.angst@gmail.com>
Date: Mon, 13 Jul 2015 12:35:37 +0300
Subject: [PATCH 1/6] Added Liveinternet (liveinternet.ru) analytics service

---
 src/apps.json              |  12 ++++++++++++
 src/icons/Liveinternet.png | Bin 0 -> 837 bytes
 2 files changed, 12 insertions(+)
 create mode 100644 src/icons/Liveinternet.png

diff --git a/src/apps.json b/src/apps.json
index 1f228333f..cca728676 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -3285,6 +3285,18 @@
 			"script": "livefyre_init\\.js",
 			"website": "livefyre.com"
 		},
+		"Liveinternet": {
+			"cats": [
+				10
+			],
+			"html": [
+				"//counter.yadro.ru/hit(?:;\\S+)?\\?(?:t\\d+\\.\\d+;)?r",
+				"<!--LiveInternet counter-->",
+				"<!--/LiveInternet-->",
+				"<a href='http://www.liveinternet.ru/click'"
+			],
+			"website": "liveinternet.ru/rating/"
+		},
 		"Lo-dash": {
 			"cats": [
 				12
diff --git a/src/icons/Liveinternet.png b/src/icons/Liveinternet.png
new file mode 100644
index 0000000000000000000000000000000000000000..816d41d3cdab5ffccb22719b7550e54bc8258652
GIT binary patch
literal 837
zcmY*Xe=L-77=PZ^DNees(doui8zr6IJEYyru)CbeC9Z~z$gibDoJ*<gT#}{;yJ=&V
zT0&UdshkvB{n6HO$t_ZTw#b!gD|M%JJ$IKs`tJF@&*%AkKcDA${&+9Ph$EcoY&rlq
zM~Vcom^WCigB^Z%a2RozXjx&=VE|oKPQO#_u_g*)Bf_C`$o(T0Thc_a(Ew+?0pz6s
zCZyyG0EHC5VhRBNIshxLL31z|eStCiB|;SR(CKPA{Tsj|l2nuA62RxxFaxLn)Bpx6
zgJmDeRxv7VffLZOXbl8Negf#XDnX_KS+}hrw(7!pH4{+W3#Zk#o}_XXImDKe-vOsO
zp!zL=WRZH<+NTWp$}y1jfJ{x)PJ+zR0}?J0${8rvBE-2boERj!YNsH*9)iSBF^aEb
z)wo4z-M^X1CTrf2Rb${6YN3*^64%C|SOdX{Sh=Uy(TW~I$urB7?c_8AhV9^1xvl>&
zfZ1$r*PO5{oGFbJ$AM0}(Wt*ykukhxc*NU4TVA<9YO@}1(zvag_d91Y>a-;{UXH9c
z>e*i!2!-9NQPCVTaKW|E^h>qfk@Y^>VNiN!$cLr)dXwR-|EX(pcjZ1XZeuS0k$dn2
z(^DL$*E1oWE{De`22Lc7MnwoRca4sFVd0o3N+`fAvfh2qkB1<*5-A9ixNWu{?DwM)
zARjb#m$#RP2kc~4JKSdJ4Ep4Fp-Y{iQ!qDcmT74qfs_^)5Kj>UC(qNC6Vsj;lk#GI
z@GA|w6}Ph4lOH@w=Mp_Cd*1BzX}JG1!D-%=r5%<>9q2W=-*qfAX$uc2vsKFaw(Q2W
ztrKl6-?RGq=xxnSmzI1(E9xT5Y|Ylj5lWVXdwEHP@zV5EX$C(nKLZo+C~hE!3gU46
zC0rh#$Kz9bd?|lEMcFe}rvEeK<fb3XJYzBNI8*?~pOT=C%jE}feW?I6G#%mLF9{GS
L6bm}TQxtyz47V5=

literal 0
HcmV?d00001


From 1f30c89824f77ddc6bf8bf2893f885a598f33e85 Mon Sep 17 00:00:00 2001
From: Konstantin Mochalov <incredible.angst@gmail.com>
Date: Mon, 13 Jul 2015 14:14:29 +0300
Subject: [PATCH 2/6] Hardcoded vk.com script path that invokes liveinternet
 counter

---
 src/apps.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/apps.json b/src/apps.json
index cca728676..b0dce4063 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -3295,6 +3295,7 @@
 				"<!--/LiveInternet-->",
 				"<a href='http://www.liveinternet.ru/click'"
 			],
+			"script": "/js/al/common.js\\?[0-9_]+",
 			"website": "liveinternet.ru/rating/"
 		},
 		"Lo-dash": {

From b2e6b4f066991e2da23a81bb0376edf173f757cb Mon Sep 17 00:00:00 2001
From: Konstantin Mochalov <incredible.angst@gmail.com>
Date: Tue, 14 Jul 2015 13:13:57 +0300
Subject: [PATCH 3/6] Double quotes because .outerHTML always serializes with
 double quotes

---
 src/apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps.json b/src/apps.json
index b0dce4063..81f003c23 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -3293,7 +3293,7 @@
 				"//counter.yadro.ru/hit(?:;\\S+)?\\?(?:t\\d+\\.\\d+;)?r",
 				"<!--LiveInternet counter-->",
 				"<!--/LiveInternet-->",
-				"<a href='http://www.liveinternet.ru/click'"
+				"<a href=\"http://www.liveinternet.ru/click\""
 			],
 			"script": "/js/al/common.js\\?[0-9_]+",
 			"website": "liveinternet.ru/rating/"

From ee152d56517c13c22e5c4d5ea332b6e338de8578 Mon Sep 17 00:00:00 2001
From: Konstantin Mochalov <incredible.angst@gmail.com>
Date: Tue, 14 Jul 2015 13:46:31 +0300
Subject: [PATCH 4/6] Better regex for liveinternet <script> (which can vary)

---
 src/apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps.json b/src/apps.json
index 81f003c23..032a04c35 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -3290,7 +3290,7 @@
 				10
 			],
 			"html": [
-				"//counter.yadro.ru/hit(?:;\\S+)?\\?(?:t\\d+\\.\\d+;)?r",
+				"<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\""

From cba7d9fa8e8da5dc63b315682d7f9fe72815804d Mon Sep 17 00:00:00 2001
From: Johann du Toit <exxonno@gmail.com>
Date: Sun, 19 Jul 2015 01:41:46 +0200
Subject: [PATCH 5/6] Updated to use the correct environment variable

---
 src/drivers/npm/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drivers/npm/index.js b/src/drivers/npm/index.js
index 153273a70..b975bb63f 100644
--- a/src/drivers/npm/index.js
+++ b/src/drivers/npm/index.js
@@ -94,7 +94,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;
 

From dabee8eaec510b894001c53002a68c41101d5aa1 Mon Sep 17 00:00:00 2001
From: Johann du Toit <exxonno@gmail.com>
Date: Sun, 19 Jul 2015 02:48:57 +0200
Subject: [PATCH 6/6] Added 2 lines to make a "wappalyzer_npm" build folder
 that can be sent up to NPM.

---
 bin/wappalyzer-build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/wappalyzer-build b/bin/wappalyzer-build
index 331ff06d4..78aa462c7 100755
--- a/bin/wappalyzer-build
+++ b/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..."