@railway/cli 2.1.0 → 3.0.5

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Railway Corp.
+Copyright (c) 2023 Railway Corp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/README.md

@@ -1,57 +1,52 @@
 # Railway CLI
 
-![Build](https://github.com/railwayapp/cli/workflows/Build/badge.svg)
+[![CI](https://github.com/railwayapp/cli/actions/workflows/ci.yml/badge.svg)](https://github.com/railwayapp/cliv3/actions/workflows/ci.yml)
 
-This is the command line interface for [Railway](https://railway.app). Use it to connect your code to Railways infrastructure without needing to worry about environment variables or configuration.
+This is the command line interface for [Railway](https://railway.app). Use it to connect your code to Railway's infrastructure without needing to worry about environment variables or configuration.
 
 [View the docs](https://docs.railway.app/develop/cli)
 
-## Installation
+The Railway command line interface (CLI) connects your code to your Railway project from the command line.
 
-The Railway CLI is available through [Homebrew](https://brew.sh/), [NPM](https://www.npmjs.com/package/@railway/cli), curl, or as a [Nixpkg](https://nixos.org).
+The Railway CLI allows you to
 
-### Brew
+- Create new Railway projects from the terminal
+- Link to an existing Railway project
+- Pull down environment variables for your project locally to run
+- Create services and databases right from the comfort of your fingertips
+## Status
+Currently pre-release. We are looking for feedback and suggestions. Please join our [Discord](https://discord.gg/railway) to provide feedback.
 
-```shell
-brew install railway
+## Installation
+### Cargo
+```bash
+cargo install railwayapp --locked
 ```
+### Homebrew
 
-### NPM
-
-```shell
-npm i -g @railway/cli
+```bash 
+brew tap railwayapp/tap
+brew install rlwy
 ```
 
-### Yarn
-
-```shell
-yarn global add @railway/cli
+### NPM
+```bash
+npm install -g @railway/cli
 ```
-
-### curl
-
-```shell
-curl -fsSL https://railway.app/install.sh | sh
+### Bash
+```bash
+curl -fsSL https://cli.new | sh
 ```
 
-### Nixpkg
-Note: This installation method is not supported by Railway and is maintained by the community.
-```shell
-# On NixOS
-nix-env -iA nixos.railway
-# On non-NixOS
-nix-env -iA nixpkgs.railway
-```
 
 ### From source
 See [CONTRIBUTING.md](https://github.com/railwayapp/cli/blob/master/CONTRIBUTING.md) for information on setting up this repo locally.
 
 ## Documentation
-
 [View the full documentation](https://docs.railway.app)
 
 ## Feedback
 
-We would love to hear your feedback or suggestions. The best way to reach us is on [Discord](https://discord.gg/xAm2w6g).
+We would love to hear your feedback or suggestions. The best way to reach us is on [Discord](https://discord.gg/railway).
 
 We also welcome pull requests into this repo. See [CONTRIBUTING.md](https://github.com/railwayapp/cli/blob/master/CONTRIBUTING.md) for information on setting up this repo locally.

package/bin/railway.js

@@ -8,10 +8,9 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 try {
-  execFileSync(path.resolve(`${__dirname}/railway`), process.argv.slice(2), {
-    stdio: "inherit",
-  });
+	execFileSync(path.resolve(`${__dirname}/railway`), process.argv.slice(2), {
+		stdio: "inherit",
+	});
 } catch (e) {
-  exit(1)
+	exit(1);
 }
-

package/npm-install/config.js

@@ -2,46 +2,27 @@
  * Global configuration
  */
 export const CONFIG = {
-  /**
-   * The name of the binary
-   * @type {string}
-   */
-  name: "railway",
+	/**
+	 * The name of the binary
+	 * @type {string}
+	 */
+	name: "railway",
 
-  /**
-   * Where to save the unzipped files
-   * @type {string}
-   */
-  path: "./bin",
+	/**
+	 * Where to save the unzipped files
+	 * @type {string}
+	 */
+	path: "./bin",
 
-  /**
-   * The URL to download the binary form
-   *
-   * - `{{arch}}` is one of the Golang achitectures listed below
-   * - `{{bin_name}}` is the name declared above
-   * - `{{platform}}` is one of the Golang platforms listed below
-   * - `{{version}}` is the version number as `0.0.0` (taken from package.json)
-   *
-   * @type {string}
-   */
-  url: "https://github.com/railwayapp/cli/releases/download/v{{version}}/{{bin_name}}_{{version}}_{{platform}}_{{arch}}.tar.gz",
-};
-
-/**
- * Mapping from Node's `process.arch` to Golang's `$GOARCH`
- */
-export const ARCH_MAPPING = {
-  ia32: "386",
-  x64: "amd64",
-  arm64: "arm64",
-};
-
-/**
- * Mapping between Node's `process.platform` to Golang's
- */
-export const PLATFORM_MAPPING = {
-  darwin: "darwin",
-  linux: "linux",
-  win32: "windows",
-  // freebsd: "freebsd",
+	/**
+	 * The URL to download the binary form
+	 *
+	 * - `{{arch}}` is one of the Golang achitectures listed below
+	 * - `{{bin_name}}` is the name declared above
+	 * - `{{platform}}` is one of the Golang platforms listed below
+	 * - `{{version}}` is the version number as `0.0.0` (taken from package.json)
+	 *
+	 * @type {string}
+	 */
+	url: "https://github.com/railwayapp/cli/releases/download/v{{version}}/{{bin_name}}-v{{version}}-{{triple}}.tar.gz",
 };

package/npm-install/postinstall.js

@@ -1,56 +1,47 @@
+import triples from "@napi-rs/triples";
 import { createWriteStream } from "fs";
 import * as fs from "fs/promises";
 import fetch from "node-fetch";
 import { pipeline } from "stream/promises";
 import tar from "tar";
-import { execSync } from "child_process";
 
-import { ARCH_MAPPING, CONFIG, PLATFORM_MAPPING } from "./config.js";
+import { CONFIG } from "./config.js";
 
 async function install() {
-  if (process.platform === "android") {
-    console.log("Installing, this may take a few minutes...");
-    const cmd =
-      "pkg upgrade && pkg install golang git -y && git clone https://github.com/railwayapp/cli.git && cd cli/ && go build -o $PREFIX/bin/railway";
-    execSync(cmd, { encoding: "utf-8" });
-    console.log("Installation successful!");
-    return;
-  }
-  const packageJson = await fs.readFile("package.json").then(JSON.parse);
-  let version = packageJson.version;
-
-  if (typeof version !== "string") {
-    throw new Error("Missing version in package.json");
-  }
-
-  if (version[0] === "v") version = version.slice(1);
-
-  // Fetch Static Config
-  let { name: binName, path: binPath, url } = CONFIG;
-
-  url = url.replace(/{{arch}}/g, ARCH_MAPPING[process.arch]);
-  url = url.replace(/{{platform}}/g, PLATFORM_MAPPING[process.platform]);
-  url = url.replace(/{{version}}/g, version);
-  url = url.replace(/{{bin_name}}/g, binName);
-
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error("Failed fetching the binary: " + response.statusText);
-  }
-
-  const tarFile = "downloaded.tar.gz";
-
-  await fs.mkdir(binPath, { recursive: true });
-  await pipeline(response.body, createWriteStream(tarFile));
-  await tar.x({ file: tarFile, cwd: binPath });
-  await fs.rm(tarFile);
+	const packageJson = await fs.readFile("package.json").then(JSON.parse);
+	let version = packageJson.version;
+
+	if (typeof version !== "string") {
+		throw new Error("Missing version in package.json");
+	}
+
+	if (version[0] === "v") version = version.slice(1);
+
+	// Fetch Static Config
+	let { name: binName, path: binPath, url } = CONFIG;
+	let triple = triples.platformArchTriples[process.platform][process.arch][0];
+	url = url.replace(/{{triple}}/g, triple.raw);
+	url = url.replace(/{{version}}/g, version);
+	url = url.replace(/{{bin_name}}/g, binName);
+	console.log(url);
+	const response = await fetch(url);
+	if (!response.ok) {
+		throw new Error("Failed fetching the binary: " + response.statusText);
+	}
+
+	const tarFile = "downloaded.tar.gz";
+
+	await fs.mkdir(binPath, { recursive: true });
+	await pipeline(response.body, createWriteStream(tarFile));
+	await tar.x({ file: tarFile, cwd: binPath });
+	await fs.rm(tarFile);
 }
 
 install()
-  .then(async () => {
-    process.exit(0);
-  })
-  .catch(async (err) => {
-    console.error(err);
-    process.exit(1);
-  });
+	.then(async () => {
+		process.exit(0);
+	})
+	.catch(async (err) => {
+		console.error(err);
+		process.exit(1);
+	});

package/package.json

@@ -1,29 +1,30 @@
 {
-  "name": "@railway/cli",
-  "version": "2.1.0",
-  "description": "Develop and deploy code with zero configuration",
-  "type": "module",
-  "author": "Jake Runzer",
-  "license": "ISC",
-  "homepage": "https://github.com/railwayapp/cli/blob/master/README.md",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/railwayapp/cli.git"
-  },
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "scripts": {
-    "postinstall": "node ./npm-install/postinstall.js"
-  },
-  "bin": {
-    "railway": "bin/railway.js"
-  },
-  "files": [
-    "npm-install"
-  ],
-  "dependencies": {
-    "node-fetch": "^3.1.0",
-    "tar": "^6.1.11"
-  }
+	"name": "@railway/cli",
+	"version": "3.0.5",
+	"description": "Develop and deploy code with zero configuration",
+	"type": "module",
+	"author": "Jake Runzer",
+	"license": "ISC",
+	"homepage": "https://github.com/railwayapp/cli/blob/master/README.md",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/railwayapp/cli.git"
+	},
+	"engines": {
+		"node": ">=16.0.0"
+	},
+	"scripts": {
+		"postinstall": "node ./npm-install/postinstall.js"
+	},
+	"bin": {
+		"railway": "bin/railway.js"
+	},
+	"files": [
+		"npm-install"
+	],
+	"dependencies": {
+		"@napi-rs/triples": "^1.1.0",
+		"node-fetch": "^3.1.0",
+		"tar": "^6.1.11"
+	}
 }