@apollo/rover 0.23.0 → 0.25.0-rc.0

package/README.md

@@ -21,13 +21,13 @@ A few useful Rover commands to interact with your graphs:
 rover graph fetch test@cats
 ```
 
-1. Validate recent changes made to your local graph with `rover graph check`.
+2. Validate recent changes made to your local graph with `rover graph check`.
 
 ```bash
 rover graph check --schema=./path-to-valid-sdl test@cats
 ```
 
-1. Publish your local graph to Apollo Studio.
+3. Publish your local graph to Apollo Studio.
 
 ```bash
 rover graph publish --schema ./path-to-valid-schema test@cats
@@ -76,7 +76,8 @@ Options:
 
       --format <FORMAT_KIND>
           Specify Rover's format type
-          
+
+          [default: plain]
           [possible values: plain, json]
 
   -o, --output <OUTPUT_FILE>
@@ -84,21 +85,21 @@ Options:
 
       --insecure-accept-invalid-certs
           Accept invalid certificates when performing HTTPS requests.
-          
+
           You should think very carefully before using this flag.
-          
+
           If invalid certificates are trusted, any certificate for any site will be trusted for use. This includes expired certificates. This introduces significant vulnerabilities, and should only be used as a last resort.
 
       --insecure-accept-invalid-hostnames
           Accept invalid hostnames when performing HTTPS requests.
-          
+
           You should think very carefully before using this flag.
-          
+
           If hostname verification is not used, any valid certificate for any site will be trusted for use from any other. This introduces a significant vulnerability to man-in-the-middle attacks.
 
       --client-timeout <CLIENT_TIMEOUT>
           Configure the timeout length (in seconds) when performing HTTP(S) requests
-          
+
           [default: 30]
 
       --skip-update-check

package/binary.js

@@ -16,38 +16,39 @@ const error = (msg) => {
 };
 
 const { version } = require("./package.json");
-const name = "rover";
+const fs = require("fs");
+const name = `rover`;
 
 const supportedPlatforms = [
   {
     TYPE: "Windows_NT",
     ARCHITECTURE: "x64",
     RUST_TARGET: "x86_64-pc-windows-msvc",
-    BINARY_NAME: `${name}.exe`,
+    BINARY_NAME: `${name}-${version}.exe`,
   },
   {
     TYPE: "Linux",
     ARCHITECTURE: "x64",
     RUST_TARGET: "x86_64-unknown-linux-gnu",
-    BINARY_NAME: name,
+    BINARY_NAME: `${name}-${version}`,
   },
   {
     TYPE: "Linux",
     ARCHITECTURE: "arm64",
     RUST_TARGET: "aarch64-unknown-linux-gnu",
-    BINARY_NAME: name,
+    BINARY_NAME: `${name}-${version}`,
   },
   {
     TYPE: "Darwin",
     ARCHITECTURE: "x64",
     RUST_TARGET: "x86_64-apple-darwin",
-    BINARY_NAME: name,
+    BINARY_NAME: `${name}-${version}`,
   },
   {
     TYPE: "Darwin",
     ARCHITECTURE: "arm64",
     RUST_TARGET: "aarch64-apple-darwin",
-    BINARY_NAME: name,
+    BINARY_NAME: `${name}-${version}`,
   },
 ];
 
@@ -101,7 +102,7 @@ const getPlatform = () => {
 
 /*! Copyright (c) 2019 Avery Harnish - MIT License */
 class Binary {
-  constructor(name, url, config) {
+  constructor(name, url, installDirectory) {
     let errors = [];
     if (typeof url !== "string") {
       errors.push("url must be a string");
@@ -131,8 +132,7 @@ class Binary {
     }
     this.url = url;
     this.name = name;
-    this.installDirectory =
-      config?.installDirectory || join(__dirname, "node_modules", ".bin");
+    this.installDirectory = installDirectory;
 
     if (!existsSync(this.installDirectory)) {
       mkdirSync(this.installDirectory, { recursive: true });
@@ -176,6 +176,7 @@ class Binary {
         });
       })
       .then(() => {
+        fs.renameSync(join(this.installDirectory, name), this.binaryPath);
         if (!suppressLogs) {
           console.error(`${this.name} has been installed!`);
         }
@@ -211,13 +212,19 @@ class Binary {
   }
 }
 
-const getBinary = () => {
+const getBinary = (overrideInstallDirectory) => {
   const platform = getPlatform();
   const download_host = process.env.npm_config_apollo_rover_download_host || process.env.APOLLO_ROVER_DOWNLOAD_HOST || 'https://rover.apollo.dev'
   // the url for this binary is constructed from values in `package.json`
   // https://rover.apollo.dev/tar/rover/x86_64-unknown-linux-gnu/v0.4.8
   const url = `${download_host}/tar/${name}/${platform.RUST_TARGET}/v${version}`;
-  let binary = new Binary(platform.BINARY_NAME, url);
+  const { dirname } = require('path');
+  const appDir = dirname(require.main.filename);
+  let installDirectory = join(appDir, "binary");
+  if (overrideInstallDirectory != null && overrideInstallDirectory !== "") {
+    installDirectory = overrideInstallDirectory
+  }
+  let binary = new Binary(platform.BINARY_NAME, url, installDirectory);
 
   // setting this allows us to extract supergraph plugins to the proper directory
   // the variable itself is read in Rust code
@@ -251,4 +258,5 @@ module.exports = {
   install,
   run,
   getBinary,
+  getPlatform,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/rover",
-  "version": "0.23.0",
+  "version": "0.25.0-rc.0",
   "description": "The new Apollo CLI",
   "main": "index.js",
   "bin": {
@@ -10,7 +10,8 @@
     "prepack": "cp ../../README.md . && cp ../../LICENSE .",
     "postinstall": "node ./install.js",
     "fmt": "prettier --write **/*.js",
-    "fmt:check": "prettier --check **/*.js"
+    "fmt:check": "prettier --check **/*.js",
+    "test": "jest"
   },
   "repository": "https://github.com/apollographql/rover",
   "keywords": [
@@ -32,8 +33,8 @@
     "npm": ">=6"
   },
   "volta": {
-    "node": "18.19.0",
-    "npm": "10.3.0"
+    "node": "20.15.1",
+    "npm": "10.8.2"
   },
   "homepage": "https://github.com/apollographql/rover#readme",
   "dependencies": {
@@ -41,9 +42,12 @@
     "axios-proxy-builder": "^0.1.1",
     "console.table": "^0.10.0",
     "detect-libc": "^2.0.0",
-    "tar": "^6.2.0"
+    "tar": "^7.0.0"
   },
   "devDependencies": {
-    "prettier": "3.2.4"
+    "prettier": "3.3.3",
+    "jest": "29.7.0",
+    "axios-mock-adapter": "1.22.0",
+    "jest-junit": "16.0.0"
   }
 }