Added 'git diff' generation

flyingstar16 · flyingstar16 · commit 7936fcdc1b59 · 2014-01-18T01:32:59.000Z
Used pyhton subprocess.call() to automatically generate the git diff and
save it in /tmp/ with a random filename
diff --git a/utils/alexa-ruleset-checker.py b/utils/alexa-ruleset-checker.py
@@ -13,9 +13,12 @@
 
 import csv
 import xml.etree.ElementTree as etree
+import subprocess
+import random
 
 # Variables and constants
 sitesList = []
+tmpRulesFileName = "/tmp/rulesDiff-" + format(random.randrange(1,65535)) # Feel free to enlarge if needed
 
 # Functions
 def ruleLookup(target):
@@ -25,6 +28,9 @@ def ruleLookup(target):
     except:
         return 0
 
+# Fetch the Alexa Top 1M
+
+
 # Handles reading the Alexa Top 1M and pushing all sites in a list
 sitesReader = csv.reader(open('top-1m.csv'), delimiter=',', quotechar='"')
 for row in sitesReader:
@@ -35,16 +41,22 @@ def ruleLookup(target):
     except csv.Error as e:
             sys.exit('file %s, line %d: %s' % (filename, reader.line_num, e))
 
-# TODO: Somebody needs to write a function that generates a diff from the STABLE and UNSTABLE branch
-# I'll go manually with `git diff --name-status master..remotes/origin/stable src/chrome/content/rules` and call the file "newRules.diff"
-rulesList = open('newRules.diff', 'r')
+# `git diff` the master revision against stable, rules folder only
+try:
+    tmpRulesFile = open(tmpRulesFileName,"w")
+    subprocess.call(['git', 'diff', '--name-status', 'master..remotes/origin/stable', '../src/chrome/content/rules'], stdout=tmpRulesFile)
+    tmpRulesFile.close()
+except OSError as e:
+    sys.exit('An OSError exception was raised: %s' % (e))
+
+rulesList = open(tmpRulesFileName, 'r')
 for line in rulesList:
     try:
         # Split into "file mode in commit + file path"
         ruleFile = line.split()
         found = 0
         # If file mode is "A" (add)
-        if ruleFile[0] == "A": #If file was "added", parse
+        if ruleFile[0] == "A": # If file was "added", parse
             ruleText = etree.parse(ruleFile[1])
             for target in ruleText.findall('target'):
                 FQDN = target.get('host') # URL of the website
@@ -60,4 +72,5 @@ def ruleLookup(target):
         print("File not found:", ruleFile[1])
         pass
 
-
+# Close the rules file
+rulesList.close()
