@heroku/skynet 1.4.1 → 1.4.3

package/commands/categories.js

@@ -5,7 +5,7 @@ let SkynetAPI = require('../lib/skynet')
 
 function * run (context) {
   sudo()
-  const skynet = new SkynetAPI(context.version, context.auth.password)
+  const skynet = new SkynetAPI(context.auth.password)
   let response = yield skynet.categories()
   response = JSON.parse(response)
   cli.table(response, {
@@ -19,7 +19,7 @@ function * run (context) {
 module.exports = {
   topic: 'skynet',
   command: 'categories',
-  description: 'categories to use for suspension and deprovisions',
+  description: '(requires sudo) categories to use for suspension and deprovisions',
   help: `Examples:
     $ heroku skynet:categories`,
   flags: [],

package/commands/deprovision.js

@@ -28,7 +28,7 @@ function readlines (file) {
 
 function * run (context) {
   sudo()
-  const skynet = new SkynetAPI(context.version, context.auth.password)
+  const skynet = new SkynetAPI(context.auth.password)
   let user = context.flags.user || process.env.HEROKU_USER
   let file = context.flags.infile
   let notes = context.flags.notes
@@ -56,7 +56,7 @@ function * run (context) {
 module.exports = {
   topic: 'skynet',
   command: 'deprovision',
-  description: 'suspends a user and deprovisions all addons',
+  description: '(requires sudo) suspends a user and deprovisions all addons',
   help: `Examples:
     $ heroku skynet:deprovision -u foo@bar.com -n "helpful suspend message" -c "spam"`,
   flags: [

package/commands/suspend/app-owner.js

@@ -28,7 +28,7 @@ function readlines (file) {
 
 function * run (context) {
   sudo()
-  const skynet = new SkynetAPI(context.version, context.auth.password)
+  const skynet = new SkynetAPI(context.auth.password)
   let app = context.flags.app
   let file = context.flags.infile
   let notes = context.flags.notes
@@ -56,7 +56,7 @@ function * run (context) {
 module.exports = {
   topic: 'skynet',
   command: 'suspend:app-owner',
-  description: 'suspends the owner of a given app',
+  description: '(requires sudo) suspends the owner of a given app',
   help: `Examples:
     $ heroku skynet:suspend:app-owner -a foobar -n "helpful suspend message" -c "ddos"`,
   flags: [

package/commands/suspend/apps.js

@@ -5,7 +5,7 @@ let SkynetAPI = require('../../lib/skynet')
 
 function * run (context) {
   sudo()
-  const skynet = new SkynetAPI(context.version, context.auth.password)
+  const skynet = new SkynetAPI(context.auth.password)
   let response = yield skynet.suspendApp(context.flags.app, context.flags.notes)
   response = JSON.parse(response)
   cli.log(`suspending...${cli.color.cyan(response.status)}.\n${response.message}`)
@@ -14,7 +14,7 @@ function * run (context) {
 module.exports = {
   topic: 'skynet',
   command: 'suspend:app',
-  description: 'suspends an app',
+  description: '(requires sudo) suspends an app',
   help: `Examples:
     $ heroku skynet:suspend:app -a test-app -n "helpful suspend message"`,
   flags: [

package/commands/suspend/user.js

@@ -28,12 +28,13 @@ function readlines (file) {
 
 function * run (context) {
   sudo()
-  const skynet = new SkynetAPI(context.version, context.auth.password)
+  const skynet = new SkynetAPI(context.auth.password)
   let user = context.flags.user || process.env.HEROKU_USER
   let file = context.flags.infile
   let notes = context.flags.notes
   let category = context.flags.category
   let force = context.flags.bypass
+  let notify = !context.flags['no-notify']
 
   if (user && file) {
     throw new Error('Either --user USER or --infile must be passed, but not both')
@@ -47,7 +48,7 @@ function * run (context) {
       throw new Error('Required flag: --user USER or --infile FILE')
     }
 
-    let response = yield cli.action(`suspending ${cli.color.cyan(user)}`, skynet.suspendUser(user, notes, category, force))
+    let response = yield cli.action(`suspending ${cli.color.cyan(user)}`, skynet.suspendUser(user, notes, category, notify, force))
     response = JSON.parse(response)
     cli.log(`${response.status}. ${response.message}`)
   }
@@ -56,15 +57,16 @@ function * run (context) {
 module.exports = {
   topic: 'skynet',
   command: 'suspend:user',
-  description: 'suspends a user',
+  description: '(requires sudo) suspends a user',
   help: `Examples:
-    $ heroku skynet:suspend:user -u foo@bar.com -n "helpful suspend message" -c "ddos"`,
+    $ heroku sudo skynet:suspend:user -u foo@bar.com -n "helpful suspend message" -c "ddos"`,
   flags: [
     {name: 'user', char: 'u', description: 'user to suspend', hasValue: true},
     {name: 'infile', char: 'i', description: 'file of users to suspend', hasValue: true},
     {name: 'category', char: 'c', description: 'suspension category', hasValue: true, required: true},
     {name: 'notes', char: 'n', description: 'suspend notes', hasValue: true, required: true},
-    {name: 'bypass', description: 'bypass the whitelist', hasValue: false, required: false}
+    {name: 'bypass', description: 'bypass the whitelist', hasValue: false, required: false},
+    {name: 'no-notify', description: 'skip user suspension email notification', hasValue: false, required: false}
   ],
   run: cli.command(co.wrap(run))
 }

package/commands/unsuspend/apps.js

@@ -5,7 +5,7 @@ let SkynetAPI = require('../../lib/skynet')
 
 function * run (context) {
   sudo()
-  const skynet = new SkynetAPI(context.version, context.auth.password)
+  const skynet = new SkynetAPI(context.auth.password)
   let response = yield skynet.unsuspendApp(context.flags.app, context.flags.notes)
   response = JSON.parse(response)
   cli.log(`suspending...${cli.color.cyan(response.status)}.\n${response.message}`)
@@ -14,7 +14,7 @@ function * run (context) {
 module.exports = {
   topic: 'skynet',
   command: 'unsuspend:app',
-  description: 'unsuspends an app',
+  description: '(requires sudo) unsuspends an app',
   help: `Examples:
     $ heroku skynet:unsuspend:app -a test-app`,
   flags: [

package/commands/unsuspend/user.js

@@ -5,7 +5,7 @@ let SkynetAPI = require('../../lib/skynet')
 
 function * run (context) {
   sudo()
-  const skynet = new SkynetAPI(context.version, context.auth.password)
+  const skynet = new SkynetAPI(context.auth.password)
   let user = context.flags.user || process.env.HEROKU_USER
 
   let response = yield cli.action(`unsuspending ${cli.color.cyan(user)}`, skynet.unsuspendUser(user))
@@ -16,7 +16,7 @@ function * run (context) {
 module.exports = {
   topic: 'skynet',
   command: 'unsuspend:user',
-  description: 'unsuspends a user',
+  description: '(requires sudo) unsuspends a user',
   help: `Examples:
     $ heroku skynet:unsuspend:user -u foo@bar.com`,
   flags: [

package/commands/userpass/add.js

@@ -3,8 +3,8 @@ let co = require('co')
 let SkynetAPI = require('../../lib/skynet')
 
 function * run (context) {
-  const skynet = new SkynetAPI(context.version, context.auth.password)
-  yield cli.action(`adding ${cli.color.cyan(context.flags.userpass)} to ${cli.color.cyan(context.flags.user)}`, skynet.addUserpass(context.flags.user, context.flags.userpass))
+  const skynet = new SkynetAPI(context.auth.password)
+  yield cli.action(`adding ${cli.color.cyan(context.flags.userpass)} to ${cli.color.cyan(context.flags.user)}`, skynet.addUserpass(context.flags.user, context.flags.flag))
 }
 
 module.exports = {
@@ -15,7 +15,7 @@ module.exports = {
     $ heroku skynet:userpass:add -u foo@bar.com -f cant-install-abused-addons`,
   flags: [
     {name: 'user', char: 'u', description: 'user to apply userpass flag to', hasValue: true, required: true},
-    {name: 'userpass', char: 'f', description: 'flag to add to the given user', hasValue: true, required: true}
+    {name: 'flag', char: 'f', description: 'flag to add to the given user', hasValue: true, required: true}
   ],
   run: cli.command(co.wrap(run))
 }

package/commands/userpass/remove.js

@@ -3,8 +3,8 @@ let co = require('co')
 let SkynetAPI = require('../../lib/skynet')
 
 function * run (context) {
-  const skynet = new SkynetAPI(context.version, context.auth.password)
-  yield cli.action(`removing ${cli.color.cyan(context.flags.userpass)} from ${cli.color.cyan(context.flags.user)}`, skynet.removeUserpass(context.flags.user, context.flags.userpass))
+  const skynet = new SkynetAPI(context.auth.password)
+  yield cli.action(`removing ${cli.color.cyan(context.flags.userpass)} from ${cli.color.cyan(context.flags.user)}`, skynet.removeUserpass(context.flags.user, context.flags.flag))
 }
 
 module.exports = {
@@ -15,7 +15,7 @@ module.exports = {
     $ heroku skynet:userpass:remove -u foo@bar.com -f cant-install-abused-addons`,
   flags: [
     {name: 'user', char: 'u', description: 'user to remove user_pass from', hasValue: true, required: true},
-    {name: 'userpass', char: 'f', description: 'flag to remove from given user', hasValue: true, required: true}
+    {name: 'flag', char: 'f', description: 'flag to remove from given user', hasValue: true, required: true}
   ],
   run: cli.command(co.wrap(run))
 }

package/lib/skynet.js

@@ -3,8 +3,9 @@ const qs = require('querystring')
 const SKYNET_BASE_URL = 'https://skynet.herokai.com/api-h'
 
 module.exports = class SkynetAPI {
-  constructor (version, token) {
-    this.version = version
+  constructor (token) {
+    let packageJSON = require('../package.json')
+    this.version = `skynet-${packageJSON.version}`
     this.token = token
   }
 
@@ -53,12 +54,13 @@ module.exports = class SkynetAPI {
     })
   }
 
-  suspendAppOwner (app, notes, category) {
+  suspendAppOwner (app, notes, category, force = false) {
     var body = {
       value: app,
       reason: notes,
       method: 'skynet-cli',
-      category: category
+      category: category,
+      force: force
     }
 
     return this.request('/suspend/app-owner', {
@@ -86,13 +88,15 @@ module.exports = class SkynetAPI {
       method: 'DELETE'
     })
   }
-  suspendUser (user, notes, category, force = false) {
+
+  suspendUser (user, notes, category, notify, force = false) {
     var body = {
       value: user,
       reason: notes,
       method: 'skynet-cli',
       category: category,
-      force: force
+      force: force,
+      notify: notify
     }
 
     return this.request(`/suspend/user`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heroku/skynet",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "use Skynet from Heroku CLI",
   "main": "index.js",
   "author": "Bob Argenbright @byt3smith",