@oclif/plugin-update 2.1.0 → 2.1.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.
 
+### [2.1.1](https://github.com/oclif/plugin-update/compare/v2.1.0...v2.1.1) (2021-12-02)
+
+
+### Bug Fixes
+
+* apply v2 deps ([#342](https://github.com/oclif/plugin-update/issues/342)) ([ea1abfa](https://github.com/oclif/plugin-update/commit/ea1abfab9840523636dbf55f183cbf8b6e46d501))
+
 ## [2.1.0](https://github.com/oclif/plugin-update/compare/v2.0.0...v2.1.0) (2021-11-23)
 
 

package/README.md

@@ -33,5 +33,5 @@ DESCRIPTION
   update the oclif-example CLI
 ```
 
-_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/v2.0.0/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/v2.1.0/src/commands/update.ts)_
 <!-- commandsstop -->

package/lib/tar.js

@@ -5,6 +5,19 @@ const fs = require("fs-extra");
 const path = require("path");
 const util_1 = require("./util");
 const debug = require('debug')('oclif-update');
+const ignore = (_, header) => {
+    switch (header.type) {
+        case 'directory':
+        case 'file':
+            if (process.env.OCLIF_DEBUG_UPDATE_FILES)
+                debug(header.name);
+            return false;
+        case 'symlink':
+            return true;
+        default:
+            throw new Error(header.type);
+    }
+};
 async function extract(stream, basename, output, sha) {
     const getTmp = () => `${output}.partial.${Math.random().toString().split('.')[1].slice(0, 5)}`;
     let tmp = getTmp();
@@ -36,19 +49,6 @@ async function extract(stream, basename, output, sha) {
             }
             else
                 shaValidated = true;
-            const ignore = (_, header) => {
-                switch (header.type) {
-                    case 'directory':
-                    case 'file':
-                        if (process.env.OCLIF_DEBUG_UPDATE_FILES)
-                            debug(header.name);
-                        return false;
-                    case 'symlink':
-                        return true;
-                    default:
-                        throw new Error(header.type);
-                }
-            };
             const extract = tar.extract(tmp, { ignore });
             extract.on('error', reject);
             extract.on('finish', () => {

package/lib/update.js

@@ -80,13 +80,13 @@ class UpdateCli {
         }
     }
     async downloadAndExtract(output, manifest, channel) {
-        const { version } = manifest;
+        const { version, gz, sha256gz } = manifest;
         const filesize = (n) => {
             const [num, suffix] = require('filesize')(n, { output: 'array' });
             return num.toFixed(1) + ` ${suffix}`;
         };
         const http = require('http-call').HTTP;
-        const gzUrl = manifest.gz || this.options.config.s3Url(this.options.config.s3Key('versioned', {
+        const gzUrl = gz || this.options.config.s3Url(this.options.config.s3Key('versioned', {
             version,
             channel,
             bin: this.options.config.bin,
@@ -103,11 +103,11 @@ class UpdateCli {
             platform: this.options.config.platform,
             arch: this.options.config.arch,
         });
-        const extraction = (0, tar_1.extract)(stream, baseDir, output, manifest.sha256gz);
+        const extraction = (0, tar_1.extract)(stream, baseDir, output, sha256gz);
         // to-do: use cli.action.type
         if (cli_ux_1.default.action.frames) {
             // if spinner action
-            const total = parseInt(stream.headers['content-length'], 10);
+            const total = Number.parseInt(stream.headers['content-length'], 10);
             let current = 0;
             const updateStatus = _.throttle((newStatus) => {
                 cli_ux_1.default.action.status = newStatus;
@@ -161,7 +161,7 @@ class UpdateCli {
     async determineCurrentVersion() {
         try {
             const currentVersion = await fs.readFile(this.clientBin, 'utf8');
-            const matches = currentVersion.match(/\.\.[/|\\](.+)[/|\\]bin/);
+            const matches = currentVersion.match(/\.\.[/\\|](.+)[/\\|]bin/);
             return matches ? matches[1] : this.options.config.version;
         }
         catch (error) {
@@ -169,7 +169,7 @@ class UpdateCli {
         }
         return this.options.config.version;
     }
-    s3ChannelManifestKey(bin, platform, arch, folder) {
+    s3ChannelManifestKey(bin, platform, arch, folder = '') {
         let s3SubDir = folder || '';
         if (s3SubDir !== '' && s3SubDir.slice(-1) !== '/')
             s3SubDir = `${s3SubDir}/`;
@@ -272,10 +272,10 @@ class UpdateCli {
     }
     async createBin(version) {
         const dst = this.clientBin;
-        const { bin } = this.options.config;
+        const { bin, windows } = this.options.config;
         const binPathEnvVar = this.options.config.scopedEnvVarKey('BINPATH');
         const redirectedEnvVar = this.options.config.scopedEnvVarKey('REDIRECTED');
-        if (this.options.config.windows) {
+        if (windows) {
             const body = `@echo off
 setlocal enableextensions
 set ${redirectedEnvVar}=1

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.1.0","commands":{"update":{"id":"update","description":"update the <%= config.bin %> CLI","strict":true,"pluginName":"@oclif/plugin-update","pluginAlias":"@oclif/plugin-update","pluginType":"core","aliases":[],"flags":{"autoupdate":{"name":"autoupdate","type":"boolean","hidden":true,"allowNo":false},"from-local":{"name":"from-local","type":"boolean","description":"interactively choose an already installed version","allowNo":false}},"args":[{"name":"channel"}]}}}
+{"version":"2.1.1","commands":{"update":{"id":"update","description":"update the <%= config.bin %> CLI","strict":true,"pluginName":"@oclif/plugin-update","pluginAlias":"@oclif/plugin-update","pluginType":"core","aliases":[],"flags":{"autoupdate":{"name":"autoupdate","type":"boolean","hidden":true,"allowNo":false},"from-local":{"name":"from-local","type":"boolean","description":"interactively choose an already installed version","allowNo":false}},"args":[{"name":"channel"}]}}}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@oclif/plugin-update",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "author": "Jeff Dickey @jdxcode",
   "bugs": "https://github.com/oclif/plugin-update/issues",
   "dependencies": {
-    "@oclif/color": "^0.1.0",
-    "@oclif/core": "^1.0.1",
+    "@oclif/color": "^1.0.0",
+    "@oclif/core": "^1.0.7",
     "@types/semver": "^7.3.4",
-    "cli-ux": "^5.5.1",
+    "cli-ux": "^6.0.3",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.1",
     "filesize": "^6.1.0",
@@ -19,24 +19,24 @@
     "tar-fs": "^2.1.1"
   },
   "devDependencies": {
-    "@oclif/plugin-help": "^5.1.0",
-    "@oclif/test": "^1.2.8",
+    "@oclif/plugin-help": "^5.1.7",
+    "@oclif/test": "^2.0.2",
     "@types/chai": "^4.2.15",
     "@types/cross-spawn": "^6.0.2",
     "@types/execa": "^0.9.0",
     "@types/fs-extra": "^8.0.1",
     "@types/glob": "^7.1.3",
     "@types/lodash": "^4.14.168",
-    "@types/mocha": "^8.2.2",
+    "@types/mocha": "^9",
     "@types/node": "^14.14.31",
     "@types/supports-color": "^7.2.0",
     "@types/write-json-file": "^3.2.1",
     "chai": "^4.3.4",
-    "eslint": "^7.21.0",
-    "eslint-config-oclif": "^3.1.0",
-    "eslint-config-oclif-typescript": "^0.2.0",
+    "eslint": "^7.32.0",
+    "eslint-config-oclif": "^4",
+    "eslint-config-oclif-typescript": "^1.0.2",
     "globby": "^11.0.2",
-    "mocha": "^8.3.2",
+    "mocha": "^9",
     "nock": "^13.2.1",
     "oclif": "^2.0.0-main.5",
     "qqjs": "^0.3.11",