@dotenvx/dotenvx 1.3.2 → 1.5.0

package/CHANGELOG.md

@@ -2,7 +2,28 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.3.2...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx/compare/v1.5.0...main)
+
+## 1.5.0
+
+### Added
+
+* add help text for dashed values on `set`. example: `dotenvx set KEY -- "- + * ÷"` ([#293](https://github.com/dotenvx/dotenvx/pull/293))
+
+### Changed
+
+* replace `@inquirer/confirm` and `ora` ([#285](https://github.com/dotenvx/dotenvx/pull/285))
+
+### Removed
+
+* remove `dotenvx ext hub`, replace with [dotenvx-ext-hub](https://github.com/dotenvx/dotenvx-ext-hub) (install there to continue using hub) ([#291](https://github.com/dotenvx/dotenvx/pull/291))
+
+## 1.4.0
+
+### Removed
+
+* remove update notice. let users decide what version they want without nagging them to update ([#288](https://github.com/dotenvx/dotenvx/pull/288))
+* remove `dotenvx hub`. still available at `dotenvx ext hub` ([#290](https://github.com/dotenvx/dotenvx/pull/290))
 
 ## 1.3.2
 

package/README.md

@@ -1071,6 +1071,18 @@ More examples
   set HELLO with encryption (.env.ci)
   ```
 
+  </details>
+* <details><summary>`set KEY -- "- + * ÷"`</summary><br>
+
+  If your value starts with a dash (`-`), then place two dashes instructing the cli that there are no more flag arguments.
+
+  ```sh
+  $ touch .env.ci
+
+  $ dotenvx set HELLO -f .env.ci -- "- + * ÷"
+  set HELLO with encryption (.env.ci)
+  ```
+
   </details>
 * <details><summary>`set KEY value --plain`</summary><br>
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.2",
+  "version": "1.5.0",
   "name": "@dotenvx/dotenvx",
   "description": "a better dotenv–from the creator of `dotenv`",
   "author": "@motdotla",
@@ -31,7 +31,7 @@
   },
   "funding": "https://dotenvx.com",
   "dependencies": {
-    "@inquirer/confirm": "^2.0.17",
+    "@clack/core": "^0.3.4",
     "arch": "^2.1.1",
     "chalk": "^4.1.2",
     "commander": "^11.1.0",
@@ -45,9 +45,7 @@
     "is-wsl": "^2.1.1",
     "object-treeify": "1.1.33",
     "open": "^8.4.2",
-    "ora": "^5.4.1",
     "picomatch": "^3.0.1",
-    "semver": "^7.3.4",
     "undici": "^5.28.3",
     "which": "^4.0.0",
     "winston": "^3.11.0",

package/src/cli/actions/ext/genexample.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const main = require('./../../../lib/main')
 const { logger } = require('./../../../shared/logger')
-const createSpinner = require('./../../../shared/createSpinner')
+const { createSpinner } = require('./../../../shared/createSpinner')
 
 const sleep = require('./../../../lib/helpers/sleep')
 

package/src/cli/actions/ext/vault/decrypt.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 
 const { logger } = require('./../../../../shared/logger')
-const createSpinner = require('./../../../../shared/createSpinner')
+const { createSpinner } = require('./../../../../shared/createSpinner')
 const sleep = require('./../../../../lib/helpers/sleep')
 
 const Decrypt = require('./../../../../lib/services/decrypt')

package/src/cli/actions/ext/vault/encrypt.js

@@ -3,7 +3,7 @@ const path = require('path')
 
 const main = require('./../../../../lib/main')
 const { logger } = require('./../../../../shared/logger')
-const createSpinner = require('./../../../../shared/createSpinner')
+const { createSpinner } = require('./../../../../shared/createSpinner')
 const sleep = require('./../../../../lib/helpers/sleep')
 const pluralize = require('./../../../../lib/helpers/pluralize')
 

package/src/cli/commands/ext.js

@@ -1,4 +1,7 @@
+const path = require('path')
+const { spawnSync } = require('child_process')
 const { Command } = require('commander')
+const { logger } = require('../../shared/logger')
 
 const examples = require('./../examples')
 
@@ -6,6 +9,45 @@ const ext = new Command('ext')
 
 ext
   .description('🔌 extensions')
+  .allowUnknownOption()
+
+ext.addHelpText('after', '  hub                               🚫 DEPRECATED: to be replaced by [dotenvx pro]')
+
+ext
+  .argument('[command]', 'dynamic ext command')
+  .argument('[args...]', 'dynamic ext command arguments')
+  .action((command, args, cmdObj) => {
+    if (!command) {
+      ext.outputHelp()
+      process.exit(1)
+    }
+
+    // construct the full command line manually including flags
+    const rawArgs = process.argv.slice(3) // adjust the index based on where actual args start
+    const commandIndex = rawArgs.indexOf(command)
+    const forwardedArgs = rawArgs.slice(commandIndex + 1)
+
+    logger.debug(`command: ${command}`)
+    logger.debug(`args: ${JSON.stringify(forwardedArgs)}`)
+
+    const binPath = path.join(process.cwd(), 'node_modules', '.bin')
+    const newPath = `${binPath}:${process.env.PATH}`
+    const env = { ...process.env, PATH: newPath }
+
+    const result = spawnSync(`dotenvx-ext-${command}`, forwardedArgs, { stdio: 'inherit', env })
+    if (result.error) {
+      if (command === 'hub') {
+        logger.warn(`[INSTALLATION_NEEDED] install dotenvx-ext-${command} to use [dotenvx ext ${command}] commands`)
+        logger.help('? see installation instructions [https://github.com/dotenvx/dotenvx-ext-hub]')
+      } else {
+        logger.info(`error: unknown command '${command}'`)
+      }
+    }
+
+    if (result.status !== 0) {
+      process.exit(result.status)
+    }
+  })
 
 // dotenvx ext ls
 ext.command('ls')
@@ -53,6 +95,5 @@ ext.command('settings')
   .action(require('./../actions/ext/settings'))
 
 ext.addCommand(require('./../commands/ext/vault'))
-ext.addCommand(require('./../commands/ext/hub'))
 
 module.exports = ext

package/src/cli/dotenvx.js

@@ -3,7 +3,6 @@
 const fs = require('fs')
 const path = require('path')
 const { execSync } = require('child_process')
-const UpdateNotice = require('./../lib/helpers/updateNotice')
 const { Command } = require('commander')
 const program = new Command()
 
@@ -11,13 +10,6 @@ const { setLogLevel, logger } = require('../shared/logger')
 const examples = require('./examples')
 const packageJson = require('./../lib/helpers/packageJson')
 
-// once a day check for any updates
-const notice = new UpdateNotice()
-notice.check()
-if (notice.update) {
-  logger.warn(`Update available ${notice.packageVersion} → ${notice.latestVersion} 0.38.0 and higher have SIGNIFICANT changes. please read the changelog: https://dotenvx.com/changelog`)
-}
-
 // for use with run
 const envs = []
 function collectEnvs (type) {
@@ -80,14 +72,17 @@ program.command('get')
   })
 
 // dotenvx set
+const setAction = require('./actions/set')
 program.command('set')
   .description('set a single environment variable')
+  .addHelpText('after', examples.set)
+  .allowUnknownOption()
   .argument('KEY', 'KEY')
   .argument('value', 'value')
   .option('-f, --env-file <paths...>', 'path(s) to your env file(s)', '.env')
   .option('-c, --encrypt', 'encrypt value (default: true)', true)
   .option('-p, --plain', 'store value as plain text', false)
-  .action(require('./actions/set'))
+  .action(setAction)
 
 // dotenvx encrypt
 const encryptAction = require('./actions/encrypt')
@@ -124,7 +119,6 @@ program.addCommand(require('./commands/ext'))
 //
 // DEPRECATED AND hidden
 //
-program.addCommand(require('./commands/hub'))
 program.addCommand(require('./commands/vault'))
 
 program.command('convert')

package/src/cli/examples.js

@@ -100,10 +100,26 @@ Try it:
   `
 }
 
+const set = function () {
+  return `
+Examples:
+
+  \`\`\`
+  $ dotenvx set KEY value
+  $ dotenvx set KEY "value with spaces"
+  $ dotenvx set KEY -- "---value with a dash---"
+  $ dotenvx set KEY -- "-----BEGIN OPENSSH PRIVATE KEY-----
+                        b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+                        -----END OPENSSH PRIVATE KEY-----"
+  \`\`\`
+  `
+}
+
 module.exports = {
   run,
   vaultEncrypt,
   precommit,
   prebuild,
-  gitignore
+  gitignore,
+  set
 }

package/src/shared/confirm.js

@@ -0,0 +1,12 @@
+const { ConfirmPrompt } = require('@clack/core')
+
+module.exports = (opts) => {
+  return new ConfirmPrompt({
+    active: 'Y',
+    inactive: 'N',
+    initialValue: true,
+    render () {
+      return `${opts.message} (${this.value ? 'Y/n' : 'y/N'})`
+    }
+  }).prompt()
+}

package/src/shared/createSpinner.js

@@ -1,8 +1,88 @@
-const ora = require('ora')
 const chalk = require('chalk')
 
-const createSpinner = function (initialMessage = '') {
-  const spinner = ora(initialMessage)
+const FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']
+const HIDE_CURSOR = '\u001B[?25l'
+const SHOW_CURSOR = '\u001B[?25h'
+const CLEAR_LINE = '\r\x1b[K'
+const SYMBOL_INFO = 'ℹ'
+const SYMBOL_WARN = '⚠'
+const SYMBOL_ERROR = '✖'
+const SYMBOL_SUCCESS = '✔'
+
+class Spinner {
+  text
+  interval
+  frameIndex = 0
+  symbol = chalk.blue(FRAMES[0])
+
+  constructor (text) {
+    this.text = text
+  }
+
+  start (text) {
+    if (text) {
+      this.text = text
+    }
+    this.render()
+    this.interval = setInterval(() => this.tick(), 50)
+  }
+
+  tick () {
+    this.symbol = chalk.blue(FRAMES[this.frameIndex++])
+    if (this.frameIndex === FRAMES.length - 1) this.frameIndex = 0
+    this.render()
+  }
+
+  render () {
+    process.stdout.write(CLEAR_LINE + HIDE_CURSOR + (this.symbol ? this.symbol + ' ' : '') + this.text)
+  }
+
+  succeed (text) {
+    if (text) {
+      this.text = text
+    }
+    this.symbol = chalk.green(SYMBOL_SUCCESS)
+    this.end()
+  }
+
+  info (text) {
+    if (text) {
+      this.text = text
+    }
+    this.symbol = chalk.blue(SYMBOL_INFO)
+    this.end()
+  }
+
+  warn (text) {
+    if (text) {
+      this.text = text
+    }
+    this.symbol = chalk.yellow(SYMBOL_WARN)
+    this.end()
+  }
+
+  fail (text) {
+    if (text) {
+      this.text = text
+    }
+    this.symbol = chalk.red(SYMBOL_ERROR)
+    this.end()
+  }
+
+  stop () {
+    this.symbol = ''
+    this.end()
+  }
+
+  end () {
+    this.render()
+    clearInterval(this.interval)
+    process.stdout.write(SHOW_CURSOR + '\n')
+  }
+}
+
+const createSpinner = (initialMessage = '') => {
+  const spinner = new Spinner(initialMessage)
 
   return {
     start: (message) => spinner.start(message),
@@ -14,4 +94,4 @@ const createSpinner = function (initialMessage = '') {
   }
 }
 
-module.exports = createSpinner
+module.exports = { createSpinner, Spinner }

package/src/cli/actions/ext/hub/login.js

@@ -1,126 +0,0 @@
-const open = require('open')
-const { request } = require('undici')
-const clipboardy = require('./../../../../lib/helpers/clipboardy')
-const confirm = require('@inquirer/confirm').default
-
-const createSpinner = require('./../../../../shared/createSpinner')
-const store = require('./../../../../shared/store')
-const { logger } = require('./../../../../shared/logger')
-
-const OAUTH_CLIENT_ID = 'oac_dotenvxcli'
-
-const spinner = createSpinner('waiting on user authorization')
-
-const formatCode = function (str) {
-  const parts = []
-
-  for (let i = 0; i < str.length; i += 4) {
-    parts.push(str.substring(i, i + 4))
-  }
-
-  return parts.join('-')
-}
-
-async function pollTokenUrl (tokenUrl, deviceCode, interval) {
-  logger.http(`POST ${tokenUrl} with deviceCode ${deviceCode} at interval ${interval}`)
-
-  try {
-    const response = await request(tokenUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        client_id: OAUTH_CLIENT_ID,
-        device_code: deviceCode,
-        grant_type: 'urn:ietf:params:oauth:grant-type:device_code'
-      })
-    })
-
-    const responseData = await response.body.json()
-
-    logger.http(responseData)
-
-    if (response.statusCode >= 400) {
-      // continue polling if authorization_pending
-      if (responseData.error === 'authorization_pending') {
-        setTimeout(() => pollTokenUrl(tokenUrl, deviceCode, interval), interval * 1000)
-      } else {
-        spinner.start()
-        spinner.fail(responseData.error_description)
-        process.exit(1)
-      }
-    }
-
-    if (responseData.access_token) {
-      spinner.start()
-      store.setToken(responseData.full_username, responseData.access_token)
-      store.setHostname(responseData.hostname)
-      spinner.succeed(`logged in as ${responseData.username}`)
-      process.exit(0)
-    } else {
-      // continue polling if no access_token. shouldn't ever get here it server is implemented correctly
-      setTimeout(() => pollTokenUrl(tokenUrl, deviceCode, interval), interval * 1000)
-    }
-  } catch (error) {
-    spinner.start()
-    spinner.fail(error.toString())
-    process.exit(1)
-  }
-}
-
-async function login () {
-  const options = this.opts()
-  logger.debug(`options: ${JSON.stringify(options)}`)
-
-  const hostname = options.hostname
-  const deviceCodeUrl = `${hostname}/oauth/device/code`
-  const tokenUrl = `${hostname}/oauth/token`
-
-  try {
-    const response = await request(deviceCodeUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({ client_id: OAUTH_CLIENT_ID })
-    })
-
-    const responseData = await response.body.json()
-
-    if (response.statusCode >= 400) {
-      logger.http(responseData)
-
-      spinner.start()
-      spinner.fail(responseData.error_description)
-      process.exit(1)
-    }
-
-    const deviceCode = responseData.device_code
-    const userCode = responseData.user_code
-    const verificationUri = responseData.verification_uri
-    const interval = responseData.interval
-
-    try { clipboardy.writeSync(userCode) } catch (_e) {}
-
-    // qrcode.generate(verificationUri, { small: true }) // too verbose
-
-    // begin polling
-    pollTokenUrl(tokenUrl, deviceCode, interval)
-
-    // optionally allow user to open browser
-    const answer = await confirm({ message: `press Enter to open [${verificationUri}] and enter code [${formatCode(userCode)}]...` })
-
-    if (answer) {
-      await open(verificationUri)
-
-      spinner.start()
-    }
-  } catch (error) {
-    spinner.start()
-    spinner.fail(error.toString())
-    process.exit(1)
-  }
-}
-
-module.exports = login

package/src/cli/actions/ext/hub/logout.js

@@ -1,43 +0,0 @@
-const openBrowser = require('open')
-const confirm = require('@inquirer/confirm').default
-
-const createSpinner = require('./../../../../shared/createSpinner')
-const store = require('./../../../../shared/store')
-const { logger } = require('./../../../../shared/logger')
-const sleep = require('./../../../../lib/helpers/sleep')
-
-const username = store.getUsername()
-const usernamePart = username ? ` [${username}]` : ''
-const spinner = createSpinner(`logging off machine${usernamePart}`)
-
-async function logout () {
-  spinner.start()
-  await sleep(500) // better dx
-
-  // debug opts
-  const options = this.opts()
-  logger.debug(`options: ${JSON.stringify(options)}`)
-
-  logger.debug('deleting settings.DOTENVX_TOKEN')
-  store.deleteToken()
-
-  logger.debug('deleting settings.DOTENVX_HOSTNAME')
-  store.deleteHostname()
-
-  spinner.done(`logged off machine${usernamePart}`)
-
-  const hostname = options.hostname
-  const logoutUrl = `${hostname}/logout`
-
-  // optionally allow user to open browser
-  const answer = await confirm({ message: `press Enter to also log off browser [${logoutUrl}]...` })
-
-  if (answer) {
-    spinner.start()
-    await sleep(500) // better dx
-    await openBrowser(logoutUrl)
-    spinner.done(`logged off browser${usernamePart}`)
-  }
-}
-
-module.exports = logout

package/src/cli/actions/ext/hub/open.js

@@ -1,63 +0,0 @@
-const openBrowser = require('open')
-const confirm = require('@inquirer/confirm').default
-
-const createSpinner = require('./../../../../shared/createSpinner')
-const { logger } = require('./../../../../shared/logger')
-
-const isGitRepo = require('./../../../../lib/helpers/isGitRepo')
-const isGithub = require('./../../../../lib/helpers/isGithub')
-const gitUrl = require('./../../../../lib/helpers/gitUrl')
-const gitRoot = require('./../../../../lib/helpers/gitRoot')
-const extractUsernameName = require('./../../../../lib/helpers/extractUsernameName')
-const sleep = require('./../../../../lib/helpers/sleep')
-
-const spinner = createSpinner('opening')
-
-async function open () {
-  // debug opts
-  const options = this.opts()
-  logger.debug(`options: ${JSON.stringify(options)}`)
-
-  // must be a git repo
-  if (!isGitRepo()) {
-    spinner.fail('oops, must be a git repository')
-    logger.help('? create one with [git init .]')
-    process.exit(1)
-  }
-  // must be a git root
-  const gitroot = gitRoot()
-  if (!gitroot) {
-    spinner.fail('oops, could not determine git repository\'s root')
-    logger.help('? create one with [git init .]')
-    process.exit(1)
-  }
-  // must have a remote origin url
-  const giturl = gitUrl()
-  if (!giturl) {
-    spinner.fail('oops, must have a remote origin (git remote -v)')
-    logger.help('? create it at [github.com/new] and then run [git remote add origin git@github.com:username/repository.git]')
-    process.exit(1)
-  }
-  // must be a github remote
-  if (!isGithub(giturl)) {
-    spinner.fail('oops, must be a github.com remote origin (git remote -v)')
-    logger.help('? create it at [github.com/new] and then run [git remote add origin git@github.com:username/repository.git]')
-    logger.help2('ℹ need support for other origins? [please tell us](https://github.com/dotenvx/dotenvx/issues)')
-    process.exit(1)
-  }
-
-  const usernameName = extractUsernameName(giturl)
-  const openUrl = `${options.hostname}/gh/${usernameName}`
-
-  // optionally allow user to open browser
-  const answer = await confirm({ message: `press Enter to open [${openUrl}]...` })
-
-  if (answer) {
-    spinner.start()
-    await sleep(500) // better dx
-    await openBrowser(openUrl)
-    spinner.succeed(`opened [${usernameName}]`)
-  }
-}
-
-module.exports = open

package/src/cli/actions/ext/hub/pull.js

@@ -1,105 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const { request } = require('undici')
-
-const store = require('./../../../../shared/store')
-const { logger } = require('./../../../../shared/logger')
-const createSpinner = require('./../../../../shared/createSpinner')
-
-const isGitRepo = require('./../../../../lib/helpers/isGitRepo')
-const isGithub = require('./../../../../lib/helpers/isGithub')
-const gitUrl = require('./../../../../lib/helpers/gitUrl')
-const gitRoot = require('./../../../../lib/helpers/gitRoot')
-const extractUsernameName = require('./../../../../lib/helpers/extractUsernameName')
-const sleep = require('./../../../../lib/helpers/sleep')
-
-const spinner = createSpinner('pulling')
-
-// constants
-const ENCODING = 'utf8'
-
-// Create a simple-git instance for the current directory
-async function pull (directory) {
-  spinner.start()
-  await sleep(500) // better dx
-
-  // debug args
-  logger.debug(`directory: ${directory}`)
-
-  // debug opts
-  const options = this.opts()
-  logger.debug(`options: ${JSON.stringify(options)}`)
-
-  // must be a git repo
-  if (!isGitRepo()) {
-    spinner.fail('oops, must be a git repository')
-    logger.help('? create one with [git init .]')
-    process.exit(1)
-  }
-  // must be a git root
-  const gitroot = gitRoot()
-  if (!gitroot) {
-    spinner.fail('oops, could not determine git repository\'s root')
-    logger.help('? create one with [git init .]')
-    process.exit(1)
-  }
-  // must have a remote origin url
-  const giturl = gitUrl()
-  if (!giturl) {
-    spinner.fail('oops, must have a remote origin (git remote -v)')
-    logger.help('? create it at [github.com/new] and then run [git remote add origin git@github.com:username/repository.git]')
-    process.exit(1)
-  }
-  // must be a github remote
-  if (!isGithub(giturl)) {
-    spinner.fail('oops, must be a github.com remote origin (git remote -v)')
-    logger.help('? create it at [github.com/new] and then run [git remote add origin git@github.com:username/repository.git]')
-    logger.help2('ℹ need support for other origins? [please tell us](https://github.com/dotenvx/dotenvx/issues)')
-    process.exit(1)
-  }
-
-  const envKeysFilepath = path.join(directory, '.env.keys')
-  const hostname = options.hostname
-  const pullUrl = `${hostname}/v1/pull`
-  const oauthToken = store.getToken()
-  const usernameName = extractUsernameName(giturl)
-  const relativeEnvKeysFilepath = path.relative(gitroot, path.join(process.cwd(), directory, '.env.keys')).replace(/\\/g, '/') // smartly determine path/to/.env.keys file from repository root - where user is cd-ed inside a folder or at repo root
-
-  try {
-    const response = await request(pullUrl, {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${oauthToken}`,
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        username_name: usernameName,
-        filepath: relativeEnvKeysFilepath
-      })
-    })
-
-    const responseData = await response.body.json()
-
-    if (response.statusCode >= 400) {
-      logger.http(responseData)
-      spinner.fail(responseData.error.message)
-      if (response.statusCode === 404) {
-        logger.help(`? try visiting [${hostname}/gh/${usernameName}] in your browser`)
-      }
-      process.exit(1)
-    }
-
-    if (fs.existsSync(envKeysFilepath) && fs.readFileSync(envKeysFilepath, ENCODING) === responseData.DOTENV_KEYS) {
-      spinner.done(`no changes (${envKeysFilepath})`)
-    } else {
-      fs.writeFileSync(envKeysFilepath, responseData.DOTENV_KEYS)
-      spinner.succeed(`pulled [${usernameName}]`)
-      logger.help2(`ℹ run [cat ${envKeysFilepath}] to view locally`)
-    }
-  } catch (error) {
-    spinner.fail(error.toString())
-    process.exit(1)
-  }
-}
-
-module.exports = pull

package/src/cli/actions/ext/hub/push.js

@@ -1,112 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const { request } = require('undici')
-
-const store = require('./../../../../shared/store')
-const { logger } = require('./../../../../shared/logger')
-const createSpinner = require('./../../../../shared/createSpinner')
-
-const isGitRepo = require('./../../../../lib/helpers/isGitRepo')
-const isGithub = require('./../../../../lib/helpers/isGithub')
-const gitUrl = require('./../../../../lib/helpers/gitUrl')
-const gitRoot = require('./../../../../lib/helpers/gitRoot')
-const extractUsernameName = require('./../../../../lib/helpers/extractUsernameName')
-const sleep = require('./../../../../lib/helpers/sleep')
-const forgivingDirectory = require('./../../../../lib/helpers/forgivingDirectory')
-
-const spinner = createSpinner('pushing')
-
-// constants
-const ENCODING = 'utf8'
-
-// Create a simple-git instance for the current directory
-async function push (directory) {
-  spinner.start()
-  await sleep(500) // better dx
-
-  directory = forgivingDirectory(directory)
-
-  // debug args
-  logger.debug(`directory: ${directory}`)
-
-  // debug opts
-  const options = this.opts()
-  logger.debug(`options: ${JSON.stringify(options)}`)
-
-  // must be a git repo
-  if (!isGitRepo()) {
-    spinner.fail('oops, must be a git repository')
-    logger.help('? create one with [git init .]')
-    process.exit(1)
-  }
-  // must be a git root
-  const gitroot = gitRoot()
-  if (!gitroot) {
-    spinner.fail('oops, could not determine git repository\'s root')
-    logger.help('? create one with [git init .]')
-    process.exit(1)
-  }
-  // must have a remote origin url
-  const giturl = gitUrl()
-  if (!giturl) {
-    spinner.fail('oops, must have a remote origin (git remote -v)')
-    logger.help('? create it at [github.com/new] and then run [git remote add origin git@github.com:username/repository.git]')
-    process.exit(1)
-  }
-  // must be a github remote
-  if (!isGithub(giturl)) {
-    spinner.fail('oops, must be a github.com remote origin (git remote -v)')
-    logger.help('? create it at [github.com/new] and then run [git remote add origin git@github.com:username/repository.git]')
-    logger.help2('ℹ need support for other origins? [please tell us](https://github.com/dotenvx/dotenvx/issues)')
-    process.exit(1)
-  }
-
-  const envKeysFilepath = path.join(directory, '.env.keys')
-  if (!fs.existsSync(envKeysFilepath)) {
-    spinner.fail('oops, missing .env.keys file')
-    logger.help(`? generate one with [dotenvx encrypt${directory ? ` ${directory}` : ''}]`)
-    logger.help2('ℹ a .env.keys file holds decryption keys for a .env.vault file')
-    process.exit(1)
-  }
-
-  const hostname = options.hostname
-  const pushUrl = `${hostname}/v1/push`
-  const oauthToken = store.getToken()
-  const dotenvKeysContent = fs.readFileSync(envKeysFilepath, ENCODING)
-  const usernameName = extractUsernameName(giturl)
-  const relativeEnvKeysFilepath = path.relative(gitroot, path.join(process.cwd(), directory, '.env.keys')).replace(/\\/g, '/') // smartly determine path/to/.env.keys file from repository root - where user is cd-ed inside a folder or at repo root
-
-  try {
-    const response = await request(pushUrl, {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${oauthToken}`,
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        username_name: usernameName,
-        DOTENV_KEYS: dotenvKeysContent,
-        filepath: relativeEnvKeysFilepath
-      })
-    })
-
-    const responseData = await response.body.json()
-
-    if (response.statusCode >= 400) {
-      logger.http(responseData)
-      spinner.fail(responseData.error.message)
-      if (response.statusCode === 404) {
-        logger.help(`? try visiting [${hostname}/gh/${usernameName}] in your browser`)
-      }
-      process.exit(1)
-    }
-  } catch (error) {
-    spinner.fail(error.toString())
-    process.exit(1)
-  }
-
-  spinner.succeed(`pushed [${usernameName}]`)
-  logger.help2('ℹ run [dotenvx ext hub open] to view on hub')
-}
-
-module.exports = push

package/src/cli/actions/ext/hub/status.js

@@ -1,8 +0,0 @@
-const store = require('./../../../../shared/store')
-const { logger } = require('./../../../../shared/logger')
-
-async function status () {
-  logger.info(`logged in to ${store.getHostname()} as ${store.getUsername()}`)
-}
-
-module.exports = status

package/src/cli/actions/ext/hub/token.js

@@ -1,9 +0,0 @@
-const store = require('./../../../../shared/store')
-const { logger } = require('./../../../../shared/logger')
-
-async function token () {
-  logger.debug(store.configPath())
-  logger.blank(store.getToken())
-}
-
-module.exports = token

package/src/cli/commands/ext/hub.js

@@ -1,89 +0,0 @@
-const { Command } = require('commander')
-
-const store = require('./../../../shared/store')
-const { logger } = require('./../../../shared/logger')
-
-const hub = new Command('hub')
-
-hub
-  .description('🚫 DEPRECATED: to be replaced by [dotenvx pro]')
-
-const loginAction = require('./../../actions/ext/hub/login')
-hub
-  .command('login')
-  .description('authenticate to dotenvx hub')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: to be replaced by [dotenvx pro]')
-
-    loginAction.apply(this, args)
-  })
-
-const pushAction = require('./../../actions/ext/hub/push')
-hub
-  .command('push')
-  .description('push .env.keys to dotenvx hub')
-  .argument('[directory]', 'directory to push', '.')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: to be replaced by [dotenvx pro]')
-
-    pushAction.apply(this, args)
-  })
-
-const pullAction = require('./../../actions/ext/hub/pull')
-hub
-  .command('pull')
-  .description('pull .env.keys from dotenvx hub')
-  .argument('[directory]', 'directory to pull', '.')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: to be replaced by [dotenvx pro]')
-
-    pullAction.apply(this, args)
-  })
-
-const openAction = require('./../../actions/ext/hub/open')
-hub
-  .command('open')
-  .description('view repository on dotenvx hub')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: to be replaced by [dotenvx pro]')
-
-    openAction.apply(this, args)
-  })
-
-const tokenAction = require('./../../actions/ext/hub/token')
-hub
-  .command('token')
-  .description('print the auth token dotenvx hub is configured to use')
-  .option('-h, --hostname <url>', 'set hostname', 'https://hub.dotenvx.com')
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: to be replaced by [dotenvx pro]')
-
-    tokenAction.apply(this, args)
-  })
-
-const statusAction = require('./../../actions/ext/hub/status')
-hub
-  .command('status')
-  .description('display logged in user')
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: to be replaced by [dotenvx pro]')
-
-    statusAction.apply(this, args)
-  })
-
-const logoutAction = require('./../../actions/ext/hub/logout')
-hub
-  .command('logout')
-  .description('log out this machine from dotenvx hub')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: to be replaced by [dotenvx pro]')
-
-    logoutAction.apply(this, args)
-  })
-
-module.exports = hub

package/src/cli/commands/hub.js

@@ -1,89 +0,0 @@
-const { Command } = require('commander')
-
-const store = require('./../../shared/store')
-const { logger } = require('./../../shared/logger')
-
-const hub = new Command('hub')
-
-hub
-  .description('DEPRECATED: to be replaced by [dotenvx pro]')
-
-const loginAction = require('./../actions/ext/hub/login')
-hub
-  .command('login')
-  .description('DEPRECATED: moved to [dotenvx ext hub login]')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: [dotenvx hub login] moved to [dotenvx ext hub login]')
-
-    loginAction.apply(this, args)
-  })
-
-const pushAction = require('./../actions/ext/hub/push')
-hub
-  .command('push')
-  .description('DEPRECATED: moved to [dotenvx ext hub push]')
-  .argument('[directory]', 'directory to push', '.')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: [dotenvx hub push] moved to [dotenvx ext hub push]')
-
-    pushAction.apply(this, args)
-  })
-
-const pullAction = require('./../actions/ext/hub/pull')
-hub
-  .command('pull')
-  .description('DEPRECATED: moved to [dotenvx ext hub pull]')
-  .argument('[directory]', 'directory to pull', '.')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: [dotenvx hub pull] moved to [dotenvx ext hub pull]')
-
-    pullAction.apply(this, args)
-  })
-
-const openAction = require('./../actions/ext/hub/open')
-hub
-  .command('open')
-  .description('DEPRECATED: moved to [dotenvx ext hub open]')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: [dotenvx hub open] moved to [dotenvx ext hub open]')
-
-    openAction.apply(this, args)
-  })
-
-const tokenAction = require('./../actions/ext/hub/token')
-hub
-  .command('token')
-  .description('DEPRECATED: moved to [dotenvx ext hub token]')
-  .option('-h, --hostname <url>', 'set hostname', 'https://hub.dotenvx.com')
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: [dotenvx hub token] moved to [dotenvx ext hub token]')
-
-    tokenAction.apply(this, args)
-  })
-
-const statusAction = require('./../actions/ext/hub/status')
-hub
-  .command('status')
-  .description('DEPRECATED: moved to [dotenvx ext hub status]')
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: [dotenvx hub status] moved to [dotenvx ext hub status]')
-
-    statusAction.apply(this, args)
-  })
-
-const logoutAction = require('./../actions/ext/hub/logout')
-hub
-  .command('logout')
-  .description('DEPRECATED: moved to [dotenvx ext hub logout]')
-  .option('-h, --hostname <url>', 'set hostname', store.getHostname())
-  .action(function (...args) {
-    logger.warn('DEPRECATION NOTICE: [dotenvx hub logout] moved to [dotenvx ext hub logout]')
-
-    logoutAction.apply(this, args)
-  })
-
-module.exports = hub

package/src/lib/helpers/remoteVersion.js

@@ -1,42 +0,0 @@
-const { request } = require('undici')
-
-const packageJson = require('./packageJson')
-
-class RemoteVersion {
-  constructor () {
-    this.packageName = '@dotenvx/dotenvx'
-    this.tag = 'latest'
-  }
-
-  /**
-  * Returns the latest version of this package
-  * @returns {Promise<string?>}
-  */
-  async run () {
-    return await this._npmVersion()
-  }
-
-  async _npmVersion () {
-    try {
-      const response = await request(`https://registry.npmjs.org/${this.packageName}/${this.tag}`, {
-        method: 'GET',
-        headers: {
-          Accept: 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*',
-          'Content-Type': 'application/json'
-        }
-      })
-
-      if (response.statusCode !== 200) {
-        return packageJson.version
-      }
-
-      const data = await response.body.json()
-
-      return data.version
-    } catch (_error) {
-      return packageJson.version
-    }
-  }
-}
-
-module.exports = RemoteVersion

package/src/lib/helpers/updateNotice/check.js

@@ -1,29 +0,0 @@
-(async () => {
-  const store = require('../../../shared/store')
-  const RemoteVersion = require('../remoteVersion')
-  const packageJson = require('../packageJson')
-  const semver = require('semver')
-
-  // Exit process when offline
-  setTimeout(process.exit, 1000 * 30)
-
-  const remoteVersion = await new RemoteVersion().run()
-
-  // set DOTENVX_LATEST_VERSION_LAST_CHECKED (for use with interval (one day) checks)
-  store.setLatestVersionLastChecked(Date.now())
-
-  const localVersion = packageJson.version
-  const updateAvailable = semver.gt(remoteVersion, localVersion)
-
-  // if update is available then set DOTENVX_LATEST_VERSION
-  if (updateAvailable) {
-    store.setLatestVersion(remoteVersion)
-  }
-
-  // Call process exit explicitly to terminate the child process,
-  // otherwise the child process will run forever, according to the Node.js docs
-  process.exit()
-})().catch(error => {
-  console.error(error)
-  process.exit(1)
-})

package/src/lib/helpers/updateNotice.js

@@ -1,39 +0,0 @@
-const { spawn } = require('child_process')
-const path = require('path')
-const semver = require('semver')
-
-const store = require('../../shared/store')
-const packageJson = require('./packageJson')
-
-const ONE_DAY = 1000 * 60 * 60 * 24
-
-class UpdateNotice {
-  constructor () {
-    this.latestVersion = store.getLatestVersion()
-    this.latestVersionLastChecked = store.getLatestVersionLastChecked()
-    this.packageVersion = packageJson.version
-    this.updateCheckInterval = ONE_DAY
-    this.update = false
-  }
-
-  check () {
-    const updateAvailable = semver.gt(this.latestVersion, packageJson.version)
-
-    // Only check for updates on a set interval
-    if (Date.now() - this.latestVersionLastChecked < this.updateCheckInterval) {
-      return
-    }
-
-    if (updateAvailable) {
-      this.update = true
-    }
-
-    // Spawn a detached process
-    spawn(process.execPath, [path.join(__dirname, './updateNotice/check.js')], {
-      detached: true,
-      stdio: 'ignore'
-    }).unref()
-  }
-}
-
-module.exports = UpdateNotice