@k03mad/actual-versions 2.6.0 → 3.1.0

package/.github/workflows/lint.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4

package/.github/workflows/publish.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   publish:
     environment: npm
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:

package/.github/workflows/test.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4

package/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "acver"
+    ]
+}

package/app/api.js

@@ -2,3 +2,4 @@ export {default as getAriaVersion} from './tools/aria.js';
 export {default as getChromeVersion} from './tools/chrome.js';
 export {default as getCurlVersion} from './tools/curl.js';
 export {default as getNodeJsVersion} from './tools/nodejs.js';
+export {default as getUbuntuVersion} from './tools/ubuntu.js';

package/app/cli.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 
-import {log, logError} from '@k03mad/simple-log';
 import chalk from 'chalk';
 import {getBorderCharacters, table} from 'table';
 
@@ -23,7 +22,7 @@ const output = await Promise.all(
                 version ? green(version) : red('———'),
             ];
         } catch (err) {
-            logError([key, err]);
+            console.log(`[${key}] ${err}`);
         }
     }),
 );
@@ -32,4 +31,4 @@ const formattedTable = table(output.filter(Boolean), {
     border: getBorderCharacters(config.table.border),
 });
 
-log(formattedTable);
+console.log(formattedTable);

package/app/tools/aria.js

@@ -1,5 +1,3 @@
-import {requestCache} from '@k03mad/request';
-
 const ARIA_VERSIONS_URL = 'https://aria2.github.io/';
 const ARIA_VERSION_RE = /href=".+\/releases\/tag\/release-([\d.]+)"/;
 
@@ -7,6 +5,8 @@ const ARIA_VERSION_RE = /href=".+\/releases\/tag\/release-([\d.]+)"/;
  * @returns {Promise<string>}
  */
 export default async () => {
-    const {body} = await requestCache(ARIA_VERSIONS_URL);
-    return body.match(ARIA_VERSION_RE)?.[1];
+    const response = await fetch(ARIA_VERSIONS_URL);
+    const text = await response.text();
+
+    return text.match(ARIA_VERSION_RE)?.[1];
 };

package/app/tools/chrome.js

@@ -1,11 +1,11 @@
-import {requestCache} from '@k03mad/request';
-
 const CHROME_VERSIONS_URL = 'https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json';
 
 /**
  * @returns {Promise<string>}
  */
 export default async () => {
-    const {body} = await requestCache(CHROME_VERSIONS_URL);
-    return body?.channels?.Stable?.version;
+    const response = await fetch(CHROME_VERSIONS_URL);
+    const json = await response.json();
+
+    return json?.channels?.Stable?.version;
 };

package/app/tools/curl.js

@@ -1,5 +1,3 @@
-import {requestCache} from '@k03mad/request';
-
 const CURL_VERSIONS_URL = 'https://curl.se/download.html';
 const CURL_VERSION_RE = /href="\/download\/curl-([\d.]+).tar.gz"/;
 
@@ -7,6 +5,8 @@ const CURL_VERSION_RE = /href="\/download\/curl-([\d.]+).tar.gz"/;
  * @returns {Promise<string>}
  */
 export default async () => {
-    const {body} = await requestCache(CURL_VERSIONS_URL);
-    return body.match(CURL_VERSION_RE)?.[1];
+    const response = await fetch(CURL_VERSIONS_URL);
+    const text = await response.text();
+
+    return text.match(CURL_VERSION_RE)?.[1];
 };

package/app/tools/nodejs.js

@@ -1,11 +1,11 @@
-import {requestCache} from '@k03mad/request';
-
 const NODE_VERSIONS_URL = 'https://nodejs.org/dist/index.json';
 
 /**
  * @returns {Promise<string>}
  */
 export default async () => {
-    const {body} = await requestCache(NODE_VERSIONS_URL);
-    return body[0].version.replace('v', '');
+    const response = await fetch(NODE_VERSIONS_URL);
+    const json = await response.json();
+
+    return json[0].version.replace('v', '');
 };

package/app/tools/ubuntu.js

@@ -0,0 +1,12 @@
+const UBUNTU_VERSIONS_URL = 'https://launchpad.net/ubuntu/+series';
+const UBUNTU_VERSION_RE = / \((\d+\.\d+)\).+\n.+Current Stable Release/;
+
+/**
+ * @returns {Promise<string>}
+ */
+export default async () => {
+    const response = await fetch(UBUNTU_VERSIONS_URL);
+    const text = await response.text();
+
+    return text.match(UBUNTU_VERSION_RE)?.[1];
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/actual-versions",
-  "version": "2.6.0",
+  "version": "3.1.0",
   "description": "Get actual versions of some tools",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -19,14 +19,12 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@k03mad/request": "7.9.0",
-    "@k03mad/simple-log": "5.3.0",
     "chalk": "5.4.1",
     "table": "6.9.0"
   },
   "devDependencies": {
-    "@k03mad/eslint-config": "28.8.0",
-    "eslint": "9.23.0",
+    "@k03mad/eslint-config": "28.9.0",
+    "eslint": "9.24.0",
     "husky": "9.1.7",
     "npm-run-all": "4.1.5",
     "strip-ansi": "7.1.0"
@@ -34,7 +32,7 @@
   "scripts": {
     "lint": "npm run lint:eslint",
     "lint:eslint": "eslint ./ --cache",
-    "test": "node --test tests/**.js",
+    "test": "node --test tests/*.js",
     "clean": "rm -rf ./node_modules .eslintcache || true",
     "setup": "npm run clean && npm run setup:pnpm",
     "setup:pnpm": "npm i pnpm -g && pnpm i",

package/tests/api.js

@@ -4,23 +4,12 @@ import {describe, it} from 'node:test';
 import * as api from '../app/api.js';
 import config from '../config.js';
 
-const API_FUNCTIONS = [
-    'getAriaVersion',
-    'getChromeVersion',
-    'getCurlVersion',
-    'getNodeJsVersion',
-];
-
 const versionRe = new RegExp(`^${config.version.re}`);
 
 describe('api', () => {
-    it('check tests count', () => {
-        assert.equal(API_FUNCTIONS.length, Object.keys(api).length);
-    });
-
-    API_FUNCTIONS.forEach(fn => {
-        it(`check fn output: ${fn}()`, async () => {
-            const version = await api[fn]();
+    Object.entries(api).forEach(([name, fn]) => {
+        it(`check fn output: ${name}()`, async () => {
+            const version = await fn();
             assert.match(version, versionRe);
         });
     });

package/tests/cli.js

@@ -1,5 +1,7 @@
 import assert from 'node:assert/strict';
 import cp from 'node:child_process';
+import fs from 'node:fs/promises';
+import path from 'node:path';
 import {before, describe, it} from 'node:test';
 import {promisify} from 'node:util';
 
@@ -14,15 +16,11 @@ const exec = promisify(cp.exec);
 const tableBorderChars = Object.values(getBorderCharacters(config.table.border));
 const tableBorderCharsRe = new RegExp(tableBorderChars.join('|'), 'g');
 
-const STDOUT_TOOLS = [
-    'aria',
-    'chrome',
-    'curl',
-    'nodejs',
-];
-
 const versionRe = tool => new RegExp(`^${tool}\\s+${config.version.re}`);
 
+const dir = await fs.readdir('./app/tools');
+const tools = dir.map(elem => path.basename(elem, '.js'));
+
 describe('cli', () => {
     let versions;
 
@@ -38,11 +36,11 @@ describe('cli', () => {
             .filter(Boolean);
     });
 
-    it('check tests count', () => {
-        assert.equal(STDOUT_TOOLS.length, versions.length);
+    it('check tools count', () => {
+        assert.equal(tools.length, versions.length);
     });
 
-    STDOUT_TOOLS.forEach((tool, i) => {
+    tools.forEach((tool, i) => {
         it(`check stdout output: #${i + 1} tool: ${tool}`, () => {
             assert.match(versions[i], versionRe(tool));
         });