Merge pull request #17 from sumitparakh/sumit/issues/16

fix: detect cmd option and run python executable accordingly

Author: alphacentauri82

packages/nx-python/src/builders/build/builder.ts

@@ -6,7 +6,7 @@ import {
 import { Observable, from } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { BuildBuilderSchema } from './schema';
-import { runPythonCommand } from '../../utils/py-utils'
+import { getCliOptions, runPythonCommand } from '../../utils/py-utils'
 
 export function runBuilder(
   options: BuildBuilderSchema,
@@ -17,7 +17,7 @@ export function runBuilder(
       const mainFile = `${options.main}`
       const output = `${options.outputPath}`
       //Compile files using the native py_compile module
-      return runPythonCommand(context, 'build', [mainFile])
+      return runPythonCommand(context, 'build', [mainFile], getCliOptions(options))
     })
   );
 }

packages/nx-python/src/builders/lint/builder.ts

@@ -2,7 +2,7 @@ import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/ar
 import { from, Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { LintBuilderSchema } from './schema'
-import { runPythonCommand } from '../../utils/py-utils'
+import { getCliOptions, runPythonCommand } from '../../utils/py-utils'
 
 export function runBuilder(options: LintBuilderSchema, context: BuilderContext): Observable<BuilderOutput> {
   return from(context.getProjectMetadata(context?.target?.project)).pipe(
@@ -12,7 +12,7 @@ export function runBuilder(options: LintBuilderSchema, context: BuilderContext):
       const sources = `${root}/src/*.py`
 
       // Executing linting using the flake8 module
-      return runPythonCommand(context, 'lint', [sources])
+      return runPythonCommand(context, 'lint', [sources], getCliOptions(options))
     }),
   )
 }

packages/nx-python/src/builders/serve/builder.ts

@@ -2,14 +2,14 @@ import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/ar
 import { from, Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { ServeBuilderSchema } from './schema'
-import { runPythonCommand } from '../../utils/py-utils'
+import { getCliOptions, runPythonCommand } from '../../utils/py-utils'
 
 export function runBuilder(options: ServeBuilderSchema, context: BuilderContext): Observable<BuilderOutput> {
   return from(context.getProjectMetadata(context?.target?.project)).pipe(
     map(() => {
       const mainFile = `${options.main}`
 
-      return runPythonCommand(context, 'serve', [mainFile])
+      return runPythonCommand(context, 'serve', [mainFile], getCliOptions(options))
     }),
   )
 }

packages/nx-python/src/builders/serve/schema.d.ts

@@ -3,4 +3,6 @@ import { JsonObject } from '@angular-devkit/core'
 export interface ServeBuilderSchema extends JsonObject {
   main?: string
   outputPath?: string
+  cwd?: string
+  cmd?: string
 }

packages/nx-python/src/builders/test/builder.ts

@@ -2,7 +2,7 @@ import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/ar
 import { from, Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { TestBuilderSchema } from './schema'
-import { runPythonCommand } from '../../utils/py-utils'
+import { getCliOptions, runPythonCommand } from '../../utils/py-utils'
 
 export function runBuilder(options: TestBuilderSchema, context: BuilderContext): Observable<BuilderOutput> {
   return from(context.getProjectMetadata(context?.target?.project)).pipe(
@@ -11,7 +11,7 @@ export function runBuilder(options: TestBuilderSchema, context: BuilderContext):
       const root = project.root
       const sources = `${root}/src/*test*.py`
 
-      return runPythonCommand(context, 'test', [sources])
+      return runPythonCommand(context, 'test', [sources], getCliOptions(options))
     }),
   )
 }

packages/nx-python/src/utils/py-utils.ts

@@ -1,5 +1,6 @@
 import { BuilderContext } from '@angular-devkit/architect'
 import { execSync } from 'child_process'
+import { ServeBuilderSchema } from '../builders/serve/schema'
 
 export function runPythonCommand(
   context: BuilderContext,
@@ -35,4 +36,15 @@ export function runPythonCommand(
     context.logger.error(`Failed to execute command: ${execute}`, e)
     return { success: false }
   }
+}
+
+export function getCliOptions(options: ServeBuilderSchema): ServeBuilderSchema {
+  const _options: ServeBuilderSchema = {};
+  if(options.cmd) {
+    _options.cmd = options.cmd;
+  }
+  if(options.cwd) {
+    _options.cwd = options.cwd;
+  }
+  return _options;
 }