reverting ed64700 due to breaking changes - postponing til v2 release

Author: Almenon

index.ts

@@ -40,9 +40,9 @@ export interface Options extends SpawnOptions{
      */
     pythonOptions?: string[]
     /**
-     * the scriptPath passed to PythonShell is executed relative to scriptFolder, if specified
+     * overrides scriptPath passed into PythonShell constructor
      */
-    scriptFolder?: string
+    scriptPath?: string
     /**
      * arguments to your program
      */
@@ -120,7 +120,7 @@ export class PythonShell extends EventEmitter{
         let pythonOptions = toArray(options.pythonOptions);
         let scriptArgs = toArray(options.args);
 
-        this.scriptPath = join(options.scriptFolder || '', scriptPath);
+        this.scriptPath = join(options.scriptPath || '', scriptPath);
         this.command = pythonOptions.concat(this.scriptPath, scriptArgs);
         this.mode = options.mode || 'text';
         this.formatter = resolve('format', options.formatter || this.mode);

test/test-python-shell.ts

@@ -9,7 +9,7 @@ describe('PythonShell', function () {
     const pythonFolder = 'test/python'
 
     PythonShell.defaultOptions = {
-        scriptFolder: pythonFolder
+        scriptPath: pythonFolder
     };
 
     describe('#ctor(script, options)', function () {
@@ -39,7 +39,7 @@ describe('PythonShell', function () {
 
             //reset values to intial status
             PythonShell.defaultOptions = {
-                scriptFolder: pythonFolder
+                scriptPath: pythonFolder
             };
             chdir(originalDirectory)
         });
@@ -101,7 +101,7 @@ describe('PythonShell', function () {
         after(()=>{
             PythonShell.defaultOptions = {
                 // reset to match initial value
-                scriptFolder: pythonFolder
+                scriptPath: pythonFolder
             };
         })
     });