@learnpack/learnpack 2.1.38 → 2.1.39

package/README.md

@@ -21,7 +21,7 @@ $ npm install -g @learnpack/learnpack
 $ learnpack COMMAND
 running command...
 $ learnpack (-v|--version|version)
-@learnpack/learnpack/2.1.38 darwin-arm64 node-v16.20.0
+@learnpack/learnpack/2.1.39 linux-x64 node-v20.11.1
 $ learnpack --help [COMMAND]
 USAGE
   $ learnpack COMMAND
@@ -74,7 +74,7 @@ DESCRIPTION
        12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)
 ```
 
-_See code: [src/commands/audit.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.38/src/commands/audit.ts)_
+_See code: [src/commands/audit.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.39/src/commands/audit.ts)_
 
 ## `learnpack clean`
 
@@ -89,7 +89,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src/commands/clean.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.38/src/commands/clean.ts)_
+_See code: [src/commands/clean.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.39/src/commands/clean.ts)_
 
 ## `learnpack download [PACKAGE]`
 
@@ -107,7 +107,7 @@ DESCRIPTION
   Extra documentation goes here
 ```
 
-_See code: [src/commands/download.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.38/src/commands/download.ts)_
+_See code: [src/commands/download.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.39/src/commands/download.ts)_
 
 ## `learnpack help [COMMAND]`
 
@@ -138,7 +138,7 @@ OPTIONS
   -h, --grading  show CLI help
 ```
 
-_See code: [src/commands/init.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.38/src/commands/init.ts)_
+_See code: [src/commands/init.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.39/src/commands/init.ts)_
 
 ## `learnpack login [PACKAGE]`
 
@@ -156,7 +156,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src/commands/login.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.38/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.39/src/commands/login.ts)_
 
 ## `learnpack logout [PACKAGE]`
 
@@ -174,7 +174,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src/commands/logout.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.38/src/commands/logout.ts)_
+_See code: [src/commands/logout.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.39/src/commands/logout.ts)_
 
 ## `learnpack plugins`
 
@@ -309,7 +309,7 @@ DESCRIPTION
      Extra documentation goes here
 ```
 
-_See code: [src/commands/publish.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.38/src/commands/publish.ts)_
+_See code: [src/commands/publish.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.39/src/commands/publish.ts)_
 
 ## `learnpack start`
 
@@ -330,7 +330,7 @@ OPTIONS
   -w, --watch                         Watch for file changes
 ```
 
-_See code: [src/commands/start.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.38/src/commands/start.ts)_
+_See code: [src/commands/start.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.39/src/commands/start.ts)_
 
 ## `learnpack test [EXERCISESLUG]`
 
@@ -344,7 +344,7 @@ ARGUMENTS
   EXERCISESLUG  The name of the exercise to test
 ```
 
-_See code: [src/commands/test.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.38/src/commands/test.ts)_
+_See code: [src/commands/test.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.39/src/commands/test.ts)_
 <!-- commandsstop -->
 
 > > > > > > > 0cb3e56d84c197f9d008836bb573eade212b7e57

package/lib/commands/start.js

@@ -23,6 +23,7 @@ class StartCommand extends SessionCommand_1.default {
         // get configuration object
         const configObject = (_a = this.configManager) === null || _a === void 0 ? void 0 : _a.get();
         const config = configObject === null || configObject === void 0 ? void 0 : configObject.config;
+        const hasXDG = await osOperations_1.eventManager.checkXDGInstalled();
         if (configObject) {
             const { config } = configObject;
             // build exerises
@@ -80,11 +81,13 @@ class StartCommand extends SessionCommand_1.default {
                 });
                 socket_1.default.on("open_window", (data) => {
                     console_1.default.debug("Opening window: ", data);
-                    // if (config.editor.agent === "os") {
-                    // } else {
-                    //   dispatcher.enqueue(dispatcher.events.OPEN_WINDOW, data);
-                    // }
-                    osOperations_1.eventManager.enqueue(dispatcher.events.OPEN_WINDOW, data);
+                    if (config.editor.agent === "os" &&
+                        ((config.os === "linux" && hasXDG) || config.os !== "linux")) {
+                        osOperations_1.eventManager.enqueue(dispatcher.events.OPEN_WINDOW, data);
+                    }
+                    else {
+                        dispatcher.enqueue(dispatcher.events.OPEN_WINDOW, data);
+                    }
                     socket_1.default.ready("Ready to compile...");
                 });
                 socket_1.default.on("reset", (exercise) => {

package/lib/managers/config/index.js

@@ -111,12 +111,13 @@ exports.default = async ({ grading, mode, disableGrading, version, }) => {
         console_1.default.debug("Gitpod detected");
         configObj.address = getGitpodAddress();
         configObj.config.publicUrl = `https://${configObj.config.port}-${(_d = configObj.address) === null || _d === void 0 ? void 0 : _d.slice(8)}`;
+        configObj.config.editor.agent = "vscode";
     }
     else if (configObj.config && Boolean(codespaces_workspace)) {
         console_1.default.debug("Codespaces detected: ", codespaces_workspace);
         configObj.address = `https://${codespaces_workspace}.github.dev`;
         configObj.config.publicUrl = `https://${codespaces_workspace}-${configObj.config.port}.app.github.dev`;
-        // TODO: Why is needed to have an agent?
+        configObj.config.editor.agent = "vscode";
     }
     else {
         console_1.default.debug("Neither Gitpod nor Codespaces detected, using localhost.");
@@ -124,9 +125,9 @@ exports.default = async ({ grading, mode, disableGrading, version, }) => {
         configObj.config.publicUrl = `http://localhost:${configObj.config.port}`;
     }
     if (!configObj.config.editor.agent) {
-        configObj.config.editor.agent = shell.which("code") ? "vscode" : "os";
+        configObj.config.editor.agent =
+            process.env.TERM_PROGRAM === "vscode" ? "vscode" : "os";
     }
-    // TODO: We need to set the correct EventListener if the agent is not vscode
     if (configObj.config && !configObj.config.publicUrl)
         configObj.config.publicUrl = `${configObj.address}:${configObj.config.port}`;
     if (configObj.config && !configObj.config.editor.mode && mode) {

package/lib/utils/osOperations.d.ts

@@ -1,4 +1,5 @@
 declare const eventManager: {
     enqueue: (event: string, data: any) => void;
+    checkXDGInstalled: () => Promise<boolean>;
 };
 export { eventManager };

package/lib/utils/osOperations.js

@@ -5,6 +5,21 @@ const child_process_1 = require("child_process");
 const os = require("os");
 const path = require("path");
 const cli_ux_1 = require("cli-ux");
+const checkXDGInstalled = () => {
+    return new Promise((resolve, reject) => {
+        child_process_1.exec("which xdg-open", (error, stdout, stderr) => {
+            if (error) {
+                resolve(false);
+            }
+            if (stdout) {
+                resolve(true);
+            }
+            else {
+                resolve(false);
+            }
+        });
+    });
+};
 const openFile = (filePath) => {
     const fullPath = path.join(process.cwd(), filePath);
     let command;
@@ -52,5 +67,6 @@ const eventManager = {
             cli_ux_1.default.open(url);
         }
     },
+    checkXDGInstalled,
 };
 exports.eventManager = eventManager;

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.1.38","commands":{"audit":{"id":"audit","description":"learnpack audit is the command in charge of creating an auditory of the repository\n...\nlearnpack audit checks for the following information in a repository:\n    1. The configuration object has slug, repository and description. (Error)\n    2. The command learnpack clean has been run. (Error)\n    3. If a markdown or test file doesn't have any content. (Error)\n    4. The links are accessing to valid servers. (Error)\n    5. The relative images are working (If they have the shortest path to the image or if the images exists in the assets). (Error)\n    6. The external images are working (If they are pointing to a valid server). (Error)\n    7. The exercises directory names are valid. (Error)\n    8. If an exercise doesn't have a README file. (Error)\n    9. The exercises array (Of the config file) has content. (Error)\n    10. The exercses have the same translations. (Warning)\n    11. The .gitignore file exists. (Warning)\n    12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"clean":{"id":"clean","description":"Clean the configuration object\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"download":{"id":"download","description":"Describe the command here\n...\nExtra documentation goes here\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"init":{"id":"init","description":"Create a new learning package: Book, Tutorial or Exercise","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"grading":{"name":"grading","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"login":{"id":"login","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"logout":{"id":"logout","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"publish":{"id":"publish","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"start":{"id":"start","description":"Runs a small server with all the exercise instructions","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"server port"},"host":{"name":"host","type":"option","char":"h","description":"server host"},"disableGrading":{"name":"disableGrading","type":"boolean","char":"D","description":"disble grading functionality","allowNo":false},"watch":{"name":"watch","type":"boolean","char":"w","description":"Watch for file changes","allowNo":false},"editor":{"name":"editor","type":"option","char":"e","description":"[preview, extension]","options":["extension","preview"]},"version":{"name":"version","type":"option","char":"v","description":"E.g: 1.0.1"},"grading":{"name":"grading","type":"option","char":"g","description":"[isolated, incremental]","options":["isolated","incremental"]},"debug":{"name":"debug","type":"boolean","char":"d","description":"debugger mode for more verbage","allowNo":false}},"args":[]},"test":{"id":"test","description":"Test exercises","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"exerciseSlug","description":"The name of the exercise to test","required":false,"hidden":false}]}}}
+{"version":"2.1.39","commands":{"audit":{"id":"audit","description":"learnpack audit is the command in charge of creating an auditory of the repository\n...\nlearnpack audit checks for the following information in a repository:\n    1. The configuration object has slug, repository and description. (Error)\n    2. The command learnpack clean has been run. (Error)\n    3. If a markdown or test file doesn't have any content. (Error)\n    4. The links are accessing to valid servers. (Error)\n    5. The relative images are working (If they have the shortest path to the image or if the images exists in the assets). (Error)\n    6. The external images are working (If they are pointing to a valid server). (Error)\n    7. The exercises directory names are valid. (Error)\n    8. If an exercise doesn't have a README file. (Error)\n    9. The exercises array (Of the config file) has content. (Error)\n    10. The exercses have the same translations. (Warning)\n    11. The .gitignore file exists. (Warning)\n    12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"clean":{"id":"clean","description":"Clean the configuration object\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"download":{"id":"download","description":"Describe the command here\n...\nExtra documentation goes here\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"init":{"id":"init","description":"Create a new learning package: Book, Tutorial or Exercise","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"grading":{"name":"grading","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"login":{"id":"login","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"logout":{"id":"logout","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"publish":{"id":"publish","description":"Describe the command here\n  ...\n  Extra documentation goes here\n  ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"start":{"id":"start","description":"Runs a small server with all the exercise instructions","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"server port"},"host":{"name":"host","type":"option","char":"h","description":"server host"},"disableGrading":{"name":"disableGrading","type":"boolean","char":"D","description":"disble grading functionality","allowNo":false},"watch":{"name":"watch","type":"boolean","char":"w","description":"Watch for file changes","allowNo":false},"editor":{"name":"editor","type":"option","char":"e","description":"[preview, extension]","options":["extension","preview"]},"version":{"name":"version","type":"option","char":"v","description":"E.g: 1.0.1"},"grading":{"name":"grading","type":"option","char":"g","description":"[isolated, incremental]","options":["isolated","incremental"]},"debug":{"name":"debug","type":"boolean","char":"d","description":"debugger mode for more verbage","allowNo":false}},"args":[]},"test":{"id":"test","description":"Test exercises","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"exerciseSlug","description":"The name of the exercise to test","required":false,"hidden":false}]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@learnpack/learnpack",
   "description": "Create, sell or download and take learning amazing learning packages",
-  "version": "2.1.38",
+  "version": "2.1.39",
   "author": "Alejandro Sanchez @alesanchezr",
   "bin": {
     "learnpack": "bin/run"
@@ -67,7 +67,6 @@
     "fs-extra": "^10.0.1",
     "globby": "^10.0.2",
     "husky": ">=6",
-    "learnpack-node": "^0.0.21",
     "lint-staged": ">=10",
     "mocha": "^5.2.0",
     "mock-fs": "^5.1.2",

package/src/commands/start.ts

@@ -70,6 +70,8 @@ export default class StartCommand extends SessionCommand {
     const configObject = this.configManager?.get()
     const config = configObject?.config
 
+    const hasXDG = await eventManager.checkXDGInstalled()
+
     if (configObject) {
       const { config } = configObject
 
@@ -164,11 +166,16 @@ export default class StartCommand extends SessionCommand {
 
         socket.on("open_window", (data: IGitpodData) => {
           Console.debug("Opening window: ", data)
-          // if (config.editor.agent === "os") {
-          // } else {
-          //   dispatcher.enqueue(dispatcher.events.OPEN_WINDOW, data);
-          // }
-          eventManager.enqueue(dispatcher.events.OPEN_WINDOW, data)
+
+          if (
+            config.editor.agent === "os" &&
+            ((config.os === "linux" && hasXDG) || config.os !== "linux")
+          ) {
+            eventManager.enqueue(dispatcher.events.OPEN_WINDOW, data)
+          } else {
+            dispatcher.enqueue(dispatcher.events.OPEN_WINDOW, data)
+          }
+
           socket.ready("Ready to compile...")
         })
 

package/src/managers/config/defaults.ts

@@ -7,7 +7,7 @@ export default {
     })(),
     editor: {
       mode: null, // [extension, preview]
-      agent: null, // [vscode, null]
+      agent: null, // ["vscode", "os"] ("os" is the agent when running outside a coding editor
       version: null, // By default downloads the latest version
     },
     dirPath: "./.learn",

package/src/managers/config/index.ts

@@ -164,11 +164,12 @@ throw InternalError("Config object not found")
     configObj.config.publicUrl = `https://${
       configObj.config.port
     }-${configObj.address?.slice(8)}`
+    configObj.config.editor.agent = "vscode"
   } else if (configObj.config && Boolean(codespaces_workspace)) {
     Console.debug("Codespaces detected: ", codespaces_workspace)
     configObj.address = `https://${codespaces_workspace}.github.dev`
     configObj.config.publicUrl = `https://${codespaces_workspace}-${configObj.config.port}.app.github.dev`
-    // TODO: Why is needed to have an agent?
+    configObj.config.editor.agent = "vscode"
   } else {
     Console.debug("Neither Gitpod nor Codespaces detected, using localhost.")
     configObj.address = `http://localhost:${configObj.config.port}`
@@ -176,11 +177,10 @@ throw InternalError("Config object not found")
   }
 
   if (!configObj.config.editor.agent) {
-    configObj.config.editor.agent = shell.which("code") ? "vscode" : "os"
+    configObj.config.editor.agent =
+      process.env.TERM_PROGRAM === "vscode" ? "vscode" : "os"
   }
 
-  // TODO: We need to set the correct EventListener if the agent is not vscode
-
   if (configObj.config && !configObj.config.publicUrl)
     configObj.config.publicUrl = `${configObj.address}:${configObj.config.port}`
 

package/src/utils/osOperations.ts

@@ -3,6 +3,22 @@ import * as os from "os"
 import * as path from "path"
 import cli from "cli-ux"
 
+const checkXDGInstalled = (): Promise<boolean> => {
+  return new Promise((resolve, reject) => {
+    exec("which xdg-open", (error, stdout, stderr) => {
+      if (error) {
+        resolve(false)
+      }
+
+      if (stdout) {
+        resolve(true)
+      } else {
+        resolve(false)
+      }
+    })
+  })
+}
+
 const openFile = (filePath: string): void => {
   const fullPath = path.join(process.cwd(), filePath)
   let command: string
@@ -24,7 +40,6 @@ const openFile = (filePath: string): void => {
   exec(command, (error, stdout, stderr) => {
     if (error) {
       console.error(`exec error: ${error}`)
-      
     }
   })
 }
@@ -58,6 +73,7 @@ const eventManager = {
       cli.open(url)
     }
   },
+  checkXDGInstalled,
 }
 
 export { eventManager }