cli-engine-heroku - npm Package Compare versions

Comparing version 0.3.1 to 0.3.2

lib/flags/index.js

@@ -6,4 +6,13 @@ 'use strict';
 });
-exports.flags = undefined;
+exports.merge = exports.flags = undefined;
 
+var _lodash = require('lodash.merge');
+
+Object.defineProperty(exports, 'merge', {
+  enumerable: true,
+  get: function () {
+    return _interopRequireDefault(_lodash).default;
+  }
+});
+
 var _team = require('./team');
@@ -10,0 +19,0 @@

lib/flags/org.js

@@ -8,6 +8,5 @@ 'use strict';
 
-require('cli-engine-command/lib/flags');
+var _flags = require('cli-engine-command/lib/flags');
 
 function OrgFlag(options = {}, env = process.env) {
-  const envTeam = env.HEROKU_ORGANIZATION;
   const defaultOptions = {
@@ -18,7 +17,7 @@ char: 'o',
       if (input) return input;
-      if (envTeam) return envTeam;
+      if (env.HEROKU_ORGANIZATION) return env.HEROKU_ORGANIZATION;
       if (options.required) throw new Error('No org specified');
     }
   };
-  return Object.assign(defaultOptions, options);
+  return (0, _flags.merge)(defaultOptions, options);
 }

lib/flags/team.js

@@ -8,6 +8,5 @@ 'use strict';
 
-require('cli-engine-command/lib/flags');
+var _flags = require('cli-engine-command/lib/flags');
 
 function TeamFlag(options = {}, env = process.env) {
-  const envTeam = env.HEROKU_TEAM || env.HEROKU_ORGANIZATION;
   const defaultOptions = {
@@ -18,8 +17,9 @@ char: 't',
       if (input) return input;
-      if (envTeam) return envTeam;
+      if (env.HEROKU_TEAM) return env.HEROKU_TEAM;
       if (cmd && cmd.flags.org) return cmd.flags.org;
+      if (env.HEROKU_ORGANIZATION) return env.HEROKU_ORGANIZATION;
       if (options.required) throw new Error('No team specified');
     }
   };
-  return Object.assign(defaultOptions, options);
+  return (0, _flags.merge)(defaultOptions, options);
 }

package.json

 {
   "name": "cli-engine-heroku",
   "description": "heroku specific functionality for the cli-engine",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "author": "Jeff Dickey @dickeyxxx",
@@ -9,3 +9,4 @@ "bugs": "https://github.com/heroku/cli-engine-heroku/issues",
     "cli-engine-command": "4.0.3",
-    "heroku-client": "3.0.2"
+    "heroku-client": "3.0.2",
+    "lodash.merge": "4.6.0"
   },
@@ -12,0 +13,0 @@ "devDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

12518

2.69%

Lines of code

177

3.51%

Worsened metrics

Dependency count

3

50%

Dependency changes

• + Added

  lodash.merge@4.6.0