heroku 8.7.2-beta.2 → 8.7.2-beta.4

package/README.md

@@ -56,7 +56,6 @@ For other issues, [submit a support ticket](https://help.heroku.com/).
 * [`heroku logs`](docs/logs.md) - display recent log output
 * [`heroku maintenance`](docs/maintenance.md) - enable/disable access to app
 * [`heroku members`](docs/members.md) - manage organization members
-* [`heroku notifications`](docs/notifications.md) - display notifications
 * [`heroku orgs`](docs/orgs.md) - manage organizations
 * [`heroku pg`](docs/pg.md) - manage postgresql databases
 * [`heroku pipelines`](docs/pipelines.md) - manage pipelines
@@ -65,7 +64,6 @@ For other issues, [submit a support ticket](https://help.heroku.com/).
 * [`heroku psql`](docs/psql.md) - open a psql shell to the database
 * [`heroku redis`](docs/redis.md) - manage heroku redis instances
 * [`heroku regions`](docs/regions.md) - list available regions for deployment
-* [`heroku releases`](docs/releases.md) - display the releases for an app
 * [`heroku reviewapps`](docs/reviewapps.md) - manage reviewapps in pipelines
 * [`heroku run`](docs/run.md) - run a one-off process inside a Heroku dyno
 * [`heroku sessions`](docs/sessions.md) - OAuth sessions
@@ -85,15 +83,14 @@ This project is built with [lerna](https://lerna.js.org/). The core plugins are
 
 After cloning the repo
 1. Run `yarn` to install dependencies
-2. Run `yarn lerna bootstrap` set up Lerna and link the packages together
-    - This repo currently uses an older version of Lerna. We recommend using the version specified in the package.json instead of a newer version that you may have installed globally.
+2. Run `yarn build` to build the CLI. This will need to be re-run any time you make changes and want to test them locally.
 
 To execute Heroku CLI commands locally, use `./bin/run <command>`. For example, to run the `heroku apps` command with your local code, run `./bin/run apps` from the root directory.
 
 Testing
 =======
 
-Run all tests with `yarn lerna run test`.
+Run all tests with `yarn test`.
 
 Run one test, in this case plugin-certs-v5, with `yarn lerna run --scope @heroku-cli/plugin-certs-v5 test`.
 

package/lib/commands/local/index.d.ts

@@ -9,7 +9,7 @@ export default class Index extends Command {
     static flags: {
         procfile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         env: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        port: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        port: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         restart: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         concurrency: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };

package/lib/commands/local/index.js

@@ -61,7 +61,6 @@ Index.flags = {
     port: core_1.Flags.string({
         char: 'p',
         description: 'port to listen on',
-        default: '5001',
     }),
     restart: core_1.Flags.boolean({
         char: 'r',

package/lib/commands/local/run.d.ts

@@ -5,7 +5,7 @@ export default class Run extends Command {
     static strict: boolean;
     static flags: {
         env: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        port: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        port: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/local/run.js

@@ -33,6 +33,5 @@ Run.flags = {
     }),
     port: core_1.Flags.string({
         char: 'p',
-        default: '5001',
     }),
 };

package/lib/lib/local/run-foreman.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/lib/local/run-foreman.js

@@ -1,2 +1,230 @@
 "use strict";
-require('foreman/nf.js');
+// Copyright IBM Corp. 2012,2015. All Rights Reserved.
+// Node module: foreman
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+// This file is copied from the Node Foreman package. It was copied in order to fix
+// a bug related to the use of port 5000 as a default. It is not meant to be a
+// long-term solution, we plan to eventually remove our dependency on Node Foreman.
+// These rules are disabled in order to prevent the need for refactoring
+/* eslint-disable guard-for-in */
+/* eslint-disable new-cap */
+const path = require('path');
+const events = require('events');
+const fs = require('fs');
+const quote = require('shell-quote').quote;
+const program = require('commander');
+const colors = require('foreman/lib/colors');
+const display = require('foreman/lib/console').Console;
+const _proc = require('foreman/lib/proc');
+const _procfile = require('foreman/lib/procfile');
+const _envs = require('foreman/lib/envs');
+const _requirements = require('foreman/lib/requirements');
+const startProxies = require('foreman/lib/proxy').startProxies;
+const startForward = require('foreman/lib/forward').startForward;
+const exporters = require('foreman/lib/exporters');
+const foremanPjson = require('foreman/package.json');
+program.version(foremanPjson.version);
+program.option('-j, --procfile <FILE>', 'load procfile FILE', 'Procfile');
+program.option('-e, --env      <FILE>', 'load environment from FILE, a comma-separated list', '.env');
+program.option('-p, --port     <PORT>', 'start indexing ports at number PORT', 0);
+// Foreman Event Bus/Emitter //
+var emitter = new events.EventEmitter();
+emitter.once('killall', function (signal) {
+    display.Done('Killing all processes with signal ', signal);
+});
+emitter.setMaxListeners(50);
+var start = _proc.start;
+var once = _proc.once;
+var loadProc = _procfile.loadProc;
+var loadEnvs = _envs.loadEnvs;
+var getreqs = _requirements.getreqs;
+var calculatePadding = _requirements.calculatePadding;
+// Kill All Child Processes on SIGINT
+process.once('SIGINT', function () {
+    display.Warn('Interrupted by User');
+    emitter.emit('killall', 'SIGINT');
+});
+program
+    .command('start [procs]')
+    .usage('[Options] [Processes] e.g. web=1,log=2,api')
+    .option('-s, --showenvs', 'show ENV variables on start', false)
+    .option('-x, --proxy     <PORT>', 'start a load balancing proxy on PORT')
+    .option('--ssl-key       <KEY FILE>', 'a key file to use when proxying SSL')
+    .option('--ssl-cert      <CERT FILE>', 'a cert file to use when proxying SSL')
+    .option('-f, --forward   <PORT>', 'start a forward proxy on PORT')
+    .option('-i, --intercept <HOSTNAME>', 'set forward proxy to intercept HOSTNAME', null)
+    .option('-r, --raw', 'raw log output with no app name, timestamp, wrap or trim', false)
+    .option('-t, --trim      <N>', 'trim logs to N characters', 0)
+    .option('-w, --wrap', 'wrap logs (negates trim)')
+    .description('Start the jobs in the Procfile')
+    .action(function (args) {
+    var envs = loadEnvs(program.env);
+    var proc = loadProc(program.procfile);
+    if (!proc) {
+        return;
+    }
+    if (this.showenvs) {
+        for (var key in envs) {
+            display.Alert('env %s=%s', key, envs[key]);
+        }
+    }
+    var reqs = getreqs(args, proc);
+    display.padding = calculatePadding(reqs);
+    display.raw = this.raw;
+    if (this.wrap) {
+        display.wrapline = process.stdout.columns - display.padding - 7;
+        display.trimline = 0;
+        display.Alert('Wrapping display Output to %d Columns', display.wrapline);
+    }
+    else {
+        display.trimline = this.trim;
+        if (display.trimline > 0) {
+            display.Alert('Trimming display Output to %d Columns', display.trimline);
+        }
+    }
+    if (this.forward) {
+        startForward(this.forward, this.intercept, emitter);
+    }
+    // using port 5006 because it is not known to be used by other common software
+    startProxies(reqs, proc, this, emitter, program.port || envs.PORT || process.env.PORT || 5006);
+    start(proc, reqs, envs, program.port || envs.PORT || process.env.PORT || 5006, emitter);
+});
+program
+    .command('run <COMMAND...>')
+    .usage('[Options]')
+    .option('-s, --showenvs', 'show ENV variables on start', false)
+    .description('Run a one off process using the ENV variables')
+    .action(function (args) {
+    var envs = loadEnvs(program.env);
+    var callback = function (code) {
+        process.exit(code);
+    };
+    if (!args || args.length === 0) {
+        return;
+    }
+    var input = quote(args);
+    if (this.showenvs) {
+        for (var key in envs) {
+            display.Alert('env %s=%s', key, envs[key]);
+        }
+    }
+    display.trimline = process.stdout.columns - 5;
+    once(input, envs, callback);
+});
+program
+    .command('export [PROCS]')
+    .option('-a, --app  <NAME>', 'export upstart application as NAME', 'foreman')
+    .option('-u, --user <NAME>', 'export upstart user as NAME', 'root')
+    .option('-o, --out  <DIR>', 'export upstart files to DIR', '.')
+    .option('-c, --cwd  <DIR>', 'change current working directory to DIR')
+    .option('-g, --gid  <GID>', 'set gid of upstart config to GID')
+    .option('-l, --log  <DIR>', 'specify upstart log directory', '/var/log')
+    .option('-t, --type <TYPE>', 'export file to TYPE (default upstart)', 'upstart')
+    .option('-m, --template <DIR>', 'use template folder')
+    .description('Export to an upstart job independent of foreman')
+    .action(function (procArgs) {
+    var envs = loadEnvs(program.env);
+    var procs = loadProc(program.procfile);
+    if (!procs) {
+        return;
+    }
+    var req = getreqs(procArgs, procs);
+    // Variables for Upstart Template
+    var config = {
+        application: this.app,
+        cwd: path.resolve(process.cwd(), this.cwd || ''),
+        user: this.user,
+        logs: this.log,
+        envs: envs,
+        group: this.gid || this.user,
+        template: this.template,
+    };
+    config.envfile = path.resolve(program.env);
+    var writeout;
+    if (exporters[this.type]) {
+        writeout = exporters[this.type];
+    }
+    else {
+        display.Error('Unknown Export Format', this.type);
+        process.exit(1);
+    }
+    // Check for Upstart User
+    // friendly warning - does not stop export
+    var userExists = false;
+    fs.readFileSync('/etc/passwd')
+        .toString().split(/\n/).forEach(function (line) {
+        if (line.match(/^[^:]*/)[0] === config.user) {
+            userExists = true;
+        }
+    });
+    if (!userExists) {
+        display.Warn(display.fmt('User %s Does Not Exist on System', config.user));
+    }
+    // using port 5006 because it is not known to be used by other common software
+    var baseport = Number.parseInt(program.port || envs.PORT || process.env.PORT || 5006);
+    var baseport_i = 0;
+    var baseport_j = 0;
+    var envl = [];
+    config.processes = [];
+    // This is ugly because of shitty support for array copying
+    // Cleanup is definitely required
+    for (var key in req) {
+        var c = {};
+        var cmd = procs[key];
+        if (!cmd) {
+            display.Warn("Required Key '%s' Does Not Exist in Procfile Definition", key);
+            continue;
+        }
+        var n = req[key];
+        config.processes.push({ process: key, n: n });
+        c.process = key;
+        c.command = cmd;
+        for (var _ in config) {
+            c[_] = config[_];
+        }
+        c.numbers = [];
+        for (var i = 1; i <= n; i++) {
+            const port = (baseport + baseport_i + baseport_j) * 100;
+            const envl = [];
+            for (key in envs) {
+                envl.push({
+                    key: key,
+                    value: envs[key],
+                });
+            }
+            envl.push({ key: 'PORT', value: conf.port });
+            // eslint-disable-next-line unicorn/no-array-push-push
+            envl.push({ key: 'FOREMAN_WORKER_NAME', value: conf.process + '.' + conf.number });
+            conf.envs = envl;
+            const conf = Object.assign(Object.assign({}, c), { number: i, port, envs: envl });
+            // Write the APP-PROCESS-N.conf File
+            writeout.foreman_app_n(conf, this.out);
+            baseport_i++;
+            c.numbers.push({ number: i });
+        }
+        envl = [];
+        for (key in envs) {
+            envl.push({
+                key: key,
+                value: envs[key],
+            });
+        }
+        c.envs = envl;
+        // Write the APP-Process.conf File
+        writeout.foreman_app(c, this.out);
+        baseport_i = 0;
+        baseport_j++;
+    }
+    // Write the APP.conf File
+    writeout.foreman(config, this.out);
+});
+program.parse(process.argv);
+if (process.argv.slice(2).length === 0) {
+    console.log(colors.cyan('   _____                           '));
+    console.log(colors.cyan('  |   __|___ ___ ___ _____ ___ ___ '));
+    console.log(colors.yellow('  |   __| . |  _| -_|     |   |   |'));
+    console.log(colors.magenta('  |__|  |___|_| |___|_|_|_|_^_|_|_|'));
+    program.outputHelp();
+    process.exit(1);
+}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.7.2-beta.2",
+  "version": "8.7.2-beta.4",
   "commands": {
     "console": {
       "id": "console",
@@ -1876,8 +1876,7 @@
           "type": "option",
           "char": "p",
           "description": "port to listen on",
-          "multiple": false,
-          "default": "5001"
+          "multiple": false
         },
         "restart": {
           "name": "restart",
@@ -1925,8 +1924,7 @@
           "name": "port",
           "type": "option",
           "char": "p",
-          "multiple": false,
-          "default": "5001"
+          "multiple": false
         }
       },
       "args": {}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "8.7.2-beta.2",
+  "version": "8.7.2-beta.4",
   "author": "Jeff Dickey @jdxcode",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -11,11 +11,11 @@
     "@heroku-cli/command-v9": "npm:@heroku-cli/command@^9.0.2",
     "@heroku-cli/notifications": "^1.2.2",
     "@heroku-cli/plugin-addons-v5": "^8.6.0",
-    "@heroku-cli/plugin-apps-v5": "^8.6.0",
+    "@heroku-cli/plugin-apps-v5": "^8.7.2-beta.4",
     "@heroku-cli/plugin-certs-v5": "^8.6.0",
-    "@heroku-cli/plugin-ci-v5": "^8.7.2-beta.2",
+    "@heroku-cli/plugin-ci-v5": "^8.7.2-beta.3",
     "@heroku-cli/plugin-container-registry-v5": "^8.6.0",
-    "@heroku-cli/plugin-orgs-v5": "^8.7.2-beta.2",
+    "@heroku-cli/plugin-orgs-v5": "^8.7.2-beta.3",
     "@heroku-cli/plugin-pg-v5": "^8.7.0",
     "@heroku-cli/plugin-ps": "^8.1.7",
     "@heroku-cli/plugin-ps-exec": "^2.4.0",
@@ -46,6 +46,7 @@
     "ansi-escapes": "3.2.0",
     "async-file": "^2.0.2",
     "chalk": "^2.4.2",
+    "commander": "^2.15.1",
     "date-fns": "^2.30.0",
     "debug": "4.1.1",
     "edit-string": "^1.1.6",
@@ -64,7 +65,7 @@
     "rollbar": "^2.26.2",
     "semver": "5.6.0",
     "shell-escape": "^0.2.0",
-    "shell-quote": "^1.6.1",
+    "shell-quote": "^1.8.1",
     "tmp": "^0.0.33",
     "true-myth": "2.2.3",
     "tslib": "1.14.1",
@@ -91,6 +92,7 @@
     "@types/phoenix": "^1.4.0",
     "@types/proxyquire": "^1.3.28",
     "@types/shell-escape": "^0.2.0",
+    "@types/shell-quote": "^1.7.5",
     "@types/supports-color": "^5.3.0",
     "@types/urijs": "^1.19.4",
     "@types/uuid": "^8.3.0",
@@ -343,5 +345,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "be85d7135e4edb712e379b60a11e2e8425231362"
+  "gitHead": "a789932e6ea415d0ed841738c02c7d652df0d21a"
 }