Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add support for bin-scripts (python only) #1941

Merged
merged 18 commits into from
Dec 10, 2020
Merged

feat: add support for bin-scripts (python only) #1941

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b1547a2
feat: add bin script folder
kozlove-aws Aug 24, 2020
aaf8d7e
feat: Add creation scripts in bin folder and adding it to setup.py
kozlove-aws Aug 25, 2020
7e9c9e2
feat: add invokeBinScript function
kozlove-aws Sep 8, 2020
a1a8847
Merge remote-tracking branch 'origin/master' into add_bin_script_folder
RomainMuller Sep 24, 2020
66943e6
Add missing _ prefix to Kernel prototype private method
RomainMuller Sep 24, 2020
48ad9f5
Merge branch 'master' of https://github.com/aws/jsii into add_bin_scr…
Sep 29, 2020
dcfe863
feat: add unit test
Oct 2, 2020
d5edeb2
Merge branch 'master' into add_bin_script_folder
Oct 14, 2020
191650e
fix: rename test script, small fixes
Nov 6, 2020
375147b
fix snapshots
RomainMuller Nov 6, 2020
7ccdd96
Merge remote-tracking branch 'origin/main' into add_bin_script_folder
RomainMuller Nov 6, 2020
db66ffd
Merge remote-tracking branch 'origin/main' into add_bin_script_folder
RomainMuller Nov 11, 2020
122b17e
fix linter offense
RomainMuller Nov 11, 2020
26b3a5b
Add cmd wrapper for Windows
Nov 27, 2020
2735e68
Merge branch 'main' into add_bin_script_folder
RomainMuller Nov 30, 2020
1d7ced4
fix test expectations
RomainMuller Nov 30, 2020
f42d160
Fix Windows tests
Nov 30, 2020
fc2ec7c
Merge branch 'main' into add_bin_script_folder
mergify[bot] Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/@jsii/spec/lib/assembly.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ export interface Assembly extends AssemblyConfiguration, Documentable {
* @default none
*/
readme?: { markdown: string };

/**
* List of bin-scripts
*
* @default none
*/
bin?: { [script: string]: string };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's tighten this one up from the start (cannot fix the older fields to readonly because... backwards-compatibility... but we can be nice with the new ones!)

Suggested change
bin?: { [script: string]: string };
bin?: { readonly [script: string]: string };

}

/**
Expand Down
7 changes: 7 additions & 0 deletions packages/jsii-pacmak/lib/targets/python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,13 @@ class PythonModule implements PythonType {
code.line(`from ${'.'.repeat(distanceFromRoot + 1)}_jsii import *`);

this.emitRequiredImports(code, context);
if (this.assembly.bin) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like being explicit here (JS' truthiness/falsiness is a little awkward)

Suggested change
if (this.assembly.bin) {
if (this.assembly.bin != null) {

code.line(`print('BIN-scripts were found.');`);
const scripts = Object.keys(this.assembly.bin);
for (const script of scripts) {
code.line(`print('${script}: ${this.assembly.bin[script]}');`);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const scripts = Object.keys(this.assembly.bin);
for (const script of scripts) {
code.line(`print('${script}: ${this.assembly.bin[script]}');`);
}
const scripts = Object.keys(this.assembly.bin);
for (const [name, path] of Object.entries(this.assembly.bin)) {
code.line(`print('${name}: ${path}');`);
}

}
}

// Emit all of our members.
Expand Down
1 change: 1 addition & 0 deletions packages/jsii/lib/assembler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ export class Assembler implements Emitter {
readme,
jsiiVersion,
fingerprint: '<TBD>',
bin: this.projectInfo.bin,
};

const validator = new Validator(this.projectInfo, assembly);
Expand Down
2 changes: 2 additions & 0 deletions packages/jsii/lib/project-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export interface ProjectInfo {
readonly excludeTypescript: string[];
readonly projectReferences?: boolean;
readonly tsc?: TSCompilerOptions;
readonly bin?: { readonly [name: string]: string };
}

export async function loadProjectInfo(
Expand Down Expand Up @@ -202,6 +203,7 @@ export async function loadProjectInfo(
outDir: pkg.jsii?.tsc?.outDir,
rootDir: pkg.jsii?.tsc?.rootDir,
},
bin: pkg.bin,
};
}

Expand Down