update deps & add linting (#149)

PR-URL: #149
Reviewed-By: Michael Dawson <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>

Author: rvagg

update/add-route.js

@@ -1,30 +1,28 @@
 const hyperquest = require('hyperquest')
-    , bl         = require('bl')
-    , qs         = require('querystring')
-
-    , url        = `https://api.mailgun.net/v3/routes`
+const bl = require('bl')
+const qs = require('querystring')
 
+const url = 'https://api.mailgun.net/v3/routes'
 
 function addRoute (domain, creds, description, expression, actions, callback) {
-  var params  = {
-          description
-        , expression
-        , action : actions
-      }
-    , data    = qs.stringify(params)
-    , options = {
-          auth    : `api:${creds["api-key"]}`
-        , headers : {
-              'content-type': 'application/x-www-form-urlencoded'
-            , 'content-length': Buffer.byteLength(data)
-          }
-      }
+  const params = {
+    description,
+    expression,
+    action: actions
+  }
+  const data = qs.stringify(params)
+  const options = {
+    auth: `api:${creds['api-key']}`,
+    headers: {
+      'content-type': 'application/x-www-form-urlencoded',
+      'content-length': Buffer.byteLength(data)
+    }
+  }
 
-  var req = hyperquest.post(url, options)
+  const req = hyperquest.post(url, options)
 
   req.pipe(bl(callback))
   req.end(data)
 }
 
-
-module.exports = addRoute
+module.exports = addRoute

update/delete-route.js

@@ -1,14 +1,10 @@
-const hyperquest = require('hyperquest')
-    , bl         = require('bl')
-
-    , url        = 'https://api.mailgun.net/v3/routes'
+const jsonist = require('jsonist')
 
+const url = 'https://api.mailgun.net/v3/routes'
 
 function deleteRoute (domain, creds, id, callback) {
-  var options = { auth: `api:${creds["api-key"]}` }
-
-  hyperquest.delete(`${url}/${id}`, options).pipe(bl(callback))
+  const options = { auth: `api:${creds['api-key']}` }
+  jsonist.delete(`${url}/${id}`, options, callback)
 }
 
-
-module.exports = deleteRoute
+module.exports = deleteRoute

update/list-routes.js

@@ -1,12 +1,10 @@
 const jsonist = require('jsonist')
 
-    , url     = `https://api.mailgun.net/v3/routes`
-
+const url = 'https://api.mailgun.net/v3/routes'
 
 function listRoutes (domain, creds, callback) {
-  var options = { auth: `api:${creds["api-key"]}` }
+  const options = { auth: `api:${creds['api-key']}` }
   jsonist.get(url, options, callback)
 }
 
-
-module.exports = listRoutes
+module.exports = listRoutes

update/package.json

@@ -4,16 +4,17 @@
   "description": "",
   "main": "update.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "lint": "npx standard",
+    "test": "npm run lint"
   },
   "author": "Rod <[email protected]> (http://r.va.gg/)",
   "license": "MIT",
   "dependencies": {
-    "after": "~0.8.1",
-    "bl": "~0.9.4",
-    "deep-equal": "~1.0.0",
-    "hyperquest": "~1.2.0",
-    "jsonist": "~1.0.2",
-    "xtend": "~4.0.0"
+    "after": "^0.8.2",
+    "bl": "^4.0.0",
+    "deep-equal": "^2.0.1",
+    "hyperquest": "^2.1.3",
+    "jsonist": "^3.0.1",
+    "xtend": "^4.0.2"
   }
 }

update/update-aliases.js

@@ -2,63 +2,58 @@
 // and adjust them to match the list of provided aliases; removing ones that
 // don't belong and adding ones that are new
 
-const equal       = require('deep-equal')
-    , after       = require('after')
-    , xtend       = require('xtend')
-    , listRoutes  = require('./list-routes')
-    , addRoute    = require('./add-route')
-    , deleteRoute = require('./delete-route')
-
+const equal = require('deep-equal')
+const after = require('after')
+const xtend = require('xtend')
+const listRoutes = require('./list-routes')
+const addRoute = require('./add-route')
+const deleteRoute = require('./delete-route')
 
 function toExpression (domain, alias) {
   return `match_recipient("${alias.from}@${domain}")`
 }
 
-
 function toActions (alias) {
-  var to = Array.isArray(alias.to) ? alias.to : [ alias.to ]
+  const to = Array.isArray(alias.to) ? alias.to : [alias.to]
   return to.map(function (to) {
     return `forward("${to}")`
-  }).concat([ `stop()` ])
+  }).concat(['stop()'])
 }
 
-
 function diff (domain, a1, a2) {
   a2 = a2.slice()
 
   return a1.filter(function (alias1) {
     return !a2.some(function (alias2, i) {
-      if (alias2.expression == alias1.expression && equal(alias2.actions, alias1.actions)) {
+      if (alias2.expression === alias1.expression && equal(alias2.actions, alias1.actions)) {
         a2.splice(i, 1) // remove it so we don't match duplicates
         return true
       }
     })
   })
 }
 
-
 function updateAliases (domain, creds, aliases, dryRun, callback) {
   function adjustRoutes (routes) {
-
-    var current = routes.items
+    const current = routes.items
 
     // adjust the incoming aliases to have .expression and .actions properties
     aliases = aliases.map(function (alias) {
       return xtend(alias, {
-          expression : toExpression(domain, alias)
-        , actions    : toActions(alias)
+        expression: toExpression(domain, alias),
+        actions: toActions(alias)
       })
     })
 
-    var toAdd    = diff(domain, aliases, current) // this diff gives us new additions
-      , toRemove = diff(domain, current, aliases) // this diff gives us stale routes
-      , done     = after(toAdd.length + toRemove.length, callback)
+    const toAdd = diff(domain, aliases, current) // this diff gives us new additions
+    const toRemove = diff(domain, current, aliases) // this diff gives us stale routes
+    const done = after(toAdd.length + toRemove.length, callback)
 
     console.log(`${toAdd.length} route(s) to add`)
     console.log(`${toRemove.length} route(s) to remove`)
 
     toAdd.forEach(function (alias) {
-      var to = Array.isArray(alias.to) ? alias.to : [ alias.to ]
+      const to = Array.isArray(alias.to) ? alias.to : [alias.to]
       console.log(`Adding ${alias.from} -> ${to.join(', ')}...`)
       if (!dryRun) {
         addRoute(domain, creds, alias.from, alias.expression, alias.actions, done)
@@ -74,11 +69,9 @@ function updateAliases (domain, creds, aliases, dryRun, callback) {
   }
 
   listRoutes(domain, creds, function (err, routes) {
-    if (err)
-      throw err
+    if (err) { throw err }
     adjustRoutes(routes)
   })
 }
 
-
 module.exports = updateAliases