apify-cli 0.14.2-beta.0 → 0.14.2-beta.2

package/npm-shrinkwrap.json

@@ -23,10 +23,10 @@
                 "ajv": "^8.10.0",
                 "apify-client": "^2.2.0",
                 "archiver-promise": "^1.0.0",
+                "axios": "^0.21.1",
                 "chalk": "^4.1.2",
                 "computer-name": "^0.1.0",
                 "cors": "^2.8.5",
-                "cross-spawn": "^7.0.3",
                 "detect-indent": "^6.1.0",
                 "express": "^4.18.2",
                 "globby": "^11.1.0",
@@ -2153,6 +2153,7 @@
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
             "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "dev": true,
             "dependencies": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
@@ -6176,6 +6177,7 @@
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -7037,6 +7039,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
             "dependencies": {
                 "shebang-regex": "^3.0.0"
             },
@@ -7048,6 +7051,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true,
             "engines": {
                 "node": ">=8"
             }
@@ -7775,6 +7779,7 @@
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -9644,6 +9649,7 @@
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
             "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "dev": true,
             "requires": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
@@ -12602,7 +12608,8 @@
         "path-key": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true
         },
         "path-parse": {
             "version": "1.0.7",
@@ -13249,6 +13256,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
             "requires": {
                 "shebang-regex": "^3.0.0"
             }
@@ -13256,7 +13264,8 @@
         "shebang-regex": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true
         },
         "side-channel": {
             "version": "1.0.4",
@@ -13823,6 +13832,7 @@
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
             "requires": {
                 "isexe": "^2.0.0"
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apify-cli",
-  "version": "0.14.2-beta.0",
+  "version": "0.14.2-beta.2",
   "description": "Apify command-line interface helps you create, develop, build and run Apify actors, and manage the Apify cloud platform.",
   "main": "index.js",
   "scripts": {
@@ -65,10 +65,10 @@
     "ajv": "^8.10.0",
     "apify-client": "^2.2.0",
     "archiver-promise": "^1.0.0",
+    "axios": "^0.21.1",
     "chalk": "^4.1.2",
     "computer-name": "^0.1.0",
     "cors": "^2.8.5",
-    "cross-spawn": "^7.0.3",
     "detect-indent": "^6.1.0",
     "express": "^4.18.2",
     "globby": "^11.1.0",

package/src/commands/create.js

@@ -100,7 +100,7 @@ class CreateCommand extends ApifyCommand {
                         }
                         await execWithLog(
                             pythonCommand,
-                            ['-m', 'pip', 'install', '--no-cache-dir', '--no-warn-script-location', '--upgrade', 'pip'],
+                            ['-m', 'pip', 'install', '--no-cache-dir', '--no-warn-script-location', '--upgrade', 'pip', 'setuptools', 'wheel'],
                             { cwd: actFolderDir },
                         );
                         await execWithLog(

package/src/lib/version_check.js

@@ -1,5 +1,7 @@
+const { execSync } = require('child_process');
+const process = require('process');
+const axios = require('axios');
 const chalk = require('chalk');
-const { spawn } = require('cross-spawn');
 const semver = require('semver');
 const {
     CHECK_VERSION_EVERY_MILLIS,
@@ -13,16 +15,54 @@ const {
     extendLocalState,
 } = require('./local_state');
 
-const getLatestNpmVersion = () => spawn.sync('npm', ['view', 'apify-cli', 'version']).stdout.toString().trim();
+const INSTALLATION_TYPE = {
+    HOMEBREW: 'HOMEBREW',
+    NPM: 'NPM',
+};
+
+const UPDATE_COMMAND = {
+    [INSTALLATION_TYPE.HOMEBREW]: 'brew update && brew upgrade apify-cli',
+    [INSTALLATION_TYPE.NPM]: 'npm install -g apify-cli@latest',
+};
+
+/**
+ * Detect through which package manager the Apify CLI was installed.
+ * @returns {INSTALLATION_TYPE} The installation type of the CLI.
+ */
+const detectInstallationType = () => {
+    // The path of the alias to the `src/bin/run` file is in process.argv[1]
+    const commandPath = process.argv[1];
+
+    if (commandPath) {
+        // If the real command path is like `/opt/homebrew/Cellar/apify-cli/...` or `/home/linuxbrew/.linuxbrew/Cellar/apify-cli/...`,
+        // then the CLI is installed via Homebrew
+        if (process.platform === 'linux' || process.platform === 'darwin') {
+            const realCommandPath = execSync(`realpath "${commandPath}"`);
+            if (realCommandPath.includes('homebrew/Cellar') || realCommandPath.includes('linuxbrew/Cellar')) {
+                return INSTALLATION_TYPE.HOMEBREW;
+            }
+        }
+        // Add more install types here once we have the CLI in other package managers
+    }
+
+    // If we didn't detect otherwise, assume the CLI was installed through NPM
+    return INSTALLATION_TYPE.NPM;
+};
+
+const getLatestNpmVersion = async () => {
+    const response = await axios({ url: 'https://registry.npmjs.org/apify-cli/latest' });
+    const latestVersion = response.data.version;
+    return latestVersion;
+};
 
 /**
  * Fetches the latest NPM version of Apify CLI and caches it locally.
  */
-const getAndCacheLatestNpmVersion = () => {
+const getAndCacheLatestNpmVersion = async () => {
     try {
         info('Making sure that Apify CLI is up to date...');
 
-        const latestNpmVersion = getLatestNpmVersion();
+        const latestNpmVersion = await getLatestNpmVersion();
 
         extendLocalState({
             latestNpmVersion,
@@ -54,15 +94,17 @@ const checkLatestVersion = async (enforeUpdate = false) => {
     // If check is outdated and we are online then update the current NPM version.
     const shouldGetCurrentVersion = enforeUpdate || (isCheckOutdated && await isOnline.default({ timeout: 500 }));
     const latestNpmVersion = shouldGetCurrentVersion
-        ? getAndCacheLatestNpmVersion()
+        ? await getAndCacheLatestNpmVersion()
         : cachedLatestNpmVersion;
 
     const currentNpmVersion = require('../../package.json').version; //  eslint-disable-line
 
     if (latestNpmVersion && semver.gt(latestNpmVersion, currentNpmVersion)) {
+        const installationType = detectInstallationType();
+        const updateCommand = `' ${UPDATE_COMMAND[installationType]} '`;
         console.log('');
         warning('You are using an old version of Apify CLI. We strongly recommend you always use the latest available version.');
-        console.log(`       ↪ Run ${chalk.bgWhite(chalk.black(' npm install apify-cli@latest -g '))} to install it! 👍 \n`);
+        console.log(`       ↪ Run ${chalk.bgWhite(chalk.black(updateCommand))} to update! 👍 \n`);
     } else if (shouldGetCurrentVersion) {
         // In this case the version was refreshed from the NPM which took a while and "Info: Making sure that Apify ..." was printed
         // so also print the state.