tfv 3.2.4 → 4.0.0

package/README.md

@@ -75,6 +75,13 @@ https://user-images.githubusercontent.com/25563661/209584148-05a86ee1-f497-4c6d-
 
 - #### _INSTALL_
 
+| Version          | Description                                |
+| ---------------- | ------------------------------------------ |
+| x.x.x            | Installs terraform version x.x.x           |
+| x^               | Installs latest version of release x       |
+| x.x.^            | Installs latest version of release x.x     |
+| latest           | Installs latest version of terraform       |
+
 ```sh
 tfv install <version>
 ```
@@ -82,31 +89,43 @@ tfv install <version>
 Run with alias
 
 ```sh
-tfv i <version>
+tfv i <version> -a <system-architecture>
 ```
 
-| Version          | Description                                |
-| ---------------- | ------------------------------------------ |
-| x.x.x            | Installs terraform version x.x.x           |
-| x^               | Installs latest version of release x       |
-| x.x.^            | Installs latest version of release x.x     |
-| latest           | Installs latest version of terraform       |
+Run with system-architecture option
 
-- #### _USE_
+```sh
+tfv install <version> --arch <system-architecture>
+```
+
+EXAMPLE:
 
 ```sh
-tfv use <version>
+tfv install 1.5.7 -arch amd64
 ```
 
+
+- #### _USE_
+
 | Version          | Description                               |
 | ---------------- | ----------------------------------------- |
 | x.x.x            | use terraform version x.x.x               |
 | latest           | use latest version of terraform           |
 
+```sh
+tfv use <version>
+```
+
 > **_NOTE:_** If you're using windows OS, you would be prompted for admin privilege. Accept it. This is a one-time request to set terraform location in you system path. Unix machines would also get password prompt, as this requires permission to copy terraform to your bin directory.
 
 - #### _LIST_
 
+| Option         | Option Alias  |                Description                                                     |
+| ---------------|---------------|--------------------------------------------------------------------------------|
+|                |               |  Defaults to listing terraform versions installed locally (in tfv store)       |
+| `--local`      |  `-l`         |  Lists all terraform versions installed locally                                |
+| `--remote`     |  `-r`         |  Lists all terraform versions available remotely, on terraform server          |
+
 ```sh
 tfv list [option]
 ```
@@ -117,30 +136,30 @@ Run with alias
 tfv ls [option]
 ```
 
-| Option         | Option Alias  |                Description                                                     |
-| ---------------|---------------|--------------------------------------------------------------------------------|
-|                |               |  Defaults to listing terraform versions installed locally (in tfv store)       |
-| `--local`      |  `-l`         |  Lists all terraform versions installed locally                                |
-| `--remote`     |  `-r`         |  Lists all terraform versions available remotely, on terraform server          |
-
 - #### _REMOVE_
 
+Remove terraform versions managed by tfv
+
 ```sh
-  tfv remove <version>
+  tfv remove <versions>
 ```
 
 Run with alias
 
 ```sh
-  tfv rm <version>
+  tfv rm <versions>
 ```
 
-| Version          | Description                               |
-| ---------------- | ----------------------------------------- |
-| x.x.x            | remove terraform version x.x.x            |
+Example
+
+```sh
+  tfv rm x.y.z z.x.y
+```
 
 - #### _AUTO-SWITCH_
 
+Auto-detects your project terraform version, downloads it if it's not in tfv store, and switch to the version
+
 ```sh
   tfv auto-switch
 ```
@@ -150,7 +169,3 @@ Run with alias
 ```sh
   tfv as
 ```
-
-| Description                                                                                                      |
-| ---------------------------------------------------------------------------------------------------------------- |
-| auto-detects your project terraform version, downloads it if it's not in tfv store, and switch to the version     |

package/lib/commands/install.js

@@ -5,17 +5,19 @@ const {install} = require('../modules/install');
 
 exports.command = 'install <version>'
 exports.aliases = ['i']
-exports.desc = 'Example: tfv install 1.0.11'
+exports.desc = 'Install a terraform version'
 exports.builder = {
-  'verbose': {
-    describe: 'Produce detailed output',
-    alias: 'v',
-    type: 'boolean',
+  arch: {
+    describe: 'Specify system architecture',
+    alias: 'a',
+    type: 'string',
+    default: ''
   }
 }
 
 exports.handler = async () => {
   const [,version] = yargs.argv._;
+  const {arch} = yargs.argv;
 
-  await install(version);
+  await install(version, arch);
 }

package/lib/commands/remove.js

@@ -5,17 +5,16 @@ const {remove} = require('../modules/remove');
 
 exports.command = 'remove <version>'
 exports.aliases = ['rm']
-exports.desc = 'Example: tfv rm 1.0.11'
+exports.desc = 'Remove a list of versions managed by tfv'
 exports.builder = {
-  'verbose': {
+  verbose: {
     describe: 'Produce detailed output',
-    alias: 'v',
     type: 'boolean',
   }
 }
 
 exports.handler = async () => {
-  const [,version] = yargs.argv._;
+  const [,...version] = yargs.argv._;
 
   await remove(version);
 }

package/lib/commands/switch.js

@@ -6,9 +6,8 @@ exports.command = 'auto-switch'
 exports.aliases = ['as']
 exports.desc = 'Example: tfv as'
 exports.builder = {
-  'verbose': {
+  verbose: {
     describe: 'Produce detailed output',
-    alias: 'v',
     type: 'boolean'
   }
 }

package/lib/commands/use.js

@@ -7,7 +7,6 @@ exports.command = 'use <version>'
 exports.desc = 'Example: tfv use 1.0.11'
 exports.builder = {
   verbose: {
-    alias: 'v',
     describe: 'Produce detailed output',
     type: 'boolean',
   }

package/lib/modules/install.js

@@ -1,6 +1,13 @@
 const https = require('https');
 const os = require('os');
-const fs = require('fs');
+const {
+  chmodSync,
+  existsSync,
+  unlinkSync,
+  readFileSync,
+  writeFileSync,
+  createWriteStream
+} = require('fs');
 const {join} = require('path');
 const {arch} = process;
 const unzip = require('decompress');
@@ -8,7 +15,7 @@ const {fetchAllVersions} = require('./remote');
 const {formatVersions} = require('../utils/formatVersions');
 const {P_END, P_ERROR, P_INFO, P_OK, P_WARN} = require('../utils/colors');
 
-exports.install = async (installVersion) => {
+exports.install = async (installVersion, sysArchitecture) => {
   try {
     let version = installVersion;
     const store = join(__dirname, '../..', 'store');
@@ -36,10 +43,9 @@ exports.install = async (installVersion) => {
       process.exit(1);
     }
 
-    const fileName = join(__dirname, '../..', `${version}.zip`);
     const getVersion = os.platform() === 'win32' ? `${version}.exe` : version;
 
-    if (fs.existsSync(`${store}/${getVersion}`)) {
+    if (existsSync(`${store}/${getVersion}`)) {
       console.log(`${P_WARN}Terraform ${version} is already installed${P_END}`);
       return console.log(`To use this version Run: ${P_OK}tfv use ${version}${P_END}`)
     }
@@ -51,10 +57,22 @@ exports.install = async (installVersion) => {
       sysArch = 'amd64'
     }
 
-    const url = `https://releases.hashicorp.com/terraform/${version}/terraform_${version}_${sysOs}_${sysArch}.zip`;
+    const archOption = sysArchitecture || sysArch;
+
+    const url = `https://releases.hashicorp.com/terraform/${version}/terraform_${version}_${sysOs}_${archOption}.zip`;
+
+    const manageTfArch = async (version) => {
+      const archMap = `${store}/arch.json`;
+      const archStore = readFileSync(`${archMap}`, 'utf8');
+      const parseArchFile = JSON.parse(archStore);
+      parseArchFile[version] = archOption;
+      writeFileSync(`${archMap}`, JSON.stringify(parseArchFile, null, 2));
+    }
+
+    const fileName = join(__dirname, '../..', `${version}.zip`);
 
-    const clean = async (version) => {
-      if (fs.existsSync(fileName)) {
+    const unzipFile = async (version) => {
+      if (existsSync(fileName)) {
         await unzip(fileName, store, {
           map: file => {
             const [, ext] = `${file.path}`.split('.');
@@ -63,13 +81,13 @@ exports.install = async (installVersion) => {
           }
         });
 
-        fs.unlinkSync(fileName);
+        unlinkSync(fileName);
       }
     }
 
     const makeExecutable = async (version) => {
       if (sysOs !== 'windows') {
-        fs.chmodSync(`${store}/${version}`, '755');
+        chmodSync(`${store}/${version}`, '755');
       }
     }
 
@@ -77,7 +95,7 @@ exports.install = async (installVersion) => {
       const req = https.get(url, (res) => {
         console.log(`${P_INFO}Installing terraform ${version}${P_END}`);
 
-        const fileStream = fs.createWriteStream(fileName);
+        const fileStream = createWriteStream(fileName);
         res.pipe(fileStream);
 
         fileStream.on('error', (err) => {
@@ -85,7 +103,8 @@ exports.install = async (installVersion) => {
         });
 
         fileStream.on('close', async () => {
-          await clean(version);
+          await unzipFile(version);
+          await manageTfArch(version);
           await makeExecutable(version);
           resolve(version);
         });

package/lib/modules/list.js

@@ -31,14 +31,28 @@ exports.list = async (local, remote) => {
       const pattern = /v\d+\.\d+\.\d+/;
       const versionOutput = tfVersion.stdout.match(pattern);
 
-      versions = fs.readdirSync(store).map(f => {
-        const versionNumber = f.replace('.exe', '');
-
-        if (versionOutput && versionNumber === versionOutput[0].replace('v', '')) return `${versionNumber} 🚀`;
-        else return versionNumber;
+      const archMap = `${store}/arch.json`;
+      const archStore = fs.readFileSync(`${archMap}`, 'utf8');
+      const parseArchFile = JSON.parse(archStore);
+      const installedVersions = [];
+
+      versions = fs.readdirSync(store).forEach(f => {
+        if (f !== 'arch.json') {
+          const versionNumber = f.replace('.exe', '');
+          const vnObj = {};
+
+          vnObj['Terraform Version'] = versionNumber;
+
+          if (versionOutput && versionNumber === versionOutput[0].replace('v', '')) {
+            vnObj['System Arch'] = `${parseArchFile[versionNumber]} 🚀`;
+          }
+          else vnObj['System Arch'] = parseArchFile[versionNumber];
+          installedVersions.push(vnObj);
+        }
       });
 
-      return result('Terraform versions installed by tfv', versions);
+      console.log(`${P_OK}Terraform versions installed by tfv${P_END}`);
+      return console.table(installedVersions);
     }
   } catch ({message}) {
     console.log(message)

package/lib/modules/remove.js

@@ -6,16 +6,24 @@ const {P_END, P_OK, P_ERROR} = require('../utils/colors');
 exports.remove = async (version) => {
   try {
     const store = join(__dirname, '../..', 'store');
-    const tfVersion = os.platform() === 'win32' ? `${version}.exe` : version;
-    const file = `${store}/${tfVersion}`;
+    const arch = JSON.parse(fs.readFileSync(`${store}/arch.json`, 'utf-8'));
 
-    if (fs.existsSync(`${file}`)) {
-      fs.unlinkSync(file);
-      if (!fs.readdirSync(store).length) fs.rmdirSync(store);
-      return console.log(`${P_OK}Terraform ${version} deleted from tfv store${P_END}`);
-    } else {
-      return console.log(`${P_ERROR}Terraform ${version} does not exist in tfv store${P_END}`);
-    }
+    version.forEach(v => {
+      const tfVersion = os.platform() === 'win32' ? `${v}.exe` : v;
+      const file = `${store}/${tfVersion}`;
+
+      if (fs.existsSync(`${file}`)) {
+        fs.unlinkSync(file);
+
+        delete arch[v];
+
+        return console.log(`${P_OK}Terraform ${v} deleted from tfv store${P_END}`);
+      } else {
+        return console.log(`${P_ERROR}Terraform ${v} does not exist in tfv store${P_END}`);
+      }
+    })
+
+    fs.writeFileSync(`${store}/arch.json`, JSON.stringify(arch, null, 2));
   } catch ({message}) {
     console.log('ERROR:', message)
   }

package/lib/modules/switch.js

@@ -43,7 +43,7 @@ exports.autoSwitch = async () => {
       const inStore = fs.readdirSync(store).find(v => v.startsWith(tfVersion));
 
       if (inStore) {
-        await use(inStore);
+        await use(inStore.replace('.exe', ''));
       } else {
         const version = await install(`${tfVersion}^`);
         await use(version);

package/lib/utils/store.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const {P_END, P_OK, P_ERROR} = require('./colors');
 
 exports.checkStore = (store) => {
-  if (!fs.existsSync(store)) {
+  if (fs.readdirSync(store).length === 1) {
     console.log(`${P_ERROR}You're yet to install terraform with tfv${P_END}`);
     console.log(`For guidance, run ${P_OK}tfv -h${P_END}`);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tfv",
-  "version": "3.2.4",
+  "version": "4.0.0",
   "description": "Terraform version manager",
   "main": "index.js",
   "directories": {

package/store/arch.json

@@ -0,0 +1 @@
+{}