@gaiaworks/gaia-cli 0.0.8 → 0.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaiaworks/gaia-cli",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "description": "JavaScript launcher for gaia-cli.",
   "license": "UNLICENSED",
   "private": false,

package/scripts/install-wizard.js

@@ -89,11 +89,15 @@ function npmGlobalBinDir() {
   return process.platform === 'win32' ? prefix : path.join(prefix, 'bin');
 }
 
-function npmGlobalCommandPath(binDir, platform = process.platform) {
+function npmGlobalCommandPath(binDir, platform = process.platform) {
   if (!binDir) return null;
   if (platform === 'win32') return path.win32.join(binDir, 'gaia.cmd');
   return path.posix.join(binDir, 'gaia');
-}
+}
+
+function setupCommandPath(packageBinary) {
+  return packageBinary;
+}
 
 function pathContains(dir) {
   if (!dir) return false;
@@ -165,9 +169,8 @@ function installWizard(args) {
   ensureLocalBinary();
   const npm = npmInvocation(['install', '-g', packageSpec]);
   run(npm.command, npm.args);
-  const globalBinDir = npmGlobalBinDir();
-  const globalCommand = npmGlobalCommandPath(globalBinDir);
-  const setupCommand = globalCommand && fs.existsSync(globalCommand) ? globalCommand : binaryPath;
+  const globalBinDir = npmGlobalBinDir();
+  const setupCommand = setupCommandPath(binaryPath);
   run(setupCommand, ['setup', '--mode', mode], { stdio: 'ignore' });
   const profilePath = ensurePathConfigured(globalBinDir);
   const suffix = explicitMode ? `当前模式: ${mode}。` : '';
@@ -200,7 +203,8 @@ module.exports = {
   npmInvocation,
   pathContains,
   pathExportBlock,
-  shellProfilePath,
+  shellProfilePath,
+  setupCommandPath,
   installWizard,
   parseInstallArgs,
 };

package/scripts/install.js

@@ -20,9 +20,15 @@ function readPackageVersion() {
   return JSON.parse(content).version;
 }
 
-function normalizeVersion(version) {
-  return version.startsWith('v') ? version.slice(1) : version;
-}
+function normalizeVersion(version) {
+  return version.startsWith('v') ? version.slice(1) : version;
+}
+
+function assertInstallableVersion(version) {
+  if (normalizeVersion(version) === '0.0.0') {
+    throw new Error('Cannot install from a source checkout with placeholder version 0.0.0; use `go run .\\cmd\\gaia <command>` for local development');
+  }
+}
 
 function platformName(platform = process.platform) {
   if (platform === 'darwin') return 'darwin';
@@ -129,8 +135,9 @@ function findDownloadedBinary(targetDir, platform = process.platform) {
   throw new Error(`Downloaded archive does not contain ${expectedName}`);
 }
 
-function install(options = {}) {
-  const version = options.version || readPackageVersion();
+function install(options = {}) {
+  const version = options.version || readPackageVersion();
+  assertInstallableVersion(version);
   const url = options.url || downloadUrl(version);
   const archivePath = path.join(os.tmpdir(), archiveName(version));
   const unpackDir = path.join(os.tmpdir(), `gaia-cli-${process.pid}-${Date.now()}`);
@@ -165,8 +172,9 @@ if (require.main === module) {
 module.exports = {
   ALLOWED_DOWNLOAD_HOSTS,
   archName,
-  archiveName,
-  assertAllowedUrl,
+  archiveName,
+  assertAllowedUrl,
+  assertInstallableVersion,
   binaryName,
   downloadUrl,
   findDownloadedBinary,