@learnpack/learnpack 5.0.8 → 5.0.10

package/src/commands/clean.ts

@@ -1,29 +1,29 @@
-// import {flags} from '@oclif/command'
-import Console from "../utils/console"
-import SessionCommand from "../utils/SessionCommand"
-
-class CleanCommand extends SessionCommand {
-  static description = `Clean the configuration object
-  ...
-  Extra documentation goes here
-  `
-
-  static flags: any = {
-    // name: flags.string({char: 'n', description: 'name to print'}),
-  }
-
-  async init() {
-    const { flags } = this.parse(CleanCommand)
-    await this.initSession(flags)
-  }
-
-  async run() {
-    const { flags } = this.parse(CleanCommand)
-
-    this.configManager?.clean()
-
-    Console.success("Package cleaned successfully, ready to publish")
-  }
-}
-
-export default CleanCommand
+// import {flags} from '@oclif/command'
+import Console from "../utils/console"
+import SessionCommand from "../utils/SessionCommand"
+
+class CleanCommand extends SessionCommand {
+  static description = `Clean the configuration object
+  ...
+  Extra documentation goes here
+  `
+
+  static flags: any = {
+    // name: flags.string({char: 'n', description: 'name to print'}),
+  }
+
+  async init() {
+    const { flags } = this.parse(CleanCommand)
+    await this.initSession(flags)
+  }
+
+  async run() {
+    const { flags } = this.parse(CleanCommand)
+
+    this.configManager?.clean()
+
+    Console.success("Package cleaned successfully, ready to publish")
+  }
+}
+
+export default CleanCommand

package/src/commands/download.ts

@@ -1,61 +1,61 @@
-import { Command /* , flags */ } from "@oclif/command"
-// import fetch from 'node-fetch'
-import { clone } from "../managers/file"
-import Console from "../utils/console"
-import api from "../utils/api"
-import { askPackage } from "../ui/download"
-// const BaseCommand = require('../utils/BaseCommand');
-
-class DownloadCommand extends Command {
-  static description = `Describe the command here
-...
-Extra documentation goes here
-`
-  static flags: any = {
-    // name: flags.string({char: 'n', description: 'name to print'}),
-  }
-
-  static args = [
-    {
-      name: "package", // name of arg to show in help and reference with args[name]
-      required: false, // make the arg required with `required: true`
-      description:
-        "The unique string that identifies this package on learnpack", // help description
-      hidden: false, // hide this arg from help
-    },
-  ]
-  // async init() {
-  //   const {flags} = this.parse(DownloadCommand)
-  //   await this.initSession(flags)
-  // }
-
-  async run() {
-    const { /* flags, */ args } = this.parse(DownloadCommand)
-    // start watching for file changes
-    let _package: string = args.package
-    if (!_package) {
-      _package = (await askPackage()) as string
-    }
-
-    if (!_package) {
-      return null
-    }
-
-    try {
-      const packageInfo = await api.getAllPackages({ slug: _package })
-      if (packageInfo.results.length === 0)
-        Console.error(`Package ${_package} not found`)
-      else
-        clone(packageInfo.results[0].repository)
-          .then(_result => {
-            Console.success("Successfully downloaded")
-            Console.info(
-              `You can now CD into the folder like this: $ cd ${_package}`
-            )
-          })
-          .catch(error => Console.error(error.message || error))
-    } catch {}
-  }
-}
-
-export default DownloadCommand
+import { Command /* , flags */ } from "@oclif/command"
+// import fetch from 'node-fetch'
+import { clone } from "../managers/file"
+import Console from "../utils/console"
+import api from "../utils/api"
+import { askPackage } from "../ui/download"
+// const BaseCommand = require('../utils/BaseCommand');
+
+class DownloadCommand extends Command {
+  static description = `Describe the command here
+...
+Extra documentation goes here
+`
+  static flags: any = {
+    // name: flags.string({char: 'n', description: 'name to print'}),
+  }
+
+  static args = [
+    {
+      name: "package", // name of arg to show in help and reference with args[name]
+      required: false, // make the arg required with `required: true`
+      description:
+        "The unique string that identifies this package on learnpack", // help description
+      hidden: false, // hide this arg from help
+    },
+  ]
+  // async init() {
+  //   const {flags} = this.parse(DownloadCommand)
+  //   await this.initSession(flags)
+  // }
+
+  async run() {
+    const { /* flags, */ args } = this.parse(DownloadCommand)
+    // start watching for file changes
+    let _package: string = args.package
+    if (!_package) {
+      _package = (await askPackage()) as string
+    }
+
+    if (!_package) {
+      return null
+    }
+
+    try {
+      const packageInfo = await api.getAllPackages({ slug: _package })
+      if (packageInfo.results.length === 0)
+        Console.error(`Package ${_package} not found`)
+      else
+        clone(packageInfo.results[0].repository)
+          .then(_result => {
+            Console.success("Successfully downloaded")
+            Console.info(
+              `You can now CD into the folder like this: $ cd ${_package}`
+            )
+          })
+          .catch(error => Console.error(error.message || error))
+    } catch {}
+  }
+}
+
+export default DownloadCommand

package/src/commands/login.ts

@@ -1,42 +1,42 @@
-import SessionCommand from "../utils/SessionCommand"
-import SessionManager from "../managers/session"
-import Console from "../utils/console"
-
-class LoginCommand extends SessionCommand {
-  static description = `Describe the command here
-  ...
-  Extra documentation goes here
-  `
-
-  static flags: any = {
-    // name: flags.string({char: 'n', description: 'name to print'}),
-  }
-
-  static args = [
-    {
-      name: "package", // name of arg to show in help and reference with args[name]
-      required: false, // make the arg required with `required: true`
-      description:
-        "The unique string that identifies this package on learnpack", // help description
-      hidden: false, // hide this arg from help
-    },
-  ]
-
-  async init() {
-    const { flags } = this.parse(LoginCommand)
-    await this.initSession(flags)
-  }
-
-  async run() {
-    /* const {flags, args} = */ this.parse(LoginCommand)
-
-    try {
-      await SessionManager.login()
-    } catch (error) {
-      Console.error("Error trying to authenticate")
-      Console.error((error as TypeError).message || (error as string))
-    }
-  }
-}
-
-export default LoginCommand
+import SessionCommand from "../utils/SessionCommand"
+import SessionManager from "../managers/session"
+import Console from "../utils/console"
+
+class LoginCommand extends SessionCommand {
+  static description = `Describe the command here
+  ...
+  Extra documentation goes here
+  `
+
+  static flags: any = {
+    // name: flags.string({char: 'n', description: 'name to print'}),
+  }
+
+  static args = [
+    {
+      name: "package", // name of arg to show in help and reference with args[name]
+      required: false, // make the arg required with `required: true`
+      description:
+        "The unique string that identifies this package on learnpack", // help description
+      hidden: false, // hide this arg from help
+    },
+  ]
+
+  async init() {
+    const { flags } = this.parse(LoginCommand)
+    await this.initSession(flags)
+  }
+
+  async run() {
+    /* const {flags, args} = */ this.parse(LoginCommand)
+
+    try {
+      await SessionManager.login()
+    } catch (error) {
+      Console.error("Error trying to authenticate")
+      Console.error((error as TypeError).message || (error as string))
+    }
+  }
+}
+
+export default LoginCommand

package/src/commands/logout.ts

@@ -1,43 +1,43 @@
-// import  {Command, flags} from '@oclif/command'
-// import { prompt } from "enquirer"
-// import fetch from 'node-fetch'
-import SessionCommand from "../utils/SessionCommand"
-import SessionManager from "../managers/session"
-// import Console from '../utils/console'
-// import { replace } from 'node-emoji'
-// import { validURL } from "../utils/validators"
-// const BaseCommand from '../utils/BaseCommand');
-
-class LogoutCommand extends SessionCommand {
-  static description = `Describe the command here
-  ...
-  Extra documentation goes here
-  `
-
-  static flags: any = {
-    // name: flags.string({char: 'n', description: 'name to print'}),
-  }
-
-  static args = [
-    {
-      name: "package", // name of arg to show in help and reference with args[name]
-      required: false, // make the arg required with `required: true`
-      description:
-        "The unique string that identifies this package on learnpack", // help description
-      hidden: false, // hide this arg from help
-    },
-  ]
-
-  async init() {
-    const { flags } = this.parse(LogoutCommand)
-    await this.initSession(flags)
-  }
-
-  async run() {
-    // const {flags, args} = this.parse(LogoutCommand)
-
-    SessionManager.destroy()
-  }
-}
-
-export default LogoutCommand
+// import  {Command, flags} from '@oclif/command'
+// import { prompt } from "enquirer"
+// import fetch from 'node-fetch'
+import SessionCommand from "../utils/SessionCommand"
+import SessionManager from "../managers/session"
+// import Console from '../utils/console'
+// import { replace } from 'node-emoji'
+// import { validURL } from "../utils/validators"
+// const BaseCommand from '../utils/BaseCommand');
+
+class LogoutCommand extends SessionCommand {
+  static description = `Describe the command here
+  ...
+  Extra documentation goes here
+  `
+
+  static flags: any = {
+    // name: flags.string({char: 'n', description: 'name to print'}),
+  }
+
+  static args = [
+    {
+      name: "package", // name of arg to show in help and reference with args[name]
+      required: false, // make the arg required with `required: true`
+      description:
+        "The unique string that identifies this package on learnpack", // help description
+      hidden: false, // hide this arg from help
+    },
+  ]
+
+  async init() {
+    const { flags } = this.parse(LogoutCommand)
+    await this.initSession(flags)
+  }
+
+  async run() {
+    // const {flags, args} = this.parse(LogoutCommand)
+
+    SessionManager.destroy()
+  }
+}
+
+export default LogoutCommand

package/src/commands/publish.ts

@@ -38,13 +38,6 @@ export default class BuildCommand extends SessionCommand {
     // this.configManager?.clean()
 
     const configObject = this.configManager?.get()
-    // Console.success("Package cleaned successfully, ready to publish")
-
-    if (configObject) {
-      // build exerises
-      Console.debug("Building exercises")
-      this.configManager?.buildIndex()
-    }
 
     let sessionPayload = await SessionManager.getPayload()
     if (!sessionPayload || !sessionPayload.rigobot) {
@@ -58,6 +51,15 @@ export default class BuildCommand extends SessionCommand {
     }
 
     const rigoToken = sessionPayload.rigobot.key
+
+    if (configObject) {
+      Console.info("Cleaning configuration files")
+      this.configManager?.clean()
+      // build exerises
+      Console.debug("Building exercises")
+      this.configManager?.buildIndex()
+    }
+
     // const rigoToken = "417d612d226a1606ad3a4e94b1881a9f0124b667"
 
     // Read learn.json to get the slug

package/src/commands/test.ts

@@ -1,85 +1,85 @@
-import Console from "../utils/console"
-import SessionCommand from "../utils/SessionCommand"
-import socket from "../managers/socket"
-
-import createServer from "../managers/server"
-import ExercisesQueue from "../utils/exercisesQueue"
-import { IExercise } from "../models/exercise-obj"
-
-class TestCommand extends SessionCommand {
-  async init() {
-    const { flags } = this.parse(TestCommand)
-    await this.initSession(flags)
-  }
-
-  async run() {
-    const {
-      args: { exerciseSlug },
-    } = this.parse(TestCommand)
-
-    // Build exercises index
-    this.configManager?.buildIndex()
-
-    let exercises: IExercise[] | undefined = []
-
-    // test all exercises
-    !exerciseSlug ?
-      (exercises = this.configManager?.getAllExercises()) :
-      (exercises = [this.configManager!.getExercise(exerciseSlug)])
-
-    const exercisesQueue = new ExercisesQueue(exercises)
-
-    const configObject = this.configManager?.get()
-
-    let hasFailed = false
-    let failedTestsCount = 0
-    let successTestsCount = 0
-    const testsToRunCount = exercisesQueue.size()
-
-    configObject!.config!.testingFinishedCallback = ({ result }) => {
-      if (result === "failed") {
-        hasFailed = true
-        failedTestsCount++
-      } else {
-        successTestsCount++
-      }
-
-      if (exercisesQueue.isEmpty()) {
-        Console.info(
-          `${testsToRunCount} test${testsToRunCount > 1 ? "s" : ""} runned`
-        )
-        Console.success(
-          `${successTestsCount} test${successTestsCount > 1 ? "s" : ""} passed`
-        )
-        Console.error(
-          `${failedTestsCount} test${failedTestsCount > 1 ? "s" : ""} failed`
-        )
-
-        process.exit(hasFailed ? 1 : 0)
-      } else {
-        exercisesQueue.pop()!.test!(this.config, config!, socket)
-      }
-    }
-
-    const config = configObject?.config
-
-    const server = await createServer(configObject!, this.configManager!, true)
-
-    socket.start(config!, server, true)
-
-    exercisesQueue.pop()!.test!(this.config, config!, socket)
-  }
-}
-
-TestCommand.description = `Test exercises`
-
-TestCommand.args = [
-  {
-    name: "exerciseSlug",
-    required: false,
-    description: "The name of the exercise to test",
-    hidden: false,
-  },
-]
-
-export default TestCommand
+import Console from "../utils/console"
+import SessionCommand from "../utils/SessionCommand"
+import socket from "../managers/socket"
+
+import createServer from "../managers/server"
+import ExercisesQueue from "../utils/exercisesQueue"
+import { IExercise } from "../models/exercise-obj"
+
+class TestCommand extends SessionCommand {
+  async init() {
+    const { flags } = this.parse(TestCommand)
+    await this.initSession(flags)
+  }
+
+  async run() {
+    const {
+      args: { exerciseSlug },
+    } = this.parse(TestCommand)
+
+    // Build exercises index
+    this.configManager?.buildIndex()
+
+    let exercises: IExercise[] | undefined = []
+
+    // test all exercises
+    !exerciseSlug ?
+      (exercises = this.configManager?.getAllExercises()) :
+      (exercises = [this.configManager!.getExercise(exerciseSlug)])
+
+    const exercisesQueue = new ExercisesQueue(exercises)
+
+    const configObject = this.configManager?.get()
+
+    let hasFailed = false
+    let failedTestsCount = 0
+    let successTestsCount = 0
+    const testsToRunCount = exercisesQueue.size()
+
+    configObject!.config!.testingFinishedCallback = ({ result }) => {
+      if (result === "failed") {
+        hasFailed = true
+        failedTestsCount++
+      } else {
+        successTestsCount++
+      }
+
+      if (exercisesQueue.isEmpty()) {
+        Console.info(
+          `${testsToRunCount} test${testsToRunCount > 1 ? "s" : ""} runned`
+        )
+        Console.success(
+          `${successTestsCount} test${successTestsCount > 1 ? "s" : ""} passed`
+        )
+        Console.error(
+          `${failedTestsCount} test${failedTestsCount > 1 ? "s" : ""} failed`
+        )
+
+        process.exit(hasFailed ? 1 : 0)
+      } else {
+        exercisesQueue.pop()!.test!(this.config, config!, socket)
+      }
+    }
+
+    const config = configObject?.config
+
+    const server = await createServer(configObject!, this.configManager!, true)
+
+    socket.start(config!, server, true)
+
+    exercisesQueue.pop()!.test!(this.config, config!, socket)
+  }
+}
+
+TestCommand.description = `Test exercises`
+
+TestCommand.args = [
+  {
+    name: "exerciseSlug",
+    required: false,
+    description: "The name of the exercise to test",
+    hidden: false,
+  },
+]
+
+export default TestCommand

package/src/index.ts

@@ -1 +1 @@
-export * from '@oclif/command'
+export * from '@oclif/command'

package/src/managers/config/allowed_files.ts

@@ -1,29 +1,29 @@
-const extensions = {
-  extensions: [
-    "py",
-    "java",
-    "py",
-    "ruby",
-    "html",
-    "css",
-    "htm",
-    "php", // images
-    "js",
-    "jsx",
-    "ts", // images
-    "sh",
-    "bash", // images
-    "json",
-    "yml",
-    "yaml",
-    "csv",
-    "xml", // file storage extensions
-    "txt",
-    "text",
-    "markdown",
-    "readme", // compressed files
-  ],
-  names: ["package.json", "package-lock.json"],
-}
-
-export default extensions
+const extensions = {
+  extensions: [
+    "py",
+    "java",
+    "py",
+    "ruby",
+    "html",
+    "css",
+    "htm",
+    "php", // images
+    "js",
+    "jsx",
+    "ts", // images
+    "sh",
+    "bash", // images
+    "json",
+    "yml",
+    "yaml",
+    "csv",
+    "xml", // file storage extensions
+    "txt",
+    "text",
+    "markdown",
+    "readme", // compressed files
+  ],
+  names: ["package.json", "package-lock.json"],
+}
+
+export default extensions

package/src/managers/config/index.ts

@@ -383,6 +383,18 @@ return true
         rmSync(configObj.config.dirPath + "/.session")
         rmSync(configObj.config.dirPath + "/resets")
 
+        // clean __pycache__ folder
+        rmSync(configObj.config.dirPath + "/../__pycache__")
+
+        // clean the __pycache__ for each exercise it exists
+        if (configObj.exercises) {
+          for (const e of configObj.exercises) {
+            if (fs.existsSync(e.path + "/__pycache__")) {
+              rmSync(e.path + "/__pycache__")
+            }
+          }
+        }
+
         // clean tag gz
         if (fs.existsSync(configObj.config.dirPath + "/app.tar.gz"))
           fs.unlinkSync(configObj.config.dirPath + "/app.tar.gz")