Merge pull request #146 from ibm-developer/require-bluemix

fix: require bluemix option

Author: Jennifer Oliver

app/index.js

@@ -53,16 +53,15 @@ module.exports = class extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
-    // bluemix option for YaaS integration
-    this.argument(OPTION_BLUEMIX, {
+    this.option(OPTION_BLUEMIX, {
       desc: 'Option for deploying with Bluemix. Stringified JSON.',
-      required: false,
+      required: true,
       hide: true,
       type: String
-    });
+    })
 
     // spec as json
-    this.argument(OPTION_SPEC, {
+    this.option(OPTION_SPEC, {
       desc: 'The generator specification. Stringified JSON.',
       required: false,
       hide: true,
@@ -73,8 +72,9 @@ module.exports = class extends Generator {
   initializing() {
     this.skipPrompt = true;
     let bluemix_ok= this._sanitizeOption(this.options, OPTION_BLUEMIX);
-    let spec_ok= this._sanitizeOption(this.options, OPTION_SPEC);
-    if ( ! (bluemix_ok || spec_ok )) throw ("Must specify either bluemix or spec parameter");
+    this._sanitizeOption(this.options, OPTION_SPEC)
+
+    if ( ! (bluemix_ok )) throw ("Must specify bluemix parameter");
 
     if ( typeof this.options.bluemix.quiet == "undefined" || ! this.options.bluemix.quiet ) {
       logger.info("Package info ::", Bundle.name, Bundle.version);

test/integration.js

@@ -23,24 +23,6 @@ const helpers = require('yeoman-test');
 const fs = require('fs');
 const PROJECT_NAME = "ProjectName";
 
-
-
-
-describe('error thrown when bluemix parameter is missing', function () {
-
-  before(function () {
-    // Mock the options, set up an output folder and run the generator
-    return helpers.run(path.join(__dirname, '../app'))
-      .withOptions({}) // No parameters!!
-      .on('error', function () {
-        assert(true);
-      })
-      .toPromise( function() { // Should never return a promise
-        assert(false)
-      })
-  });
-});
-
 describe('core-node-express:app integration test with custom spec', function () {
   // Express build is slow so we need to set a longer timeout for the test
   this.timeout(150000);
@@ -49,8 +31,8 @@ describe('core-node-express:app integration test with custom spec', function ()
     // Mock the options, set up an output folder and run the generator
     return helpers.run(path.join(__dirname, '../app'))
       .withOptions({
-        spec: JSON.stringify({ appname: 'testApp', port: common.defaultPort }),
-        bluemix: JSON.stringify({ name: PROJECT_NAME })
+        bluemix: JSON.stringify({ name: PROJECT_NAME }),
+        spec: JSON.stringify({ appname: 'testApp', port: common.defaultPort })
       })
       .toPromise(); // Get a Promise back when the generator finishes
   });
@@ -67,8 +49,8 @@ describe('core-node-express:app integration test with custom spec', function ()
   });
 
   describe('has a public directory', function () {
-		// Files which we assert are created each time the app generator is run.
-		// Takes an array of files, converted from obj by Object.values().
+    // Files which we assert are created each time the app generator is run.
+    // Takes an array of files, converted from obj by Object.values().
     it('creates public route', function () {
       assert.fileContent('server/routers/index.js', 'require(\'./public\')(app);');
     })
@@ -460,11 +442,11 @@ describe('core-node-express:app integration test as microservice', function () {
   this.timeout(150000);
   before(function () {
     return helpers.run(path.join(__dirname, '../app'))
-  .withOptions({
-    spec: JSON.stringify({ appname: 'testApp', port: common.defaultPort, applicationType: 'MS' }),
-    bluemix: JSON.stringify({ name: PROJECT_NAME })
-  })
- .toPromise(); // Get a Promise back when the generator finishes
+      .withOptions({
+        spec: JSON.stringify({ appname: 'testApp', port: common.defaultPort, applicationType: 'MS' }),
+        bluemix: JSON.stringify({ name: PROJECT_NAME })
+      })
+      .toPromise(); // Get a Promise back when the generator finishes
   });
 
   it('creates health route', function () {
@@ -484,11 +466,11 @@ describe('core-node-express:app microservice integration test with openApiServic
     let swagger = JSON.parse(fs.readFileSync(path.join(__dirname, '../test/resources/person_dino.json'), 'utf8'));
     let swagStr = JSON.stringify(swagger);
     return helpers.run(path.join(__dirname, '../app'))
-			.withOptions({
-  spec: JSON.stringify({ appname: 'testApp', port: common.defaultPort, isDeployableContainer: true, applicationType: 'MS' }),
-  bluemix: JSON.stringify({ name: PROJECT_NAME, openApiServers: [{ spec: swagStr }] })
-})
-			.toPromise(); // Get a Promise back when the generator finishes
+      .withOptions({
+        spec: JSON.stringify({ appname: 'testApp', port: common.defaultPort, isDeployableContainer: true, applicationType: 'MS' }),
+        bluemix: JSON.stringify({ name: PROJECT_NAME, openApiServers: [{ spec: swagStr }] })
+      })
+      .toPromise(); // Get a Promise back when the generator finishes
   });
 
   it('public route', function () {
@@ -504,11 +486,11 @@ describe('core-node-express:app blank integration test with openApiServices', fu
     let swagger = JSON.parse(fs.readFileSync(path.join(__dirname, '../test/resources/person_dino.json'), 'utf8'));
     let swagStr = JSON.stringify(swagger);
     return helpers.run(path.join(__dirname, '../app'))
-			.withOptions({
-  spec: JSON.stringify({ appname: 'testApp', port: common.defaultPort, isDeployableContainer: true, applicationType: 'BLANK' }),
-  bluemix: JSON.stringify({ name: PROJECT_NAME, openApiServers: [{ spec: swagStr }] })
-})
-			.toPromise(); // Get a Promise back when the generator finishes
+      .withOptions({
+        spec: JSON.stringify({ appname: 'testApp', port: common.defaultPort, isDeployableContainer: true, applicationType: 'BLANK' }),
+        bluemix: JSON.stringify({ name: PROJECT_NAME, openApiServers: [{ spec: swagStr }] })
+      })
+      .toPromise(); // Get a Promise back when the generator finishes
   });
 
   it('public route', function () {