Merge branch 'main' of https://github.com/Pythagora-io/pythagora into feat/expand-unit-tests

Author: pavel-pythagora

README.md

@@ -51,7 +51,7 @@ Here are examples of open sourced repositories that we forked and created tests
 
 - [Lodash](https://github.com/Pythagora-io/pythagora-demo-lodash)
   - 📝 1604 tests generated
-  - 🐞 13 bugs found (3 edge cases and 10 bugs)
+  - 🐞 11 bugs found (1 edge case and 10 bugs)
   - ⏳️ 4 hour run time
 
   ![lodash pythagora tests results](https://github.com/Pythagora-io/pythagora/assets/10895136/c0a2a589-e3ef-4812-9ea2-545307fd1a1d)
@@ -160,9 +160,6 @@ or to run tests from a specific file or a folder, run `npx jest <PATH_TO_FILE_OR
 <br><br>
 - **Tests help me think about my code - I don't want to generate them automatically**
     - That's the best thing about Pythagora - it actually does help you think about the code. Just, you don't need to spend time writing tests. This happened to us, who created Pythagora - we coded it as fast as possible but when we added unit test generation, we realized that it cannot create tests for some functions. So, we refactored the code and made it more modular so that unit tests can be generated for it. 
-<br><br>
-- **What tests are the best**
-    - That's the best thing about Pythagora - it actually does help you think about the code. Just, you don't need to spend time writing tests. This happened to us, who created Pythagora - we coded it as fast as possible but when we added unit test generation, we realized that it cannot create tests for some functions. So, we refactored the code and made it more modular so that unit tests can be generated for it. 
 
 <br>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pythagora",
-  "version": "0.0.69",
+  "version": "0.0.73",
   "author": {
     "name": "Zvonimir Sabljic",
     "email": "[email protected]"
@@ -17,7 +17,8 @@
     "publish-pythagora": "src/bin/publish.bash",
     "prepublishOnly": "node src/bin/prepublish.js",
     "postinstall": "node src/bin/postinstall.js",
-    "test": "npx jest ./pythagora_tests/ --coverage"
+    "test": "npx jest ./pythagora_tests/ --coverage",
+    "generate-unit-tests": "npx pythagora --unit-tests --path ./src"
   },
   "bin": {
     "pythagora": "src/bin/run.js"

src/bin/run.bash

@@ -9,7 +9,7 @@ yellow=$(tput setaf 3)
 green=$(tput setaf 2)
 reset=$(tput sgr0)
 bold=$(tput bold)
-pythagora_dir="pythagora"
+pythagora_dir="$1"
 
 function exit_handler {
   while [ ! -f "./.pythagora/finishingup" ]
@@ -25,26 +25,6 @@ function exit_handler {
   exit 0
 }
 
-commands=(basename realpath dirname)
-found_all=true
-
-for cmd in "${commands[@]}"; do
-  if ! command -v "$cmd" >/dev/null 2>&1 ; then
-    echo "$cmd command not found"
-    found_all=false
-  fi
-done
-
-if [ "$found_all" = true ] ;
-then
-  pythagora_dir=$(basename "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")
-fi
-
-if [ "$pythagora_dir" == "pythagora-dev" ]
-then
-  pythagora_dir="@pythagora.io/pythagora-dev"
-fi
-
 for (( i=0; i<${#args[@]}; i++ ))
 do
   if [[ "${args[$i]}" =~ ^--init[-_]command$ ]]
@@ -53,43 +33,35 @@ do
   elif [[ "${args[$i]}" == "--config" ]]
   then
     # TODO refactor and make it flexible
-    CONFIG_DIR="./.pythagora"
-    CONFIG_FILE="$CONFIG_DIR/config.json"
-    TMP_FILE="$CONFIG_DIR/tmp.json"
+    CONFIG_FILE="./.pythagora/config.json"
+    rm "$CONFIG_FILE"
 
-    # Create the config file if it doesn't exist
     if [ ! -f "$CONFIG_FILE" ]; then
-        mkdir -p $CONFIG_DIR
-        echo "{}" > $CONFIG_FILE
+        mkdir -p ./.pythagora
+        touch "./$CONFIG_FILE"
     fi
 
     API_NAME="${args[$i+1]//--/}"
     API_NAME="${API_NAME//-/_}"
     API_KEY="${args[$i+2]}"
-
-    if [ "$API_NAME" == "pythagora_api_key" ]; then
-        jq 'del(.openai_api_key)' $CONFIG_FILE > $TMP_FILE && mv $TMP_FILE $CONFIG_FILE
-    elif [ "$API_NAME" == "openai_api_key" ]; then
-        jq 'del(.pythagora_api_key)' $CONFIG_FILE > $TMP_FILE && mv $TMP_FILE $CONFIG_FILE
-    fi
-
-    # Use jq to add the new key-value pair to the JSON object
-    jq --arg key "$API_NAME" --arg value "$API_KEY" '. + {($key): $value}' $CONFIG_FILE > $TMP_FILE && mv $TMP_FILE $CONFIG_FILE
+    echo "{" >> $CONFIG_FILE
+    echo "    \"$API_NAME\": \"$API_KEY\"" >> $CONFIG_FILE
+    echo "}" >> $CONFIG_FILE
     echo "${green}${bold}API key added to config!${reset}"
     exit 0
   elif [[ "${args[$i]}" == "--review" ]]
   then
-    PYTHAGORA_CONFIG="$@" node "./node_modules/${pythagora_dir}/src/scripts/review.js"
+    PYTHAGORA_CONFIG="$@" node "${pythagora_dir}/src/scripts/review.js"
     exit 0
   elif [[ "${args[$i]}" == "--tests-eligible-for-export" ]]
   then
     echo "${yellow}${bold}Tests eligible for export:${reset}"
-    PYTHAGORA_CONFIG="$@" node "./node_modules/${pythagora_dir}/src/scripts/testsEligibleForExport.js"
+    PYTHAGORA_CONFIG="$@" node "${pythagora_dir}/src/scripts/testsEligibleForExport.js"
     exit 0
   elif [[ "${args[$i]}" == "--unit-tests" ]]
   then
     echo "${green}${bold}Generating unit tests...${reset}"
-    PYTHAGORA_CONFIG="$@" node "./node_modules/${pythagora_dir}/src/scripts/unit.js"
+    PYTHAGORA_CONFIG="$@" node "${pythagora_dir}/src/scripts/unit.js"
     exit 0
 
   elif [[ "${args[$i]}" == "--expand-unit-tests" ]]
@@ -100,23 +72,23 @@ do
 
   elif [[ "${args[$i]}" == "--export-setup" ]]
   then
-    PYTHAGORA_CONFIG="$@" node "./node_modules/${pythagora_dir}/src/scripts/enterData.js"
+    PYTHAGORA_CONFIG="$@" node "${pythagora_dir}/src/scripts/enterData.js"
     exit 0
   elif [[ "${args[$i]}" =~ ^--rename[-_]tests$ ]]
   then
-    node "./node_modules/${pythagora_dir}/src/scripts/renameTests.js"
+    node "${pythagora_dir}/src/scripts/renameTests.js"
     exit 0
   elif [[ "${args[$i]}" =~ ^--delete[-_]all[-_]failed$ ]]
   then
-    node "./node_modules/${pythagora_dir}/src/scripts/deleteAllFailed.js"
+    node "${pythagora_dir}/src/scripts/deleteAllFailed.js"
     exit 0
   elif [[ "${args[$i]}" == "--delete" ]]
   then
-    PYTHAGORA_CONFIG="$@" node "./node_modules/${pythagora_dir}/src/scripts/deleteTest.js"
+    PYTHAGORA_CONFIG="$@" node "${pythagora_dir}/src/scripts/deleteTest.js"
     exit 0
   elif [[ "${args[$i]}" == "--export" ]]
   then
-    PYTHAGORA_CONFIG="$@" node -e "require('./node_modules/${pythagora_dir}/src/commands/export.js').runExport()"
+    PYTHAGORA_CONFIG="$@" node -e "require('${pythagora_dir}/src/commands/export.js').runExport()"
     exit 0
   elif [[ "${args[$i]}" == "--mode" ]]
   then
@@ -133,7 +105,7 @@ fi
 if [[ " ${args[@]} " =~ " --no-code-coverage " ]] || ([[ ! " ${args[@]} " =~ " --mode test " ]] && [[ ! " ${args[@]} " =~ " --mode=test " ]])
 then
   args=( "${args[@]//--no-code-coverage/}" )
-  PYTHAGORA_CONFIG="$@" NODE_OPTIONS="${inspect} --require ./node_modules/${pythagora_dir}/src/RunPythagora.js" $init_command &
+  PYTHAGORA_CONFIG="$@" NODE_OPTIONS="${inspect} --require ${pythagora_dir}/src/RunPythagora.js" $init_command &
 else
   nyc_args=( "--reporter=text-summary" )
 
@@ -144,11 +116,11 @@ else
     nyc_args+=( "--report-dir=./pythagora_tests/code_coverage_report" )
   fi
 
-  if [ -f "./node_modules/$pythagora_dir/node_modules/nyc/bin/nyc.js" ]
+  if [ -f "$pythagora_dir/node_modules/nyc/bin/nyc.js" ]
   then
-    PYTHAGORA_CONFIG="$@" NODE_OPTIONS="${inspect} --require ./node_modules/${pythagora_dir}/src/RunPythagora.js" ./node_modules/"$pythagora_dir"/node_modules/nyc/bin/nyc.js "${nyc_args[@]}" $init_command &
+    PYTHAGORA_CONFIG="$@" NODE_OPTIONS="${inspect} --require ${pythagora_dir}/src/RunPythagora.js" "$pythagora_dir"/node_modules/nyc/bin/nyc.js "${nyc_args[@]}" $init_command &
   else
-    PYTHAGORA_CONFIG="$@" NODE_OPTIONS="${inspect} --require ./node_modules/${pythagora_dir}/src/RunPythagora.js" ./node_modules/nyc/bin/nyc.js "${nyc_args[@]}" $init_command &
+    PYTHAGORA_CONFIG="$@" NODE_OPTIONS="${inspect} --require ${pythagora_dir}/src/RunPythagora.js" ./node_modules/nyc/bin/nyc.js "${nyc_args[@]}" $init_command &
   fi
 
 fi

src/bin/run.js

@@ -38,10 +38,12 @@ exec(bashCommand, (error, stdout, stderr) => {
   const bashPaths = stdout.split('\r\n').filter(line => line.trim() !== '').map(line => line.trim());
   const bashPath = bashPaths.find((p) => fs.existsSync(p));
   const bashScript = winOS ? process.argv[1].replace('run.js', 'run.bash') : path.join(__dirname, 'run.bash');
+  const scriptDir = path.dirname(bashScript);  // Get the directory of the bash script
+  const pythagoraDir = path.dirname(path.dirname(scriptDir)); // Get the pythagora directory
   const args = process.argv.slice(2);
 
   // Run the bash script and forward all arguments
-  const child = spawn(bashPath, [bashScript, ...args], { stdio: 'inherit' });
+  const child = spawn(bashPath, [bashScript, pythagoraDir, ...args], { stdio: 'inherit' });
 
   child.on('error', (error) => {
     console.error(`Error running the bash script: ${error.message}`);