Skip to content

Commit

Permalink
feat: Additional arguments are allowed
Browse files Browse the repository at this point in the history
Closes #4
  • Loading branch information
jubianchi committed Apr 25, 2017
1 parent 0fb4dc9 commit 989c460
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"url": "https://github.com/pmsipilot/jenklab-ci.git"
},
"dependencies": {
"caporal": "^0.3.0",
"caporal": "^0.5.0",
"jenkins": "^0.20.0"
},
"devDependencies": {
Expand Down
28 changes: 24 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
'use strict';

const caporal = require('caporal');
const jenkins = require('jenkins');
const utils = require('jenkins/lib/utils');
const metadata = require('../package.json');
const Build = require('./build');
const BuildStatus = require('./build-status');
const Environment = require('./environment');
const Parameter = require('./parameter');
const Queue = require('./queue');
const Request = require('./request');
const Url = require('./url');
Expand Down Expand Up @@ -100,11 +103,22 @@ function triggerBuild(client, job, parameters) {

/**
* @param {string} job
* @param {Array.<Parameter>} parameters
*
* @returns {Promise.<Request>}
*/
function buildJobRequest(job) {
return new Promise((resolve) => { resolve(new Request(job, new Environment(process.env))); });
function buildJobRequest(job, parameters) {
return new Promise((resolve) => {
resolve(
new Request(
job,
parameters.reduce(
(previous, parameter) => Object.assign({}, previous, { [parameter.name]: parameter.value }),
new Environment(process.env)
)
)
);
});
}

/**
Expand Down Expand Up @@ -151,17 +165,23 @@ caporal
.argument('<job>', 'Job name')
.option('--https', 'Use https to reach Jenkins', caporal.BOOL, parseBool(process.env.JENKLAB_HTTPS))
.option('--host <host>', 'Jenkins host name', '', process.env.JENKLAB_HOST)
.option('--port <port>', 'Jenkins port number', caporal.INT, parseInt(process.env.JENKLAB_PORT, 10))
.option(
'--port <port>',
'Jenkins port number',
caporal.INT,
process.env.JENKLAB_PORT ? parseInt(process.env.JENKLAB_PORT, 10) : null
)
.option('--username <username>', 'Jenkins username', '', process.env.JENKLAB_USERNAME)
.option('--token <token>', 'Jenkins token', '', process.env.JENKLAB_TOKEN)
.option('--polling-interval <token>', 'Polling interval (seconds)', caporal.INT, 5)
.option('--parameter <descriptor>', 'Additional parameters', caporal.REPEATABLE)
.action((args, options, logger) => {
const client = jenkins({
baseUrl: new Url(options).toString(),
crumbIssuer: true,
});

buildJobRequest(args.job)
buildJobRequest(args.job, options.parameter.map(descriptor => new Parameter(descriptor)))
.then(request => {
logger.debug('Sending request:', request);
logger.debug('\n');
Expand Down
16 changes: 16 additions & 0 deletions src/parameter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
'use strict';

class Parameter {
/**
*
* @param {string} descriptor
*/
constructor(descriptor) {
const parts = descriptor.split('=');

this.name = parts[0];
this.value = parts.slice(1).join('=');
}
}

module.exports = Parameter;

0 comments on commit 989c460

Please sign in to comment.