@heroku/skynet 1.7.0 → 1.9.0

package/commands/suspend/app-owner.js

@@ -2,29 +2,8 @@ const cli = require('heroku-cli-util')
 const command = require('../../lib/command')
 const sudo = require('../../lib/sudo')
 const SkynetAPI = require('../../lib/skynet')
-
-function readlines (file) {
-  return new Promise(function (resolve, reject) {
-    const split = require('split')
-    const fs = require('fs')
-
-    const users = []
-
-    fs.createReadStream(file).pipe(split())
-      .on('data', function (line) {
-        line = line.trim()
-        if (line) {
-          users.push(line)
-        }
-      })
-      .on('end', function () {
-        resolve(users)
-      })
-      .on('error', function (err) {
-        reject(err)
-      })
-  })
-}
+const utils = require('../../lib/utils')
+const chunkSize = 5
 
 async function run (context) {
   sudo()
@@ -40,9 +19,14 @@ async function run (context) {
   }
 
   if (file) {
-    const apps = await readlines(file)
-    const response = await skynet.bulkSuspendAppOwner(apps.join(), notes, category)
-    cli.log(response)
+    const apps = await utils.readlines(file)
+    const chunks = utils.arrayChunks(apps, chunkSize)
+    for (const chunk of chunks) {
+      cli.log('Suspsneding app owners: ' + chunk.join())
+      const response = await skynet.bulkSuspendAppOwner(apps.join(), notes, category)
+      cli.log(response)
+      cli.log()
+    }
   } else {
     if (!app) {
       throw new Error('Required flag: --owner OWNER or --infile FILE')

package/commands/suspend/user.js

@@ -4,29 +4,8 @@ const sudo = require('../../lib/sudo')
 const SkynetAPI = require('../../lib/skynet')
 const HerokuAPI = require('../../lib/heroku')
 const notifyOption = require('../../lib/notifyOption')
-
-function readlines (file) {
-  return new Promise(function (resolve, reject) {
-    const split = require('split')
-    const fs = require('fs')
-
-    const users = []
-
-    fs.createReadStream(file).pipe(split())
-      .on('data', function (line) {
-        line = line.trim()
-        if (line) {
-          users.push(line)
-        }
-      })
-      .on('end', function () {
-        resolve(users)
-      })
-      .on('error', function (err) {
-        reject(err)
-      })
-  })
-}
+const utils = require('../../lib/utils')
+const chunkSize = 5
 
 async function unverifyUser (api, user) {
   const resMsg = await api.unverifyUser(user)
@@ -52,9 +31,14 @@ async function run (context) {
   }
 
   if (file) {
-    const users = await readlines(file)
-    const response = await skynet.bulkSuspendUsers(users.join(), notes, category, notify, force)
-    cli.log(`${response}. Notification ${notificationStatus}`)
+    const users = await utils.readlines(file)
+    const chunks = utils.arrayChunks(users, chunkSize)
+    for (const chunk of chunks) {
+      cli.log('Suspsneding users: ' + chunk.join())
+      const response = await skynet.bulkSuspendUsers(chunk.join(), notes, category, notify, force)
+      cli.log(`${response}. Notification ${notificationStatus}`)
+      cli.log()
+    }
 
     if (unverify) {
       users.forEach(item => unverifyUser(api, item))

package/index.js

@@ -14,8 +14,6 @@ exports.commands = [
   require('./commands/unsuspend/user.js'),
   require('./commands/deprovision.js'),
   require('./commands/categories.js'),
-  require('./commands/categories/add.js'),
-  require('./commands/categories/remove.js'),
   require('./commands/whitelist/add.js'),
   require('./commands/whitelist/remove.js'),
   require('./commands/whitelists.js'),

package/lib/skynet.js

@@ -201,27 +201,6 @@ module.exports = class SkynetAPI {
     })
   }
 
-  addCategory (category, description) {
-    const body = {
-      category: category,
-      description: description
-    }
-
-    return this.request('/categories', {
-      method: 'POST',
-      body: body,
-      json: true
-    })
-  }
-
-  removeCategory (category) {
-    return this.request(`/categories/${category}`, {
-      method: 'DELETE',
-      body: {},
-      json: true
-    })
-  }
-
   suspensions (account) {
     return this.request(`/v2/suspensions/${account}`, {
       method: 'GET'

package/lib/utils.js

@@ -0,0 +1,35 @@
+exports.readlines = function (file) {
+  return new Promise(function (resolve, reject) {
+    const split = require('split')
+    const fs = require('fs')
+
+    const entries = []
+
+    fs.createReadStream(file).pipe(split())
+      .on('data', function (line) {
+        line = line.trim()
+        if (line) {
+          entries.push(line)
+        }
+      })
+      .on('end', function () {
+        resolve(entries)
+      })
+      .on('error', function (err) {
+        reject(err)
+      })
+  })
+}
+
+exports.arrayChunks = function (array, chunkSize) {
+  var chunks = []
+  if (array.length <= chunkSize) {
+    chunks.push(array)
+  } else {
+    for (var i = 0; i < array.length; i += chunkSize) {
+      chunks.push(array.slice(i, i + chunkSize))
+    }
+  }
+
+  return chunks
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heroku/skynet",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "use Skynet from Heroku CLI",
   "main": "index.js",
   "author": "Bob Argenbright @byt3smith",
@@ -22,12 +22,12 @@
     "split": "^1.0.0"
   },
   "devDependencies": {
-    "acorn": ">=6.4.1",
+    "acorn": "^6.4.1",
     "minimist": ">=1.2.2",
     "mocha": "^5.2.0",
     "mockdate": "^2.0.1",
     "nock": "^12.0.3",
-    "np": "^6.3.1",
+    "np": "^6.5.0",
     "standard": "^14.3.3",
     "unexpected": "^10.29.0"
   },

package/commands/categories/add.js

@@ -1,21 +0,0 @@
-const cli = require('heroku-cli-util')
-const command = require('../../lib/command')
-const SkynetAPI = require('../../lib/skynet')
-
-async function run (context) {
-  const skynet = new SkynetAPI(context.auth.password)
-  await cli.action(`adding new category: ${cli.color.cyan(context.flags.category)}`, skynet.addCategory(context.flags.category, context.flags.description))
-}
-
-module.exports = {
-  topic: 'skynet',
-  command: 'categories:add',
-  description: 'adds a value to suspension categories',
-  help: `Examples:
-    $ heroku sudo skynet:categories:add -c new-category -d "this is a new category"`,
-  flags: [
-    { name: 'category', char: 'c', description: 'new category value', hasValue: true, required: true },
-    { name: 'description', char: 'd', description: 'new category description', hasValue: true, required: true }
-  ],
-  run: command(run)
-}

package/commands/categories/remove.js

@@ -1,20 +0,0 @@
-const cli = require('heroku-cli-util')
-const command = require('../../lib/command')
-const SkynetAPI = require('../../lib/skynet')
-
-async function run (context) {
-  const skynet = new SkynetAPI(context.auth.password)
-  await cli.action(`removing ${cli.color.cyan(context.flags.category)} from suspension categories`, skynet.removeCategory(context.flags.category))
-}
-
-module.exports = {
-  topic: 'skynet',
-  command: 'categories:remove',
-  description: 'removes a value from suspension categories',
-  help: `Examples:
-    $ heroku sudo skynet:categories:remove -c test-category`,
-  flags: [
-    { name: 'category', char: 'c', description: 'category to remove', hasValue: true, required: true }
-  ],
-  run: command(run)
-}