@beauraines/bacon-ipsum-cli 0.2.6 → 0.2.8

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.2.8](https://github.com/beauraines/bacon-ipsum-cli/compare/v0.2.7...v0.2.8) (2024-06-21)
+
+## [0.2.7](https://github.com/beauraines/bacon-ipsum-cli/compare/v0.2.6...v0.2.7) (2024-06-21)
+
 ## [0.2.6](https://github.com/beauraines/bacon-ipsum-cli/compare/v0.2.5...v0.2.6) (2024-06-16)
 
 ## [0.2.5](https://github.com/beauraines/bacon-ipsum-cli/compare/v0.2.4...v0.2.5) (2024-06-05)

package/cli.js

@@ -2,7 +2,7 @@
 
 import yargs from "yargs";
 import debugClient from 'debug'
-import { buildQueryString, getBacon } from './utils.js';
+import { buildQueryString, getBacon, processOutput } from './utils.js';
 
 const debug = debugClient('bacon-ipsum-cli');
 const apiUrl = 'https://baconipsum.com/api/';
@@ -53,6 +53,11 @@ debug(apiUrlWithParams)
 
 // Fetch data from the Bacon Ipsum API
 let noClip = argv.nc
-debug(argv.noClip)
 
-getBacon(apiUrlWithParams,noClip)
+let bacon = await getBacon(apiUrlWithParams)
+debug(bacon)
+let outputOptions = {
+  noClip: noClip
+}
+debug(outputOptions)
+processOutput(bacon, outputOptions);

package/eslint.config.js

@@ -0,0 +1,34 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import jestPlugin from "eslint-plugin-jest";
+
+export default [
+  {
+    files: ["**/*.js"],
+    ignores: ["node_modules/"], // Ignore node_modules
+    languageOptions: {
+      sourceType: "module",
+      ecmaVersion: "latest",
+      globals: globals.nodeBuiltin
+    },
+    rules: {
+      ...pluginJs.configs.recommended.rules,
+    },
+  },
+  {
+    files: ["**/*.test.js", "**/__tests__/**/*.js"], // Apply Jest configurations to test files
+    ignores: ["node_modules/"], // Ignore node_modules
+    languageOptions: {
+      globals: {
+        ...globals.jest, // Merging Jest globals
+      },
+    },
+    plugins: {
+      jest: jestPlugin,
+    },
+    rules: {
+      ...jestPlugin.configs.recommended.rules, // Use recommended rules from eslint-plugin-jest
+    }
+  }
+];
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beauraines/bacon-ipsum-cli",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "CLI for Bacon Ipsum text",
   "exports": "./cli.js",
   "type": "module",
@@ -9,8 +9,8 @@
   },
   "scripts": {
     "test": "NODE_OPTIONS=--experimental-vm-modules npx jest --passWithNoTests --silent",
-    "lint": "eslint . ./**/*.js ./**/*.mjs",
-    "lint:fix": "eslint . ./**/*.js ./**/*.mjs --fix",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "release": "commit-and-tag-version",
     "should-release": "should-release"
   },

package/utils.js

@@ -18,20 +18,32 @@ export const buildQueryString = (argv) => {
     return qs
   }
 
-  export const getBacon = (apiUrlWithParams,noClip) => {
-    fetch(apiUrlWithParams)
-      .then((response) => response.json())
-      .then((data) => {
-        if (noClip) { // noClip is alias for no-clip
-          // Display the fetched text in the console
-          console.log(data.join('\n'));
-        } else {
-          // Copy the text to the clipboard
-          copyPaste.copy(data.join('\n'), () => {
-            console.log('Bacon ipsum text copied to the clipboard!');
-          });
-        }
+  /**
+   *  Returns an array of paragraphs from the Bacon Ipsum API
+   * @param {String} apiUrlWithParams The bacon ipsum endpoint including any parameters
+   * @returns {Array}
+   */
+  export const getBacon = async (apiUrlWithParams) => {
+    try {
+      let response = await fetch(apiUrlWithParams)
+      if (response.ok) {
+        return await response.json()
+      } else {
+        throw new Error(response.statusText);
+      }
+    } catch (error) {
+      console.error('Error fetching data:', error);
+    }
+  }
 
-      })
-      .catch((error) => console.error('Error fetching data:', error));
-  }
+  export const processOutput = (data, options) => {
+  if (options.noClip) { // noClip is alias for no-clip
+    // Display the fetched text in the console
+    console.log(data.join('\n'));
+  } else {
+    // Copy the text to the clipboard
+    copyPaste.copy(data.join('\n'), () => {
+      console.log('Bacon ipsum text copied to the clipboard!');
+    });
+  }
+}

package/utils.test.js

@@ -1,16 +1,14 @@
 /* eslint-disable jest/no-disabled-tests */
-import { buildQueryString, getBacon } from "./utils.js";
+import { buildQueryString, processOutput } from "./utils.js";
 import copyPaste  from "copy-paste";
 import debugClient from 'debug'
+// eslint-disable-next-line no-unused-vars
 const debug = debugClient('utils-tests');
 
 
 
 describe('utilities', () => {
 
-  // eslint-disable-next-line no-unused-vars
-  const apiUrl = 'https://baconipsum.com/api/';
-
   test('should return multiple paragraphs', () => {
     const paragraphs = 2;
     const output = `Turkey flank meatball, ham t-bone pancetta ham hock drumstick beef boudin ground round short loin pig buffalo.  Flank pork pork loin chislic spare ribs.  Pork loin tenderloin kevin, bresaola picanha ham hock shoulder shank venison rump.  Shankle short loin fatback venison salami.  Capicola short ribs landjaeger, beef ribs shankle bacon meatloaf sirloin frankfurter venison chicken ham hock burgdoggen chuck.  Burgdoggen tri-tip salami beef shoulder boudin flank andouille pancetta tongue fatback short ribs t-bone.
@@ -31,30 +29,28 @@ Tongue venison ham tri-tip.  Pig porchetta bacon, kielbasa pork chop spare ribs
     expect(buildQueryString(argv)).toBe('paras=5&start-with-lorem=1&type=all-meat')
   });
 
-  test.skip('skip copying to the clipboard',() => {
-    let argv = {}
-    const noClip = true;
-    const currentClipboardContents = copyPaste.paste()
-    debug(currentClipboardContents)
-
-    const apiUrlWithParams = `${apiUrl}?${buildQueryString(argv)}`
-    getBacon(apiUrlWithParams,noClip)
-    const newClipboardContents = copyPaste.paste()
-    debug(newClipboardContents)
+});
 
-    expect(newClipboardContents).toBe(currentClipboardContents)
+// Skipped because GitHub runner doesn't include xclip
+describe.skip("skip copy to clipboard", () => {
+  test('skip copying to the clipboard',async () => {
+    let bacon = ["bacon ipsum","turkey"]
+    await copyPaste.copy("foo")
+    processOutput(bacon, {noClip: true});
+    const newClipboardContents = await copyPaste.paste()
+    expect(newClipboardContents).not.toBe("foo")
   });
+});
 
-  test.skip('copying to the clipboard',async () => {
-    let argv = {}
+// Skipped because GitHub runner doesn't include xclip
+describe.skip("copy to clipboard", () => {
+  test('processes output to clipboard',async () => {
+    let bacon = ["bacon ipsum","turkey"]
     const noClip = undefined;
-    const currentClipboardContents = copyPaste.paste()
-    debug(currentClipboardContents)
-    const apiUrlWithParams = `${apiUrl}?${buildQueryString(argv)}`
-    getBacon(apiUrlWithParams, noClip)
-    const newClipboardContents = copyPaste.paste()
-    debug(newClipboardContents)
-    expect(newClipboardContents).not.toBe(currentClipboardContents)
+    await copyPaste.copy("")
+    processOutput(bacon, {noClip});
+    const newClipboardContents = await copyPaste.paste()
+    expect(newClipboardContents).toBe("bacon ipsum\nturkey")
   });
 
 });

package/eslint.config.mjs

@@ -1,20 +0,0 @@
-import globals from "globals";
-import pluginJs from "@eslint/js";
-import jestPlugin from "eslint-plugin-jest";
-
-export default [
-  {
-    files: ["**/*.js"],
-    languageOptions: { sourceType: "module", ecmaVersion: "latest", globals: globals.nodeBuiltin}
-  },
-  { languageOptions: { ...jestPlugin.environments.globals } },
-  pluginJs.configs.recommended,
-  {
-    plugins: {
-      jest: jestPlugin
-    },
-    rules: {
-      ...jestPlugin.configs.recommended.rules, // Use recommended rules from eslint-plugin-jest
-    }
-  }
-];