@karmaniverous/get-dotenv 3.0.5 → 3.0.6

package/README.md

@@ -13,7 +13,7 @@ Load environment variables with a cascade of environment-aware dotenv files. You
 
 `getdotenv` relies on the excellent [`dotenv`](https://www.npmjs.com/package/dotenv) parser and uses [`dotenv-expand`](https://www.npmjs.com/package/dotenv-expand) for recursive variable expansion.
 
-The command-line version populates `process.env` from your dotenv files (you can also specify values inline) and can then execute a shell command within that context. The executing shell is configurable. Any child `getdotenv` instances will inherit as defaults the parent shell's environment and optionally its `getdotenv` settings.
+The command-line version populates `process.env` from your dotenv files (you can also specify values inline) and can then execute a shell command within that context. Any child `getdotenv` instances will inherit as defaults the parent shell's environment and optionally its `getdotenv` settings.
 
 You can always use `getdotenv` directly on the command line, but its REAL power comes into play when you use it as the foundation of your own CLI. This lets you set defaults globally and configure pre- and post-hooks that mutate your `getdotenv` context and do useful things like grab an AWS session from your dev environment and add it to the command execution context.
 
@@ -102,7 +102,6 @@ Options:
   -L, --log-off                console log extracted variables OFF (default)
   -x, --suppress-dotenv        suppress dotenv loading (default: false)
   -c, --command <string>       shell command string
-  -s, --shell <string>         execa shell option
   --dotenv-token <string>      token indicating a dotenv file (default: ".env")
   --private-token <string>     token indicating private variables (default: "local")
   -D, --debug                  debug mode
@@ -216,7 +215,6 @@ GetDotenv CLI Options type
 | [outputPath] | <code>string</code> | if populated, writes consolidated .env file to this path (follows [dotenv-expand rules](https://github.com/motdotla/dotenv-expand/blob/master/tests/.env)) |
 | [paths] | <code>string</code> | space-delimited list of input directory paths |
 | [privateToken] | <code>string</code> | token indicating private variables. |
-| [shell] | <code>string</code> | execa shell option |
 | [suppressDotenv] | <code>bool</code> | suppress dotenv loading |
 
 <a name="GetDotenvPreHookCallback"></a>

package/dist/default/lib/getCli.js

@@ -39,7 +39,6 @@ const booleanExpand = value => (0, _boolean.boolean)((0, _dotenvExpand.dotenvExp
  * @property {string} [outputPath] - if populated, writes consolidated .env file to this path (follows {@link https://github.com/motdotla/dotenv-expand/blob/master/tests/.env dotenv-expand rules})
  * @property {string} [paths] - space-delimited list of input directory paths
  * @property {string} [privateToken] - token indicating private variables.
- * @property {string} [shell] - execa shell option
  * @property {bool} [suppressDotenv] - suppress dotenv loading
  */
 
@@ -100,7 +99,6 @@ const getCli = function () {
     paths,
     pathsDelimiter = '\\s+',
     privateToken,
-    shell,
     suppressDotenv,
     vars,
     varsAssignor = '=',
@@ -110,16 +108,15 @@ const getCli = function () {
     ...defaultOptions
   };
   if (Array.isArray(paths)) paths = paths.join(' ');
-  return new _commander.Command().name(cliInvocation).description('Base CLI. All options except delimiters follow dotenv-expand rules.').enablePositionalOptions().passThroughOptions().option('-e, --env <string>', 'target environment', _dotenvExpand.dotenvExpand, env).option('--default-env <string>', 'default target environment', _dotenvExpand.dotenvExpand, defaultEnv).option('-p, --paths <string>', 'delimited list of paths to dotenv directory', _dotenvExpand.dotenvExpand, paths).option('--paths-delimiter <string>', 'regex paths delimiter', pathsDelimiter).option('-v, --vars <string>', 'delimited list KEY=VALUE pairs', _dotenvExpand.dotenvExpand, vars).option('--vars-delimiter <string>', 'regex vars delimiter', varsDelimiter).option('--vars-assignor <string>', 'regex vars assignment operator', varsAssignor).option('-y, --dynamic-path <string>', 'dynamic variables path', _dotenvExpand.dotenvExpand, dynamicPath).option('-o, --output-path <string>', 'consolidated output file, follows dotenv-expand rules using loaded env vars', _dotenvExpand.dotenvExpand, outputPath).addOption(new _commander.Option('-n, --exclude-env', `exclude environment-specific variables${excludeEnv ? ' (default)' : ''}`).conflicts('excludeEnvOff')).addOption(new _commander.Option('-N, --exclude-env-off', `exclude environment-specific variables OFF${!excludeEnv ? ' (default)' : ''}`).conflicts('excludeEnv')).addOption(new _commander.Option('-g, --exclude-global', `exclude global variables${excludeGlobal ? ' (default)' : ''}`).conflicts('excludeGlobalOff')).addOption(new _commander.Option('-G, --exclude-global-off', `exclude global variables OFF${!excludeGlobal ? ' (default)' : ''}`).conflicts('excludeGlobal')).addOption(new _commander.Option('-r, --exclude-private', `exclude private variables${excludePrivate ? ' (default)' : ''}`).conflicts('excludePrivateOff')).addOption(new _commander.Option('-R, --exclude-private-off', `exclude private variables OFF${!excludePrivate ? ' (default)' : ''}`).conflicts('excludePrivate')).addOption(new _commander.Option('-u, --exclude-public', `exclude public variables${excludePublic ? ' (default)' : ''}`).conflicts('excludePublicOff')).addOption(new _commander.Option('-U, --exclude-public-off', `exclude public variables OFF${!excludePublic ? ' (default)' : ''}`).conflicts('excludePublic')).addOption(new _commander.Option('-z, --exclude-dynamic', `exclude dynamic variables${excludeDynamic ? ' (default)' : ''}`).conflicts('excludeDynamicOff')).addOption(new _commander.Option('-Z, --exclude-dynamic-off', `exclude dynamic variables OFF${!excludeDynamic ? ' (default)' : ''}`).conflicts('excludeDynamic')).addOption(new _commander.Option('-l, --log', `console log extracted variables${log ? ' (default)' : ''}`).conflicts('logOff')).addOption(new _commander.Option('-L, --log-off', `console log extracted variables OFF${!log ? ' (default)' : ''}`).conflicts('log')).option('-x, --suppress-dotenv', 'suppress dotenv loading', booleanExpand, suppressDotenv ?? false).option('-c, --command <string>', 'shell command string', _dotenvExpand.dotenvExpand, command).option('-s, --shell <string>', 'execa shell option', _dotenvExpand.dotenvExpand, shell).option('--dotenv-token <string>', 'token indicating a dotenv file', _dotenvExpand.dotenvExpand, dotenvToken).option('--private-token <string>', 'token indicating private variables', _dotenvExpand.dotenvExpand, privateToken).option('-D, --debug', 'debug mode').addCommand(new _commander.Command().name('cmd').description('execute shell command string (default command)').configureHelp({
+  return new _commander.Command().name(cliInvocation).description('Base CLI. All options except delimiters follow dotenv-expand rules.').enablePositionalOptions().passThroughOptions().option('-e, --env <string>', 'target environment', _dotenvExpand.dotenvExpand, env).option('--default-env <string>', 'default target environment', _dotenvExpand.dotenvExpand, defaultEnv).option('-p, --paths <string>', 'delimited list of paths to dotenv directory', _dotenvExpand.dotenvExpand, paths).option('--paths-delimiter <string>', 'regex paths delimiter', pathsDelimiter).option('-v, --vars <string>', 'delimited list KEY=VALUE pairs', _dotenvExpand.dotenvExpand, vars).option('--vars-delimiter <string>', 'regex vars delimiter', varsDelimiter).option('--vars-assignor <string>', 'regex vars assignment operator', varsAssignor).option('-y, --dynamic-path <string>', 'dynamic variables path', _dotenvExpand.dotenvExpand, dynamicPath).option('-o, --output-path <string>', 'consolidated output file, follows dotenv-expand rules using loaded env vars', _dotenvExpand.dotenvExpand, outputPath).addOption(new _commander.Option('-n, --exclude-env', `exclude environment-specific variables${excludeEnv ? ' (default)' : ''}`).conflicts('excludeEnvOff')).addOption(new _commander.Option('-N, --exclude-env-off', `exclude environment-specific variables OFF${!excludeEnv ? ' (default)' : ''}`).conflicts('excludeEnv')).addOption(new _commander.Option('-g, --exclude-global', `exclude global variables${excludeGlobal ? ' (default)' : ''}`).conflicts('excludeGlobalOff')).addOption(new _commander.Option('-G, --exclude-global-off', `exclude global variables OFF${!excludeGlobal ? ' (default)' : ''}`).conflicts('excludeGlobal')).addOption(new _commander.Option('-r, --exclude-private', `exclude private variables${excludePrivate ? ' (default)' : ''}`).conflicts('excludePrivateOff')).addOption(new _commander.Option('-R, --exclude-private-off', `exclude private variables OFF${!excludePrivate ? ' (default)' : ''}`).conflicts('excludePrivate')).addOption(new _commander.Option('-u, --exclude-public', `exclude public variables${excludePublic ? ' (default)' : ''}`).conflicts('excludePublicOff')).addOption(new _commander.Option('-U, --exclude-public-off', `exclude public variables OFF${!excludePublic ? ' (default)' : ''}`).conflicts('excludePublic')).addOption(new _commander.Option('-z, --exclude-dynamic', `exclude dynamic variables${excludeDynamic ? ' (default)' : ''}`).conflicts('excludeDynamicOff')).addOption(new _commander.Option('-Z, --exclude-dynamic-off', `exclude dynamic variables OFF${!excludeDynamic ? ' (default)' : ''}`).conflicts('excludeDynamic')).addOption(new _commander.Option('-l, --log', `console log extracted variables${log ? ' (default)' : ''}`).conflicts('logOff')).addOption(new _commander.Option('-L, --log-off', `console log extracted variables OFF${!log ? ' (default)' : ''}`).conflicts('log')).option('-x, --suppress-dotenv', 'suppress dotenv loading', booleanExpand, suppressDotenv ?? false).option('-c, --command <string>', 'shell command string', _dotenvExpand.dotenvExpand, command).option('--dotenv-token <string>', 'token indicating a dotenv file', _dotenvExpand.dotenvExpand, dotenvToken).option('--private-token <string>', 'token indicating private variables', _dotenvExpand.dotenvExpand, privateToken).option('-D, --debug', 'debug mode').addCommand(new _commander.Command().name('cmd').description('execute shell command string (default command)').configureHelp({
     showGlobalOptions: true
   }).enablePositionalOptions().passThroughOptions().action(async (options, _ref) => {
     let {
-      args,
-      parent
+      args
     } = _ref;
-    if (args.length) await (0, _execa.execaCommand)(args.join(' '), {
+    if (args.length) await (0, _execa.execaCommand)(args.join('\\ '), {
       stdio: 'inherit',
-      shell: parent.opts().shell
+      shell: true
     });
   }), {
     isDefault: true
@@ -193,9 +190,9 @@ const getCli = function () {
     if (postHook) await postHook(options, dotenv);
 
     // Execute shell command.
-    if (command) await (0, _execa.execaCommand)(command, {
+    if (command) await (0, _execa.execaCommand)(command.replace(/ /g, '\\ '), {
       stdio: 'inherit',
-      shell
+      shell: true
     });
   });
 };

package/lib/getCli.js

@@ -32,7 +32,6 @@ const booleanExpand = (value) => boolean(dotenvExpand(value));
  * @property {string} [outputPath] - if populated, writes consolidated .env file to this path (follows {@link https://github.com/motdotla/dotenv-expand/blob/master/tests/.env dotenv-expand rules})
  * @property {string} [paths] - space-delimited list of input directory paths
  * @property {string} [privateToken] - token indicating private variables.
- * @property {string} [shell] - execa shell option
  * @property {bool} [suppressDotenv] - suppress dotenv loading
  */
 
@@ -88,7 +87,6 @@ export const getCli = ({ defaultOptions = {}, preHook, postHook } = {}) => {
     paths,
     pathsDelimiter = '\\s+',
     privateToken,
-    shell,
     suppressDotenv,
     vars,
     varsAssignor = '=',
@@ -237,7 +235,6 @@ export const getCli = ({ defaultOptions = {}, preHook, postHook } = {}) => {
       dotenvExpand,
       command
     )
-    .option('-s, --shell <string>', 'execa shell option', dotenvExpand, shell)
     .option(
       '--dotenv-token <string>',
       'token indicating a dotenv file',
@@ -258,11 +255,11 @@ export const getCli = ({ defaultOptions = {}, preHook, postHook } = {}) => {
         .configureHelp({ showGlobalOptions: true })
         .enablePositionalOptions()
         .passThroughOptions()
-        .action(async (options, { args, parent }) => {
+        .action(async (options, { args }) => {
           if (args.length)
-            await execaCommand(args.join(' '), {
+            await execaCommand(args.join('\\ '), {
               stdio: 'inherit',
-              shell: parent.opts().shell,
+              shell: true,
             });
         }),
       { isDefault: true }
@@ -352,9 +349,9 @@ export const getCli = ({ defaultOptions = {}, preHook, postHook } = {}) => {
 
       // Execute shell command.
       if (command)
-        await execaCommand(command, {
+        await execaCommand(command.replace(/ /g, '\\ '), {
           stdio: 'inherit',
-          shell,
+          shell: true,
         });
     });
 };

package/package.json

@@ -3,7 +3,7 @@
   "bin": {
     "getdotenv": "bin/getdotenv/index.js"
   },
-  "version": "3.0.5",
+  "version": "3.0.6",
   "publishConfig": {
     "access": "public"
   },