fixed compile and test

Author: alesanchezr

README.md

@@ -19,7 +19,7 @@ $ npm install -g learnpack-python
 $ oclif-example COMMAND
 running command...
 $ oclif-example (-v|--version|version)
-learnpack-python/0.0.34 darwin-x64 node-v10.17.0
+learnpack-python/0.0.35 darwin-x64 node-v14.16.0
 $ oclif-example --help [COMMAND]
 USAGE
   $ oclif-example COMMAND

package.json

@@ -1,7 +1,7 @@
 {
   "name": "learnpack-python",
   "description": "Python Compiler for learnpack tutorials",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "author": "Alejandro Sanchez @alesanchezr",
   "bugs": "https://github.com/learnpack/learnpack/issues",
   "dependencies": {

src/compile.js

@@ -10,17 +10,25 @@ module.exports = {
   },
   run: async function ({ exercise, socket }) {
 
-    let entryPath = exercise.entry || exercise.files.map(f => './'+f.path).find(f => f.indexOf('app.py') > -1);
+    let entryPath = exercise.files.map(f => './'+f.path).find(f => f.includes(exercise.entry || 'app.py'));
     if(!entryPath) throw new Error("No entry file to compile, maybe you need to create an app.py in the exercise directory?");
 
     const content = fs.readFileSync(entryPath, "utf8");
-    const count = Utils.getMatches(/^([^\/])+input\((?:["'`]{1}(.*)["'`]{1})?\)/gm, content);
+    const count = Utils.getMatches(/^(?:[^\/])+input\s*\(\s*(?:["'`]{1}(.*)["'`]{1})?\s*\)\s*/gm, content);
     let inputs = (count.length == 0) ? [] : await socket.ask(count);
-
+    
     const result = await python.runFile(entryPath, { stdin: inputs.join('\n'), executionPath: 'python3' })
     if(result.exitCode > 0) throw CompilationError(result.stderr);
-    return Utils.cleanStdout(result.stdout, count)
+    return cleanStdout(result.stdout, inputs)
 
   },
 }
-  
+
+const cleanStdout = (buffer, inputs) => {
+
+  // if(Array.isArray(inputs))
+  //   for(let i = 0; i < inputs.length; i++)
+  //     if(inputs[i]) buffer = buffer.replace(inputs[i],'');
+
+  return buffer;
+}

src/test.js

@@ -51,10 +51,10 @@ def pytest_generate_tests(metafunc):
 
     const getEntry = () => {
       //console.log(exercise);
-      let entryPath = exercise.files.map(f => './'+f.path).find(f => f.indexOf('test.py') > -1 || f.indexOf('tests.py') > -1)
+      let entryPath = exercise.files.map(f => './'+f.path).find(f => f.includes('test.py') || f.includes('tests.py'))
       if (!fs.existsSync(entryPath)) throw TestingError(`🚫 No tests.py script found on the exercise in ${entryPath}`)
 
-      const appPath = exercise.files.map(f => './'+f.path).find(f => f.indexOf('app.py') > -1)
+      const appPath = exercise.files.map(f => './'+f.path).find(f => f.includes(exercise.entry || 'app.py'))
       if (fs.existsSync(appPath)){
         let content = fs.readFileSync(appPath, "utf8")
         const count = Utils.getMatches(/def\s[a-zA-Z]/gm, content)
@@ -73,7 +73,7 @@ def pytest_generate_tests(metafunc):
 
     const getCommands = async function(){
 
-      const appPath = exercise.entry || exercise.files.map(f => './'+f.path).find(f => f.indexOf('app.py') > -1)
+      const appPath = exercise.files.map(f => './'+f.path).find(f => f.includes(exercise.entry || 'app.py'))
       if(appPath !== undefined){
         const content = fs.readFileSync(appPath, "utf8")
         const count = Utils.getMatches(/^([^\/])+input\((?:["'`]{1}(.*)["'`]{1})?\)/gm, content)