@apollo/rover 0.26.0-rc.1 → 0.26.0

package/README.md

@@ -78,6 +78,7 @@ Options:
 
       --format <FORMAT_KIND>
           Specify Rover's format type
+
           [default: plain]
           [possible values: plain, json]
 
@@ -86,21 +87,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. T
-his includes expired certificates. This introduces significant vulnerabilities, and should only be use
-d as a last resort.
+
+          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.
+
+          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
@@ -126,8 +127,7 @@ This will prompt you for an API Key that can be generated in Apollo Studio.
 The most common commands from there are:
 
     - rover graph fetch: Fetch a graph schema from the Apollo graph registry
-    - rover graph check: Check for breaking changes in a local graph schema against a graph schema in 
-the Apollo graph
+    - rover graph check: Check for breaking changes in a local graph schema against a graph schema in the Apollo graph
 registry
     - rover graph publish: Publish an updated graph schema to the Apollo graph registry
 

package/binary.js

@@ -25,37 +25,39 @@ const supportedPlatforms = [
     ARCHITECTURE: "x64",
     RUST_TARGET: "x86_64-pc-windows-msvc",
     BINARY_NAME: `${name}-${version}.exe`,
+    RAW_NAME: `${name}.exe`
   },
   {
     TYPE: "Linux",
     ARCHITECTURE: "x64",
     RUST_TARGET: "x86_64-unknown-linux-gnu",
     BINARY_NAME: `${name}-${version}`,
+    RAW_NAME: `${name}`
   },
   {
     TYPE: "Linux",
     ARCHITECTURE: "arm64",
     RUST_TARGET: "aarch64-unknown-linux-gnu",
     BINARY_NAME: `${name}-${version}`,
+    RAW_NAME: `${name}`
   },
   {
     TYPE: "Darwin",
     ARCHITECTURE: "x64",
     RUST_TARGET: "x86_64-apple-darwin",
     BINARY_NAME: `${name}-${version}`,
+    RAW_NAME: `${name}`
   },
   {
     TYPE: "Darwin",
     ARCHITECTURE: "arm64",
     RUST_TARGET: "aarch64-apple-darwin",
     BINARY_NAME: `${name}-${version}`,
+    RAW_NAME: `${name}`
   },
 ];
 
-const getPlatform = () => {
-  const type = os.type();
-  const architecture = os.arch();
-
+const getPlatform = (type = os.type(), architecture = os.arch()) => {
   for (let supportedPlatform of supportedPlatforms) {
     if (
       type === supportedPlatform.TYPE &&
@@ -102,7 +104,7 @@ const getPlatform = () => {
 
 /*! Copyright (c) 2019 Avery Harnish - MIT License */
 class Binary {
-  constructor(name, url, installDirectory) {
+  constructor(name, raw_name, url, installDirectory) {
     let errors = [];
     if (typeof url !== "string") {
       errors.push("url must be a string");
@@ -132,6 +134,7 @@ class Binary {
     }
     this.url = url;
     this.name = name;
+    this.raw_name = raw_name;
     this.installDirectory = installDirectory;
 
     if (!existsSync(this.installDirectory)) {
@@ -176,7 +179,7 @@ class Binary {
         });
       })
       .then(() => {
-        fs.renameSync(join(this.installDirectory, name), this.binaryPath);
+        fs.renameSync(join(this.installDirectory, this.raw_name), this.binaryPath);
         if (!suppressLogs) {
           console.error(`${this.name} has been installed!`);
         }
@@ -212,8 +215,7 @@ class Binary {
   }
 }
 
-const getBinary = (overrideInstallDirectory) => {
-  const platform = getPlatform();
+const getBinary = (overrideInstallDirectory, 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
@@ -224,7 +226,7 @@ const getBinary = (overrideInstallDirectory) => {
   if (overrideInstallDirectory != null && overrideInstallDirectory !== "") {
     installDirectory = overrideInstallDirectory
   }
-  let binary = new Binary(platform.BINARY_NAME, url, installDirectory);
+  let binary = new Binary(platform.BINARY_NAME, platform.RAW_NAME, url, installDirectory);
 
   // setting this allows us to extract supergraph plugins to the proper directory
   // the variable itself is read in Rust code

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/rover",
-  "version": "0.26.0-rc.1",
+  "version": "0.26.0",
   "description": "The new Apollo CLI",
   "main": "index.js",
   "bin": {