Skip to content

Converted package.sh and zip.sh to Javascript files. #219

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.

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

Merged
merged 7 commits into from
Mar 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
81 changes: 81 additions & 0 deletions npm/package.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
var shell = require('shelljs'),
path = require('path'),
async = require('async'),
fs = require('fs'),
exists,
codegen,
codegens,
codegen_path,
getSubfolders,
individual_test,
commandOut;

const args = process.argv[2],
PATH_TO_CODEGENS_FOLDER = path.resolve(__dirname, '../codegens');

// throw JS error when any shell.js command encounters an error
shell.config.fatal = true;

// ensure that the working tree is clean before packaging
commandOut = shell.exec('source ./npm/package/require_clean_work_tree.sh');
if (commandOut.code !== 0) {
shell.exit(1);
}

getSubfolders = (folder) => {
return fs.readdirSync(folder)
.map((subfolder) => { return { path: path.join(folder, subfolder), name: subfolder}; })
.filter((obj) => { return fs.statSync(obj.path).isDirectory(); });
};

individual_test = (codegen) => {

console.log(`Creating package for ${codegen}`);
async.series([
function (next) {
console.log(`Running codegen test for codegen ${codegen}`);
commandOut = shell.exec(`npm run test ${codegen} --color always`);
if (commandOut.code !== 0) {
console.error(`Failed to run codegen test on codegen ${codegen}, here's the error:`);
return next(commandOut.stderr);
}
console.log(commandOut.stdout);
return next();
},
function (next) {
console.log(`Generating zip for codegen ${codegen}`);
commandOut = shell.exec(`npm run zip ${codegen} --color always`);
if (commandOut.code !== 0) {
console.error(`Failed to zip codegen ${codegen}, here's the error:`);
return next(commandOut.stderr);
}
console.log(commandOut.stdout);
}
], (err) => {
console.error(err);
shell.exit(1);
});
};

if (args) {
codegen = args;
codegen_path = path.join(PATH_TO_CODEGENS_FOLDER, codegen);
try {
exists = fs.statSync(codegen_path).isDirectory();
}
catch (err) {
console.log(`Codegen ${codegen} doesn't exist, please enter a valid name`);
console.log(err);
shell.exit(1);
}
if (exists) {
individual_test(codegen);
}
}
else {
console.log('Packaging all the codegens');
codegens = getSubfolders(PATH_TO_CODEGENS_FOLDER);
codegens.forEach((codegen) => {
individual_test(codegen.name);
});
}
36 changes: 0 additions & 36 deletions npm/package.sh

This file was deleted.

33 changes: 33 additions & 0 deletions npm/zip.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
var shell = require('shelljs'),
path = require('path'),
fs = require('fs'),
codegen_path,
commandOut,
exists;

const codegen = process.argv[2],
PATH_TO_CODEGENS_FOLDER = path.resolve(__dirname, '../codegens');

// throw JS error when any shell.js command encounters an error
shell.config.fatal = true;

codegen_path = path.join(PATH_TO_CODEGENS_FOLDER, codegen);

try {
exists = fs.statSync(codegen_path).isDirectory();
}
catch (err) {
console.log(`Codegen ${codegen} doesn't exist, please enter a valid name`);
shell.exit(1);
}
if (exists) {
console.log(`${codegen} : zip`);
shell.pushd(codegen_path, 'q');
commandOut = shell.exec('npm pack --color always');
if (commandOut.code !== 0) {
console.error(`Failed to run pre-package.js for codegen ${codegen}, here's the error:`);
console.log(commandOut.stderr);
shell.exit(1);
}
shell.popd(null, 'q');
}
12 changes: 0 additions & 12 deletions npm/zip.sh

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"scripts": {
"test": "npm/test.sh",
"package": "npm/package.sh",
"zip": "npm/zip.sh",
"package": "node npm/package.js",
"zip": "node npm/zip.js",
"prepack": "node npm/pre-package.js",
"postinstall": "node npm/deepinstall.js",
"deepinstall": "node npm/deepinstall.js",
Expand Down
3 changes: 2 additions & 1 deletion test/codegen/structure.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ const expectedOptions = {
name: 'Set request timeout',
type: 'positiveInteger',
default: 0,
description: 'Set number of milliseconds the request should wait for a response before timing out (use 0 for infinity)'
description: 'Set number of milliseconds the request should wait' +
' for a response before timing out (use 0 for infinity)'
},
followRedirect: {
name: 'Follow redirects',
Expand Down