From 4bee1d8ab27b094bfc8ba8c04294062c7c53a733 Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Fri, 7 Apr 2017 08:05:45 -0500
Subject: [PATCH 01/12] make domain and issue parallel

---
 src/issue.js | 89 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 36 deletions(-)

diff --git a/src/issue.js b/src/issue.js
index ad54c31..c440972 100644
--- a/src/issue.js
+++ b/src/issue.js
@@ -1,7 +1,9 @@
 console.time('codesy issue load');
 
-const make_widget = ({domain}) => {
+const make_widget = ([url,{domain}]) => {
     return new Promise((resolve)=>{
+
+
         const codesy = {
             css:
                 {attr: {
@@ -19,53 +21,68 @@ const make_widget = ({domain}) => {
             }
         };
 
-        const add_link = (attr) => {
-            attr.href = chrome.extension.getURL("css/iframe.css")
-            return attr
-        }
-        const add_src = (url, attr)=> {
-            attr.src = `${domain}/bid-status/?${$.param({url})}`
-            return attr
-        }
-        const endtimer = ()=> console.timeEnd('codesy append iframe');
-        $link = () => $("head").append($('<link>').attr(add_link(codesy.css.attr)));
-        $iframe  = (new_url) => $('<iframe>').attr(add_src(new_url, codesy.iframe.attr))
-        const add = (new_url) => {
-            console.time('codesy append iframe');
-            $('body').append($iframe(new_url)).ready($link).ready(endtimer)
-        }
-        const remove = ()=> $(`#${codesy.iframe.attr.id}`).remove();
-        resolve( { url: '', add, remove })
+        codesy.css.attr.href = chrome.extension.getURL("css/iframe.css")
+        codesy.iframe.attr.src = `${domain}/bid-status/?${$.param({url})}`
+
+        const $iframe  = $('<iframe>').attr(codesy.iframe.attr)
+        const $link = () => $("head").append($('<link>').attr(codesy.css.attr));
+        const endtimer = () => console.timeEnd('codesy append iframe');
+
+        console.time('codesy append iframe');
+        $('body').append($iframe).ready($link).ready(endtimer)
+        resolve( { url, id: codesy.iframe.attr.id } )
     })
 }
 
-const is_issue = (url)=>/https:\/\/github.com\/.*\/issues\/[1-9]+/g.test(url)
+const wait_for_issue = () => {
+    const is_issue = (url)=>/https:\/\/github.com\/.*\/issues\/[1-9]+/g.test(url)
+    function watch_for(resolve) {
+        let url = window.location.href;
+        if ( is_issue(url) ) return resolve(url)
+        window.setTimeout(watch_for, 600, resolve);
+    }
+    return new Promise( (resolve) => {
+        watch_for(resolve);
+    })
+};
 
-const watch_the_href = (widget) => {
-    return new Promise((resolve)=>{
-        const watch = (url) => {
-            if (window.location.href !== widget.url){
-                widget.url = window.location.href
-                widget.remove()
-                if (is_issue(widget.url)) widget.add(widget.url);
-            }
-            window.setTimeout(watch, 600);
+const watch_href = ({url, id}) => {
+    const remove = () => $(`#${id}`).remove();
+    return new Promise( (resolve) => {
+        function wait() {
+            if (window.location.href != url) {
+                remove();
+                return resolve();
+            };
+            window.setTimeout(wait, 600);
         }
-        watch(window.location.href)
-    });
+        wait();
+    })
 };
 
-page_reload = ()=> window.location.reload(true);
-
 const get_codesy_domain = () => {
     return new Promise((resolve)=>{
         chrome.storage.local.get(null, resolve)
-        chrome.storage.onChanged.addListener(page_reload)
     });
 }
 
-get_codesy_domain()
-    .then(make_widget)
-        .then(watch_the_href)
+const domain = get_codesy_domain()
+
+function widget_promise_chain(){
+    const issue_page = wait_for_issue()
+    Promise.all([issue_page,domain])
+        .then(make_widget)
+            .then(watch_href)
+                .then(widget_promise_chain)
+}
+widget_promise_chain()
+
+page_reload = () => window.location.reload(true);
+on_domain_change = () => {
+    return new Promise((resolve)=>{
+        chrome.storage.onChanged.addListener(resolve)
+    });
+}
+on_domain_change().then(page_reload)
 
 console.timeEnd('codesy issue load');

From e415842e4b05c7e004628309e032c779dac4463e Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Sat, 8 Apr 2017 09:21:34 -0500
Subject: [PATCH 02/12] prepare widget before page loop

---
 src/issue.js | 82 +++++++++++++++++++++++-----------------------------
 1 file changed, 36 insertions(+), 46 deletions(-)

diff --git a/src/issue.js b/src/issue.js
index c440972..4d0d50f 100644
--- a/src/issue.js
+++ b/src/issue.js
@@ -1,37 +1,34 @@
 console.time('codesy issue load');
 
-const make_widget = ([url,{domain}]) => {
-    return new Promise((resolve)=>{
-
-
-        const codesy = {
-            css:
-                {attr: {
-                    rel: "stylesheet",
-                    type: "text/css"
-                }
-            },
-            iframe:
-                { attr:{
-                    id: "codesy_iframe",
-                    style: "visibility: collapse;",
-                    scrolling: "no",
-                    seamless: "seamless"
-                }
+const make_widget = ( {domain} ) => {
+    const codesy = {
+        css:
+            {attr: {
+                rel: "stylesheet",
+                type: "text/css"
+            }
+        },
+        iframe:
+            { attr:{
+                id: "codesy_iframe",
+                style: "visibility: collapse;",
+                scrolling: "no",
+                seamless: "seamless"
             }
-        };
+        }
+    };
+    const $iframe = () => $('<iframe>').attr(codesy.iframe.attr)
+    codesy.css.attr.href = chrome.extension.getURL("css/iframe.css");
+    const $link = $('<link>').attr(codesy.css.attr);
+    const add_link = () => $("head").append($link)
+    const endtimer = () => console.timeEnd('codesy append iframe');
 
-        codesy.css.attr.href = chrome.extension.getURL("css/iframe.css")
+    return (url) => {
         codesy.iframe.attr.src = `${domain}/bid-status/?${$.param({url})}`
-
-        const $iframe  = $('<iframe>').attr(codesy.iframe.attr)
-        const $link = () => $("head").append($('<link>').attr(codesy.css.attr));
-        const endtimer = () => console.timeEnd('codesy append iframe');
-
         console.time('codesy append iframe');
-        $('body').append($iframe).ready($link).ready(endtimer)
-        resolve( { url, id: codesy.iframe.attr.id } )
-    })
+        $('body').append($iframe).ready(add_link).ready(endtimer)
+        return ( { url, id: codesy.iframe.attr.id } )
+    }
 }
 
 const wait_for_issue = () => {
@@ -46,12 +43,11 @@ const wait_for_issue = () => {
     })
 };
 
-const watch_href = ({url, id}) => {
-    const remove = () => $(`#${id}`).remove();
+const wait_for_change = ( {url, id} ) => {
     return new Promise( (resolve) => {
         function wait() {
             if (window.location.href != url) {
-                remove();
+                 $(`#${id}`).remove();
                 return resolve();
             };
             window.setTimeout(wait, 600);
@@ -65,24 +61,18 @@ const get_codesy_domain = () => {
         chrome.storage.local.get(null, resolve)
     });
 }
+const prepare_widget = get_codesy_domain().then((domain)=>make_widget(domain))
+const add_widget = ( [maker, url] ) => maker(url);
 
-const domain = get_codesy_domain()
-
-function widget_promise_chain(){
-    const issue_page = wait_for_issue()
-    Promise.all([issue_page,domain])
-        .then(make_widget)
-            .then(watch_href)
-                .then(widget_promise_chain)
+function on_github_pages(){
+    Promise.all([prepare_widget, wait_for_issue()])
+        .then(add_widget)
+            .then(wait_for_change)
+                .then(on_github_pages)
 }
-widget_promise_chain()
+on_github_pages()
 
 page_reload = () => window.location.reload(true);
-on_domain_change = () => {
-    return new Promise((resolve)=>{
-        chrome.storage.onChanged.addListener(resolve)
-    });
-}
-on_domain_change().then(page_reload)
+chrome.storage.onChanged.addListener(page_reload)
 
 console.timeEnd('codesy issue load');

From a59d0a8e4878c975a02c8d252702c332e4d96af1 Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Sun, 9 Apr 2017 10:34:02 -0500
Subject: [PATCH 03/12] refactor to make more explainable

---
 src/issue.js | 81 +++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/issue.js b/src/issue.js
index 4d0d50f..53bf91b 100644
--- a/src/issue.js
+++ b/src/issue.js
@@ -1,73 +1,70 @@
 console.time('codesy issue load');
 
-const make_widget = ( {domain} ) => {
-    const codesy = {
-        css:
-            {attr: {
-                rel: "stylesheet",
-                type: "text/css"
-            }
-        },
-        iframe:
-            { attr:{
+const make_widget_appender = (domain) => {
+    const iframe_attr = {
                 id: "codesy_iframe",
                 style: "visibility: collapse;",
                 scrolling: "no",
-                seamless: "seamless"
+                seamless: "seamless",
+            }
+    const $iframe = (url) => {
+        iframe_attr.src = `${domain}/bid-status/?${$.param({url})}`
+        return $('<iframe>').attr(iframe_attr)
+    }
+    const css_attr = {
+                rel: "stylesheet",
+                type: "text/css",
+                href: chrome.extension.getURL("css/iframe.css")
             }
-        }
-    };
-    const $iframe = () => $('<iframe>').attr(codesy.iframe.attr)
-    codesy.css.attr.href = chrome.extension.getURL("css/iframe.css");
-    const $link = $('<link>').attr(codesy.css.attr);
-    const add_link = () => $("head").append($link)
+    const $link = $('<link>').attr(css_attr);
+    const append_link = () => $("head").append($link);
     const endtimer = () => console.timeEnd('codesy append iframe');
 
     return (url) => {
-        codesy.iframe.attr.src = `${domain}/bid-status/?${$.param({url})}`
         console.time('codesy append iframe');
-        $('body').append($iframe).ready(add_link).ready(endtimer)
-        return ( { url, id: codesy.iframe.attr.id } )
+        $('body').append($iframe(url)).ready(append_link).ready(endtimer)
+        return ( { url, id: iframe_attr.id } )
     }
 }
 
-const wait_for_issue = () => {
-    const is_issue = (url)=>/https:\/\/github.com\/.*\/issues\/[1-9]+/g.test(url)
-    function watch_for(resolve) {
+const wait_for_issue_page = () => {
+    const issue_rx = /https:\/\/github.com\/.*\/issues\/[1-9]+/
+    function watch_for_issue(resolve) {
         let url = window.location.href;
-        if ( is_issue(url) ) return resolve(url)
-        window.setTimeout(watch_for, 600, resolve);
+        if ( issue_rx.test(url) ) return resolve(url)
+        window.setTimeout(watch_for_issue, 400, resolve);
     }
     return new Promise( (resolve) => {
-        watch_for(resolve);
+        watch_for_issue(resolve);
     })
 };
 
-const wait_for_change = ( {url, id} ) => {
+const wait_for_page_change = ( {url, id} ) => {
+    function watch_href(resolve) {
+        if (window.location.href != url) {
+             $(`#${id}`).remove();
+            return resolve();
+        };
+        window.setTimeout(watch_href, 400, resolve);
+    }
     return new Promise( (resolve) => {
-        function wait() {
-            if (window.location.href != url) {
-                 $(`#${id}`).remove();
-                return resolve();
-            };
-            window.setTimeout(wait, 600);
-        }
-        wait();
+        watch_href(resolve);
     })
 };
 
 const get_codesy_domain = () => {
-    return new Promise((resolve)=>{
-        chrome.storage.local.get(null, resolve)
+    return new Promise((resolve) => {
+        const resolve_domain = ({domain}) => resolve(domain)
+        chrome.storage.local.get(null, resolve_domain)
     });
 }
-const prepare_widget = get_codesy_domain().then((domain)=>make_widget(domain))
-const add_widget = ( [maker, url] ) => maker(url);
+const prepare_widget = get_codesy_domain().then(make_widget_appender)
+const append_widget = ( [appender, url] ) => appender(url);
 
 function on_github_pages(){
-    Promise.all([prepare_widget, wait_for_issue()])
-        .then(add_widget)
-            .then(wait_for_change)
+    Promise.all( [prepare_widget, wait_for_issue_page()] )
+        .then(append_widget)
+            .then(wait_for_page_change)
                 .then(on_github_pages)
 }
 on_github_pages()

From 849782c9ecc662d037871a815ebbbb9f828db6f8 Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Wed, 12 Apr 2017 21:58:56 -0500
Subject: [PATCH 04/12] de-fooing file streams

---
 gulpfile.js | 137 ++++++++++++++++++++++++----------------------------
 1 file changed, 62 insertions(+), 75 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 687752d..3e3b16d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -41,64 +41,54 @@ const settings = {
 //    destination: (optional) path where files will go.  If destination is not included,
 //                  the functions will return a stream of files.
 
-javascript_src = function(options) {
-    return (
-        function({source, destination}) {
-            return function() {
-                console.log(`gather src ${source}/*.js files`)
-                console.log(`gather src ${settings.source}/*.js files`)
-
-                const js_files = gulp.src([`${source}/*.js`, `${settings.source}/*.js`])
-                    .pipe(headerComment(`codesy widget version ${settings.version}`))
-
-                if (destination){
-                    console.log(` destination ${destination}/js`);
-                    return js_files.pipe(gulp.dest(`${destination}/js`))
-                } else {
-                    return js_files
-                }
-            }
+javascript_src = function({source, destination}) {
+    return function() {
+        console.log(`gather src ${source}/*.js files`)
+        console.log(`gather src ${settings.source}/*.js files`)
+
+        const js_files = gulp.src([`${source}/*.js`, `${settings.source}/*.js`])
+            .pipe(headerComment(`codesy widget version ${settings.version}`))
+
+        if (destination){
+            console.log(` destination ${destination}/js`);
+            return js_files.pipe(gulp.dest(`${destination}/js`))
+        } else {
+            return js_files
         }
-    )(options)
+    }
 }
 
 static_files = function(destination) {
-    return (
-        function(destination,{glob, source}) {
-            return function() {
-                const static_stream = gulp.src(glob, { base: source, cwd: source })
-                if (destination){
-                    return static_stream.pipe(gulp.dest( destination ))
-                } else {
-                    return static_stream
-                }
-            }
+    ({glob, source} = settings.static_files)
+    return function() {
+        const static_stream = gulp.src(glob, { base: source, cwd: source })
+        if (destination){
+            return static_stream.pipe(gulp.dest( destination ))
+        } else {
+            return static_stream
         }
-    )(destination,settings.static_files)
+    }
 }
 
 // this function needs to include dev server details in the options object:
 //    dev_server: object with domain and port
 
-const manifest = function (options){
-  return (
-    function({source, destination}) {
-        return function() {
-            const common = gulp.src(`${settings.source}/manifest.json`)
-            const additions = gulp.src(`${source}/manifest_additions.json`)
-            manifest_stream = mergeStream(additions, common)
+const manifest = function ({source, destination}){
+    return function() {
+        const common = gulp.src(`${settings.source}/manifest.json`)
+        const additions = gulp.src(`${source}/manifest_additions.json`)
+        manifest_stream = mergeStream(additions, common)
             .pipe(mergeJSON('manifest.json'))
             .pipe(jeditor(function(json) {
                 json.version=settings.version
                 return json
             }))
-            if (destination){
-                return manifest_stream.pipe(gulp.dest(destination));
-            } else {
-                return manifest_stream
-            }
+        if (destination){
+            return manifest_stream.pipe(gulp.dest(destination));
+        } else {
+            return manifest_stream
         }
-    })(options)
+    }
 }
 
 const add_dev_server = function (manifest_stream) {
@@ -115,40 +105,36 @@ const add_dev_server = function (manifest_stream) {
         }))
 }
 
-const package = function (options, zipped, for_dev){
-    return (
-            function({source, destination: dest, extension: ext}, zipped, for_dev) {
-            return function() {
-                console.log(`package source: ${source}`);
-                let package_name, destination, package_stream;
-                let static_stream = (new static_files())()
-                let manifest_stream = (new manifest({source}))()
-                const js_stream = (new javascript_src( {source} ))()
-                    .pipe(rename( (path)=>path.dirname += "/js" ))
-
-                if (for_dev){
-                    manifest_stream = add_dev_server (manifest_stream)
-                    package_name = `${settings.name}-${settings.version}.dev.${ext}`
-                } else {
-                    js_stream.pipe(stripDebug())
-                    package_name = `${settings.name}-${settings.version}.${ext}`
-                }
-                destination = for_dev ? dest : settings.destination
-                console.log(`package dest: ${destination}`);
-
-                package_stream = mergeStream (manifest_stream,js_stream,static_stream)
-
-                if (zipped) {
-                    package_stream
-                        .pipe(zip(package_name))
-                        .pipe(gulp.dest(destination))
-                } else {
-                    package_stream
-                        .pipe(gulp.dest(destination));
-                }
-            }
+const package = function ({source, destination: dest, extension: ext}, zipped, for_dev){
+    return function() {
+        console.log(`package source: ${source}`);
+        let package_name, destination, package_stream;
+        let static_stream = (new static_files())()
+        let manifest_stream = (new manifest({source}))()
+        const js_stream = (new javascript_src( {source} ))()
+            .pipe(rename( (path)=>path.dirname += "/js" ))
+
+        if (for_dev){
+            manifest_stream = add_dev_server (manifest_stream)
+            package_name = `${settings.name}-${settings.version}.dev.${ext}`
+        } else {
+            js_stream.pipe(stripDebug())
+            package_name = `${settings.name}-${settings.version}.${ext}`
         }
-    )(options, zipped, for_dev)
+        destination = for_dev ? dest : settings.destination
+        console.log(`package dest: ${destination}`);
+
+        package_stream = mergeStream (manifest_stream,js_stream,static_stream)
+
+        if (zipped) {
+            package_stream
+                .pipe(zip(package_name))
+                .pipe(gulp.dest(destination))
+        } else {
+            package_stream
+                .pipe(gulp.dest(destination));
+        }
+    }
 }
 
 const watch_dev = function ({source}, task) {
@@ -161,6 +147,7 @@ const watch_dev = function ({source}, task) {
 }
 
 // DEV TASKS
+
 gulp.task('dev-chrome-unpacked', ['chrome-unpacked'], function() {
     watch_dev(settings.chrome,['chrome-unpacked'])
 })

From 88ef9afc921f8e03477b83099f05d8d8256d448a Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Wed, 12 Apr 2017 22:51:03 -0500
Subject: [PATCH 05/12] more gulpfile paring

---
 gulpfile.js | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 3e3b16d..11882aa 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -58,17 +58,7 @@ javascript_src = function({source, destination}) {
     }
 }
 
-static_files = function(destination) {
-    ({glob, source} = settings.static_files)
-    return function() {
-        const static_stream = gulp.src(glob, { base: source, cwd: source })
-        if (destination){
-            return static_stream.pipe(gulp.dest( destination ))
-        } else {
-            return static_stream
-        }
-    }
-}
+static_files = ({glob, source}) => gulp.src(glob, { base: source, cwd: source });
 
 // this function needs to include dev server details in the options object:
 //    dev_server: object with domain and port
@@ -108,23 +98,22 @@ const add_dev_server = function (manifest_stream) {
 const package = function ({source, destination: dest, extension: ext}, zipped, for_dev){
     return function() {
         console.log(`package source: ${source}`);
-        let package_name, destination, package_stream;
-        let static_stream = (new static_files())()
+        const package_name = `${settings.name}-${settings.version}${for_dev?'.dev':''}.${ext}`
+        const destination = for_dev ? dest : settings.destination
+        console.log(`package dest: ${destination}`);
+
+        let static_stream = static_files(settings.static_files)
         let manifest_stream = (new manifest({source}))()
         const js_stream = (new javascript_src( {source} ))()
             .pipe(rename( (path)=>path.dirname += "/js" ))
 
         if (for_dev){
             manifest_stream = add_dev_server (manifest_stream)
-            package_name = `${settings.name}-${settings.version}.dev.${ext}`
         } else {
             js_stream.pipe(stripDebug())
-            package_name = `${settings.name}-${settings.version}.${ext}`
         }
-        destination = for_dev ? dest : settings.destination
-        console.log(`package dest: ${destination}`);
 
-        package_stream = mergeStream (manifest_stream,js_stream,static_stream)
+        const package_stream = mergeStream (manifest_stream,js_stream,static_stream)
 
         if (zipped) {
             package_stream

From 8de437d91fb4754b7055314b98b1d3e71f3a5ccb Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Thu, 13 Apr 2017 21:53:54 -0500
Subject: [PATCH 06/12] new easier to remember gulp task names

---
 README.md   | 30 ++++++++++++++++--------
 gulpfile.js | 66 +++++++++++++++++++----------------------------------
 2 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/README.md b/README.md
index aa0238f..ff864d3 100644
--- a/README.md
+++ b/README.md
@@ -10,15 +10,7 @@ The codesy.io widget is an add-on for Firefox, Chrome, and Opera that adds codes
 2. Install requirements:
   * `cd widgets`
   * `npm install` (You can install globally with `npm install -g`)
-3. Run these gulp tasks to watch changes to files and compile extensions.
-  * gulp dev-chrome-unpacked - creates chrome/ directory and watches for changes
-  * gulp dev-chrome-packed - creates a zip file in /chrome and watches for changes
-  * gulp dev-firefox-unpacked - creates firefox/ directory and watches for changes
-  * gulp dev-firefox-packed - creates an xpi in firefox/ file and watches for changes
-
-combined tasks:
-  * gulp dev-packed - creates addon packages and watches for changes
-  * gulp dev-unpacked - creates directories with addon files and watches all for changes
+3. See the list of gulp tasks build or watch changes to files and compile extensions:
 
 
 ### To use the Chrome Extension
@@ -45,3 +37,23 @@ combined tasks:
   * Removes debug lines from .js files e.g. console.log
   * Creates an xpi file for uploading to the moz store.  The file contains the manifest.json file.
 2. Upload the xpi file to the moz store
+
+
+## Gulp Tasks
+
+#### build-{browser}-file:
+* **build-firefox-file**: create xpi for FF dev in the firefox.source directory with dev settings
+* **build-chrome-file**: create zip for chrome dev in the chrome.source directory with dev settings
+
+#### build-{browser}-directory:
+* **build-firefox-directory**: create firefox dev directroy in the firefox.source directory with dev settings
+* **build-chrome-directory**: create chrome dev directroy in the chrome.source directory with dev settings
+
+#### workon-{browser}-directory or workon-{browser}-directory:
+watches extension files and rebuilds
+
+
+#### publish-{browser}-file
+* **publish-firefox-file**: create xpi for FF prod
+* **publish-chrome-file**: create zip for chrome and opera
+* **publish-all**: creates all browser extension files
diff --git a/gulpfile.js b/gulpfile.js
index 11882aa..7f47904 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -135,49 +135,29 @@ const watch_dev = function ({source}, task) {
     gulp.watch(js_files, task)
 }
 
-// DEV TASKS
-
-gulp.task('dev-chrome-unpacked', ['chrome-unpacked'], function() {
-    watch_dev(settings.chrome,['chrome-unpacked'])
-})
-
-gulp.task('dev-chrome-packed', ['chrome-dev-zip'], function() {
-    watch_dev(settings.chrome,['chrome-dev-zip'])
-})
-
-gulp.task('dev-firefox-unpacked', ['firefox-unpacked'], function() {
-    watch_dev(settings.firefox,['firefox-unpacked'])
-})
-
-gulp.task('dev-firefox-packed', ['firefox-dev-xpi'], function() {
-    watch_dev(settings.firefox,['firefox-dev-xpi'])
-})
+const browsers = ['firefox', 'chrome']
+
+for (browser of browsers){
+    const workon_directory = [`build-${browser}-directory`]
+    const workon_file = [`build-${browser}-file`]
+    const options = settings[browser]
+
+    // FILE BUILDING TASKS
+    gulp.task(`build-${browser}-file`, (new package(options, true, true)))
+    gulp.task(`build-${browser}-directory`, (new package(options, false, true)))
+    gulp.task(`publish-${browser}-file`, (new package(options, true, false)))
+    // DEV TASKS
+    const directory_task = `workon-${browser}-directory`
+    gulp.task(`workon-${browser}-directory`, workon_directory,
+        () => watch_dev(options, workon_directory)
+    );
+    gulp.task(`workon-${browser}-file`, workon_file,
+        () => watch_dev(options, workon_file)
+    );
+}
 
-gulp.task('dev-unpacked',['dev-chrome-unpacked','dev-firefox-unpacked'])
-gulp.task('dev-packed',['dev-chrome-packed','dev-firefox-packed'])
+const publish_tasks = browsers.map((b)=>`publish-${b}-file`)
+gulp.task('publish-all',publish_tasks)
 
 // FF dev must use file
-gulp.task('dev-mixed',['dev-chrome-unpacked','dev-firefox-packed'])
-
-
-// FILE BUILDING TASKS
-
-// create xpi for FF dev in the firefox.source directory with dev settings
-gulp.task('firefox-dev-xpi', (new package(settings.firefox, true, true)))
-
-// create firefox dev directroy in the firefox.source directory with dev settings
-gulp.task('firefox-unpacked', (new package(settings.firefox, false, true)))
-
-// create zip for chrome dev in the chrome.source directory with dev settings
-gulp.task('chrome-dev-zip', (new package(settings.chrome, true, true)))
-
-// create chrome dev directroy in the chrome.source directory with dev settings
-gulp.task('chrome-unpacked', (new package(settings.chrome, false, true)))
-
-// create xpi for FF prod
-gulp.task('publish-firefox', (new package(settings.firefox, true, false)))
-
-// create zip for chrome and opera
-gulp.task('publish-chrome', (new package(settings.chrome, true, false)))
-
-gulp.task('publish-all',['publish-firefox','publish-chrome'])
+gulp.task('workon-mixed',['workon-chrome-directory','workon-firefox-file'])

From 77c295fc33062b0250e23b5ef3ad20c3a50141a7 Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Sat, 15 Apr 2017 08:14:09 -0500
Subject: [PATCH 07/12] clean up task creating loop

---
 gulpfile.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 7f47904..426452a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -126,7 +126,7 @@ const package = function ({source, destination: dest, extension: ext}, zipped, f
     }
 }
 
-const watch_dev = function ({source}, task) {
+const watch_src = function ({source}, task) {
     console.log("start watching");
     const manifest_files = [`${settings.source}/manifest.json`,`${source}/manifest_additions.json`]
     const js_files = [`${source}/*.js`, `${settings.source}/*.js`]
@@ -138,21 +138,21 @@ const watch_dev = function ({source}, task) {
 const browsers = ['firefox', 'chrome']
 
 for (browser of browsers){
-    const workon_directory = [`build-${browser}-directory`]
-    const workon_file = [`build-${browser}-file`]
+    const build_file_task = [`build-${browser}-file`]
+    const build_directory_task = [`build-${browser}-directory`]
     const options = settings[browser]
 
-    // FILE BUILDING TASKS
-    gulp.task(`build-${browser}-file`, (new package(options, true, true)))
-    gulp.task(`build-${browser}-directory`, (new package(options, false, true)))
+    // ADDON BUILDING TASKS
+    gulp.task(build_file_task, (new package(options, true, true)))
+    gulp.task(build_directory_task, (new package(options, false, true)))
     gulp.task(`publish-${browser}-file`, (new package(options, true, false)))
-    // DEV TASKS
-    const directory_task = `workon-${browser}-directory`
-    gulp.task(`workon-${browser}-directory`, workon_directory,
-        () => watch_dev(options, workon_directory)
+
+    // WATCH TASKS
+    gulp.task(`workon-${browser}-directory`, build_directory_task,
+        () => watch_src(options, build_directory_task)
     );
-    gulp.task(`workon-${browser}-file`, workon_file,
-        () => watch_dev(options, workon_file)
+    gulp.task(`workon-${browser}-file`, build_file_task,
+        () => watch_src(options, build_file_task)
     );
 }
 

From 5b4a039e72f3d3b57b0ade4186ba2c204a121ed7 Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Sat, 15 Apr 2017 08:15:02 -0500
Subject: [PATCH 08/12] add const to declarations, move for better reading

---
 src/csp.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/csp.js b/src/csp.js
index aa08a06..91b18e1 100644
--- a/src/csp.js
+++ b/src/csp.js
@@ -1,11 +1,3 @@
-
-githubFilter = {
-    urls: ["https://github.com/*"],
-    types: ["main_frame"]
-};
-
-headerOptions = ["responseHeaders", "blocking"]
-
 const makeCspAppender = function(domain='') {
     const types = 'connect-src child-src script-src style-src font-src';
     const isType = (word) => types.indexOf(word) !== -1;
@@ -27,6 +19,13 @@ const makeCspAppender = function(domain='') {
 
 let codesyAppender = new makeCspAppender()
 
+const githubFilter = {
+    urls: ["https://github.com/*"],
+    types: ["main_frame"]
+};
+
+const headerOptions = ["responseHeaders", "blocking"]
+
 const setCodesyAppender = function(domain) {
     if (chrome.webRequest.onHeadersReceived.hasListener(codesyAppender)) {
         chrome.webRequest.onHeadersReceived.removeListener(codesyAppender);

From d580d3acd68acae4ca192417788298fd131266b6 Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Sat, 15 Apr 2017 13:49:47 -0500
Subject: [PATCH 09/12] fix gulpfile

---
 gulpfile.js | 12 ++++++------
 src/csp.js  | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 426452a..5290dd7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -138,8 +138,8 @@ const watch_src = function ({source}, task) {
 const browsers = ['firefox', 'chrome']
 
 for (browser of browsers){
-    const build_file_task = [`build-${browser}-file`]
-    const build_directory_task = [`build-${browser}-directory`]
+    const build_file_task = `build-${browser}-file`
+    const build_directory_task = `build-${browser}-directory`
     const options = settings[browser]
 
     // ADDON BUILDING TASKS
@@ -148,11 +148,11 @@ for (browser of browsers){
     gulp.task(`publish-${browser}-file`, (new package(options, true, false)))
 
     // WATCH TASKS
-    gulp.task(`workon-${browser}-directory`, build_directory_task,
-        () => watch_src(options, build_directory_task)
+    gulp.task(`workon-${browser}-directory`, [build_directory_task],
+        () => watch_src(options, [build_directory_task])
     );
-    gulp.task(`workon-${browser}-file`, build_file_task,
-        () => watch_src(options, build_file_task)
+    gulp.task(`workon-${browser}-file`, [build_file_task],
+        () => watch_src(options, [build_file_task])
     );
 }
 
diff --git a/src/csp.js b/src/csp.js
index 91b18e1..0e9bfee 100644
--- a/src/csp.js
+++ b/src/csp.js
@@ -1,15 +1,17 @@
 const makeCspAppender = function(domain='') {
-    const types = 'connect-src child-src script-src style-src font-src';
-    const isType = (word) => types.indexOf(word) !== -1;
-    const addDomain = (accum, word)=>`${accum} ${word} ${isType(word) ? domain : '' }`
-    const isCSP = function (name) {
-        name = name.toUpperCase()
-        return (name === 'CONTENT-SECURITY-POLICY') || (name === 'X-WEBKIT-CSP');
-    };
+    const csp_names = ['CONTENT-SECURITY-POLICY','X-WEBKIT-CSP']
+    const name_finder = (name) => (csp_name) => csp_name === name.toUpperCase()
+    const if_csp = (name) => csp_names.find(name_finder(name)) ? true : false
+
+    const codesy_types = 'connect-src child-src script-src style-src';
+    const is_codesy = (type) => codesy_types.indexOf(type) !== -1;
+    const add_codesy = (accum, word) =>`${accum} ${word} ${is_codesy(word) ? domain : '' }`;
+    const insert_domain = (csp) => csp.split(' ').reduce(add_codesy,'');
+
     return function({responseHeaders: headers}) {
         console.time('codesy map headers');
-        const responseHeaders = headers.map(function({name, value: v}){
-            value = isCSP(name) ? v.split(' ').reduce(addDomain,'') : v
+        const responseHeaders = headers.map(function({name, value: original}){
+            const value = if_csp(name) ? insert_domain(original) : original
             return {name,value}
         })
         console.timeEnd('codesy map headers');

From 382d50775121af1aa6ff5d41ca539b98a1a01123 Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Sat, 15 Apr 2017 14:00:25 -0500
Subject: [PATCH 10/12] update with new gulp tasks

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ff864d3..5cd9990 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,12 @@ The codesy.io widget is an add-on for Firefox, Chrome, and Opera that adds codes
 
 
 ### To use the Chrome Extension
-1. Run one of the dev-chrome tasks above
+1. Run `workon-chrome-directory`
 2. Follow the [Unpacked Chrome Extensions
    docs](http://developer.chrome.com/extensions/getstarted.html#unpacked) and load the `chrome` directory
 
 ### To use the Firefox Add-on
-1. Run one of the dev-firefox tasks above
+1. Run `gulp workon-firefox-file`
 2. Goto the the //about:addons page
 3. Select 'Install Addon from File ...')
 4. Load the xpi file from the firefox directory
@@ -51,7 +51,10 @@ The codesy.io widget is an add-on for Firefox, Chrome, and Opera that adds codes
 
 #### workon-{browser}-directory or workon-{browser}-directory:
 watches extension files and rebuilds
-
+* **workon-firefox-file**
+* **workon-firefox-directory**
+* **workon-chrome-file**
+* **workon-chrome-directory**
 
 #### publish-{browser}-file
 * **publish-firefox-file**: create xpi for FF prod

From d4642f01779fdf30ed38a11f4f819d493f38be7b Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Sat, 15 Apr 2017 14:51:12 -0500
Subject: [PATCH 11/12] make function definition consistent

---
 gulpfile.js       | 10 +++++-----
 src/csp.js        |  4 ++--
 src/issue.js      |  8 ++++----
 src/on_install.js | 18 +++++++++---------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 5290dd7..5b95ad4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -41,7 +41,7 @@ const settings = {
 //    destination: (optional) path where files will go.  If destination is not included,
 //                  the functions will return a stream of files.
 
-javascript_src = function({source, destination}) {
+function javascript_src ({source, destination}) {
     return function() {
         console.log(`gather src ${source}/*.js files`)
         console.log(`gather src ${settings.source}/*.js files`)
@@ -63,7 +63,7 @@ static_files = ({glob, source}) => gulp.src(glob, { base: source, cwd: source })
 // this function needs to include dev server details in the options object:
 //    dev_server: object with domain and port
 
-const manifest = function ({source, destination}){
+function manifest({source, destination}){
     return function() {
         const common = gulp.src(`${settings.source}/manifest.json`)
         const additions = gulp.src(`${source}/manifest_additions.json`)
@@ -81,7 +81,7 @@ const manifest = function ({source, destination}){
     }
 }
 
-const add_dev_server = function (manifest_stream) {
+function add_dev_server (manifest_stream) {
     ({domain, port} = settings.dev_server)
     const warning = 'THIS IS NOT the production manifest.',
     dev_permission =`https://${domain}:${port}/`,
@@ -95,7 +95,7 @@ const add_dev_server = function (manifest_stream) {
         }))
 }
 
-const package = function ({source, destination: dest, extension: ext}, zipped, for_dev){
+function package ({source, destination: dest, extension: ext}, zipped, for_dev){
     return function() {
         console.log(`package source: ${source}`);
         const package_name = `${settings.name}-${settings.version}${for_dev?'.dev':''}.${ext}`
@@ -126,7 +126,7 @@ const package = function ({source, destination: dest, extension: ext}, zipped, f
     }
 }
 
-const watch_src = function ({source}, task) {
+function watch_src ({source}, task) {
     console.log("start watching");
     const manifest_files = [`${settings.source}/manifest.json`,`${source}/manifest_additions.json`]
     const js_files = [`${source}/*.js`, `${settings.source}/*.js`]
diff --git a/src/csp.js b/src/csp.js
index 0e9bfee..198ccb3 100644
--- a/src/csp.js
+++ b/src/csp.js
@@ -1,4 +1,4 @@
-const makeCspAppender = function(domain='') {
+function makeCspAppender (domain='') {
     const csp_names = ['CONTENT-SECURITY-POLICY','X-WEBKIT-CSP']
     const name_finder = (name) => (csp_name) => csp_name === name.toUpperCase()
     const if_csp = (name) => csp_names.find(name_finder(name)) ? true : false
@@ -28,7 +28,7 @@ const githubFilter = {
 
 const headerOptions = ["responseHeaders", "blocking"]
 
-const setCodesyAppender = function(domain) {
+function setCodesyAppender (domain) {
     if (chrome.webRequest.onHeadersReceived.hasListener(codesyAppender)) {
         chrome.webRequest.onHeadersReceived.removeListener(codesyAppender);
     }
diff --git a/src/issue.js b/src/issue.js
index 53bf91b..a29f19f 100644
--- a/src/issue.js
+++ b/src/issue.js
@@ -1,6 +1,6 @@
 console.time('codesy issue load');
 
-const make_widget_appender = (domain) => {
+function make_widget_appender (domain) {
     const iframe_attr = {
                 id: "codesy_iframe",
                 style: "visibility: collapse;",
@@ -27,7 +27,7 @@ const make_widget_appender = (domain) => {
     }
 }
 
-const wait_for_issue_page = () => {
+function wait_for_issue_page () {
     const issue_rx = /https:\/\/github.com\/.*\/issues\/[1-9]+/
     function watch_for_issue(resolve) {
         let url = window.location.href;
@@ -39,7 +39,7 @@ const wait_for_issue_page = () => {
     })
 };
 
-const wait_for_page_change = ( {url, id} ) => {
+function wait_for_page_change  ( {url, id} ) {
     function watch_href(resolve) {
         if (window.location.href != url) {
              $(`#${id}`).remove();
@@ -52,7 +52,7 @@ const wait_for_page_change = ( {url, id} ) => {
     })
 };
 
-const get_codesy_domain = () => {
+function get_codesy_domain () {
     return new Promise((resolve) => {
         const resolve_domain = ({domain}) => resolve(domain)
         chrome.storage.local.get(null, resolve_domain)
diff --git a/src/on_install.js b/src/on_install.js
index 49af840..7391bee 100644
--- a/src/on_install.js
+++ b/src/on_install.js
@@ -1,14 +1,14 @@
-const find_these = (query)=>{
+function find_these (query) {
     return new Promise((resolve)=>{
         chrome.tabs.query(query, resolve);
     });
 }
 
-const wait_for = (id, resolve)=>{
+function wait_for (id, resolve) {
     let times_checked = 0;
     let timerID, load_status;
-    const set_status = ({status})=>load_status=status
-    const check_until = (status)=>{
+    const set_status = ({status}) =>load_status=status
+    const check_until = (status) => {
         if (load_status === status || (times_checked += 1) > 150){
             window.clearTimeout(timerID)
             return resolve()
@@ -19,24 +19,24 @@ const wait_for = (id, resolve)=>{
     check_until ( 'complete' )
 }
 
-const reload = (id)=>{
-    return new Promise((resolve)=>{
+function reload (id) {
+    return new Promise((resolve) => {
         chrome.tabs.reload(id)
         wait_for(id, resolve)
     });
 }
 
-const reload_them = (tabs)=> {
+function reload_them (tabs) {
     const reloads = tabs.map(({id})=>reload(id))
     return Promise.all(reloads)
 }
 
-const select_them = (tabs)=> {
+function select_them (tabs) {
     tabs.map( ({id}) => chrome.tabs.update(id, {selected:true}) )
     return tabs
 }
 
-when_installed = ({reason}) => {
+when_installed ({reason}) => {
     find_these({ title: "*codesy.io*" })
             .then(select_them)
                 .then(reload_them)

From ecbba3ed113617ddcc2a142d3922fb6c6cb7e33f Mon Sep 17 00:00:00 2001
From: jdungan <johnadungan@gmail.com>
Date: Sat, 15 Apr 2017 16:07:56 -0500
Subject: [PATCH 12/12] fix function change

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

diff --git a/src/on_install.js b/src/on_install.js
index 7391bee..76f4471 100644
--- a/src/on_install.js
+++ b/src/on_install.js
@@ -36,7 +36,7 @@ function select_them (tabs) {
     return tabs
 }
 
-when_installed ({reason}) => {
+function when_installed ({reason}) {
     find_these({ title: "*codesy.io*" })
             .then(select_them)
                 .then(reload_them)