Changed output format to be more readable

README.md

@@ -40,11 +40,18 @@ optional arguments:
 ```
 # python3 wig.py www.example.com
                                                                             
-CMS                  Drupal CMS: [7.25, 7.24, 7.26, 7.23, 7.22]
-Operating System     Microsoft Windows Server: [2008 R2]
-Server Info          Microsoft-IIS: [7.5, 6.0]
+___ CMS ______________________________________________________
+Sitecore: 7.0. (rev. 130424)
+
+___ Operating System _________________________________________
+Microsoft Windows Server: 2008 R2
+
+___ Server Info ______________________________________________
+ASP.NET: 4.0.30319
+Microsoft-IIS: 7.5
+
 ______________________________________________________________
-Time: 18.0 sec | Plugins: 65 | Urls: 324 | Fingerprints: 14178
+Time: 36.4 sec | Plugins: 66 | Urls: 386 | Fingerprints: 16805
 ```
 
 **Requirements:**

classes/results.py

@@ -35,9 +35,9 @@ def __str__(self):
 
 		for category in o_cat:
 
-			out += "{0:<20}".format(category, )
-			#start = "___"+category
-			#out += start + "_" * (self.width-len(start)) + "\n"
+			#out += "{0:<20}".format(category, )
+			start = "___ " + self.color.format(category, 'red', False) + " "
+			out +=	start + "_" * (self.width - (len(category) + 5)) + "\n"
 			plugin_list = []
 
 			o_plug = sorted([p for p in self.results[category]])
@@ -61,11 +61,11 @@ def __str__(self):
 					else:
 						break
 
-				plug_str = " %s: " % (plugin, )
-				ver_str =  self.color.format("[" + ", ".join(relevant) + "]", 'red', False)
+				plug_str = "%s: " % (plugin, )
+				ver_str =  ", ".join(relevant)
 
 				plugin_list.append(plug_str + ver_str)
 
-			out += ", ".join(plugin_list) + "\n"
+			out += "\n".join(plugin_list) + "\n\n"
 
 		return out[:-1]