Skip to content

Commit

Permalink
Merge branch 'release/1.2.0'.
Browse files Browse the repository at this point in the history
  • Loading branch information
petrbroz committed Jul 23, 2019
2 parents 527b400 + f974fd3 commit f776c0d
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 46 deletions.
2 changes: 1 addition & 1 deletion examples/inventor-thumbnail/run-pipeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const fs = require('fs');
const { DataManagementClient, DesignAutomationClient } = require('forge-nodejs-utils');

const BUCKET = FORGE_BUCKET;
const BUCKET = process.env.FORGE_BUCKET;

const ACTIVITY_NAME = 'TestActivity';
const ACTIVITY_ALIAS = 'dev';
Expand Down
63 changes: 20 additions & 43 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "forge-cli-utils",
"version": "1.1.0",
"version": "1.2.0",
"description": "Command line tools for Autodesk Forge services.",
"author": "Petr Broz <[email protected]>",
"license": "MIT",
Expand All @@ -26,7 +26,7 @@
},
"dependencies": {
"commander": "^2.20.0",
"forge-nodejs-utils": "^2.1.0",
"forge-nodejs-utils": "3.4.0",
"form-data": "^2.3.3",
"inquirer": "^6.3.1"
},
Expand Down
8 changes: 8 additions & 0 deletions src/forge-da.js
Original file line number Diff line number Diff line change
Expand Up @@ -505,13 +505,17 @@ program
.option('-d, --description <description>', 'Optional activity description.')
.option('--script', 'Optional engine-specific script to pass to activity.')
.option('-i, --input <name>', 'Activity input ID (can be used multiple times).', _collectActivityInputs)
.option('-iv, --input-verb <verb>', 'Optional HTTP verb for the last activity input ("get" by default; can be used multiple times).', _collectActivityInputProps('verb'))
.option('-iz, --input-zip <boolean>', 'Optional zip flag for the last activity input (can be used multiple times).', _collectActivityInputProps('zip', (val) => val.toLowerCase() === 'true'))
.option('-ir, --input-required <boolean>', 'Optional required flag for the last activity input (can be used multiple times).', _collectActivityInputProps('required', (val) => val.toLowerCase() === 'true'))
.option('-iod, --input-on-demand', 'Optional ondemand flag for the last activity input (can be used multiple times).', _collectActivityInputProps('ondemand', (val) => val.toLowerCase() === 'true'))
.option('-id, --input-description <description>', 'Optional description for the last activity input (can be used multiple times).', _collectActivityInputProps('description'))
.option('-iln, --input-local-name <name>', 'Optional local name for the last activity input (can be used multiple times).', _collectActivityInputProps('localName'))
.option('-o, --output <name>', 'Activity output ID (can be used multiple times).', _collectActivityOutputs)
.option('-ov, --output-verb <verb>', 'Optional HTTP verb for the last activity output ("put" by default; can be used multiple times).', _collectActivityOutputProps('verb'))
.option('-oz, --output-zip <boolean>', 'Optional zip flag for the last activity output (can be used multiple times).', _collectActivityOutputProps('zip', (val) => val.toLowerCase() === 'true'))
.option('-or, --output-required <boolean>', 'Optional required flag for the last activity output (can be used multiple times).', _collectActivityOutputProps('required', (val) => val.toLowerCase() === 'true'))
.option('-ood, --output-on-demand', 'Optional ondemand flag for the last activity output (can be used multiple times).', _collectActivityOutputProps('ondemand', (val) => val.toLowerCase() === 'true'))
.option('-od, --output-description <description>', 'Optional description for the last activity output (can be used multiple times).', _collectActivityOutputProps('description'))
.option('-oln, --output-local-name <name>', 'Optional local name for the last activity output (can be used multiple times).', _collectActivityOutputProps('localName'))
.action(async function(activityShortId, bundleShortId, bundleAlias, engineFullId, command) {
Expand Down Expand Up @@ -557,13 +561,17 @@ program
.option('-d, --description <description>', 'Optional activity description.')
.option('--script', 'Optional engine-specific script to pass to activity.')
.option('-i, --input <name>', 'Activity input ID (can be used multiple times).', _collectActivityInputs)
.option('-iv, --input-verb <verb>', 'Optional HTTP verb for the last activity input ("get" by default; can be used multiple times).', _collectActivityInputProps('verb'))
.option('-iz, --input-zip <boolean>', 'Optional zip flag for the last activity input (can be used multiple times).', _collectActivityInputProps('zip', (val) => val.toLowerCase() === 'true'))
.option('-ir, --input-required <boolean>', 'Optional required flag for the last activity input (can be used multiple times).', _collectActivityInputProps('required', (val) => val.toLowerCase() === 'true'))
.option('-iod, --input-on-demand', 'Optional ondemand flag for the last activity input (can be used multiple times).', _collectActivityInputProps('ondemand', (val) => val.toLowerCase() === 'true'))
.option('-id, --input-description <description>', 'Optional description for the last activity input (can be used multiple times).', _collectActivityInputProps('description'))
.option('-iln, --input-local-name <name>', 'Optional local name for the last activity input (can be used multiple times).', _collectActivityInputProps('localName'))
.option('-o, --output <name>', 'Activity output ID (can be used multiple times).', _collectActivityOutputs)
.option('-ov, --output-verb <verb>', 'Optional HTTP verb for the last activity output ("put" by default; can be used multiple times).', _collectActivityOutputProps('verb'))
.option('-oz, --output-zip <boolean>', 'Optional zip flag for the last activity output (can be used multiple times).', _collectActivityOutputProps('zip', (val) => val.toLowerCase() === 'true'))
.option('-or, --output-required <boolean>', 'Optional required flag for the last activity output (can be used multiple times).', _collectActivityOutputProps('required', (val) => val.toLowerCase() === 'true'))
.option('-ood, --output-on-demand', 'Optional ondemand flag for the last activity output (can be used multiple times).', _collectActivityOutputProps('ondemand', (val) => val.toLowerCase() === 'true'))
.option('-od, --output-description <description>', 'Optional description for the last activity output (can be used multiple times).', _collectActivityOutputProps('description'))
.option('-oln, --output-local-name <name>', 'Optional local name for the last activity output (can be used multiple times).', _collectActivityOutputProps('localName'))
.action(async function(activityShortId, bundleShortId, bundleAlias, engineFullId, command) {
Expand Down

0 comments on commit f776c0d

Please sign in to comment.