Change directory for rewriter

jsha · jsha · commit 0487a4a0bf6a · 2014-01-08T00:29:11.000-08:00
diff --git a/rewriter/package.json b/rewriter/package.json
@@ -1,5 +1,5 @@
 {
-  "name" : "https-everywhere",
+  "name" : "https-everywhere-rewriter",
   "version" : "1.0.0",
   "dependencies" : {
     "xmldom" : "0.1.17",
diff --git a/rewriter/rewriter.js b/rewriter/rewriter.js
@@ -1,11 +1,24 @@
+// HTTPS Rewriter.
+//
+// Uses the rulesets from HTTPS to recursively rewrite URL references in a
+// given directory to HTTPS. Uses protocol-relative URLs wherever possible.
+// Makes a copy of each file at filename.bak.
+//
+// Usage:
+//  (install node and npm)
+//  cd https-everywhere
+//  ./makecrx.sh
+//  cd rewriter
+//  js rewriter.js ~/path/to/my/webapp
+
 var path = require("path"),
     fs = require("fs"),
     DOMParser = require('xmldom').DOMParser,
     readdirp = require('readdirp'),
     es = require('event-stream'),
 
-    lrucache = require("./lru"),
-    rules = require("./rules"),
+    lrucache = require("../chromium/lru"),
+    rules = require("../chromium/rules"),
 
     URI = require("URIjs");
 
@@ -14,7 +27,10 @@ var ruleSets = null;
 function processDir(dir) {
   var stream = readdirp({
     root: dir,
-    fileFilter: '*.html'
+    fileFilter: ['*.html', '*.js', '*.rb', '*.erb', '*.mustache', 
+                 '*.scala', '*.c', '*.cc', '*.cpp', '*.cxx',
+                 '*.java', '*.go', '*.php', '*.css', '*.pl', '*.py',
+                 '*.rhtml', '*.sh', '*.yaml']
   });
 
   stream
@@ -58,7 +74,7 @@ function processFile(filename) {
 }
 
 function loadRuleSets() {
-  var fileContents = fs.readFileSync(path.join(__dirname, 'rules/default.rulesets'), {encoding: 'utf-8'});
+  var fileContents = fs.readFileSync(path.join(__dirname, '../pkg/crx/rules/default.rulesets'), {encoding: 'utf-8'});
   var xml = new DOMParser().parseFromString(fileContents, 'text/xml');
   ruleSets = new rules.RuleSets("fake user agent", lrucache.LRUCache, xml, {});
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name" : "https-everywhere",`
	`2`	`+ "name" : "https-everywhere-rewriter",`
`3`	`3`	`"version" : "1.0.0",`
`4`	`4`	`"dependencies" : {`
`5`	`5`	`"xmldom" : "0.1.17",`