Merge pull request #635 from IBM-Swift/updateTo5.6.1

Release 5.6.1

CHANGES.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="5.6.1"></a>
+## [5.6.1](https://github.com/IBM-Swift/generator-swiftserver/compare/5.6.0...5.6.1) (2018-10-28)
+
+
+### Bug Fixes
+
+* addressing option handling for temporary devops pipeline workflow ([ec72a92](https://github.com/IBM-Swift/generator-swiftserver/commit/ec72a92))
+* addressing option handling for temporary devops pipeline workflow ([d4bb0ed](https://github.com/IBM-Swift/generator-swiftserver/commit/d4bb0ed))
+
+
+
 <a name="5.6.0"></a>
 # [5.6.0](https://github.com/IBM-Swift/generator-swiftserver/compare/5.5.0...5.6.0) (2018-10-16)
 

app/index.js

@@ -187,7 +187,11 @@ module.exports = Generator.extend({
           repoType: 'clone',
           healthcheck: healthcheck,
           usecase: usecase,
-          starterOptions: starterOptions
+          starterOptions: starterOptions,
+          deploymentOrg: this.options.deploymentOrg,
+          deploymentSpace: this.options.deploymentSpace,
+          deploymentRegion: this.options.deploymentRegion,
+          toolchainName: this.options.toolchainName
         }
       } else if (this.options.init) {
         // User passed the --init flag, so no prompts, just generate basic default scaffold

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-swiftserver",
-  "version": "5.6.0",
+  "version": "5.6.1",
   "description": "Generator for Kitura REST webservice servers",
   "main": "app/index.js",
   "scripts": {

refresh/index.js

@@ -1406,10 +1406,10 @@ module.exports = Generator.extend({
         { force: this.force,
           bluemix: this.bluemix,
           repoType: this.repoType,
-          deploymentRegion: this.options.deploymentRegion,
-          deploymentOrg: this.options.deploymentOrg,
-          deploymentSpace: this.options.deploymentSpace,
-          toolchainName: this.options.toolchainName
+          deploymentRegion: this.spec.deploymentRegion,
+          deploymentOrg: this.spec.deploymentOrg,
+          deploymentSpace: this.spec.deploymentSpace,
+          toolchainName: this.spec.toolchainName
         })
     },
 

test/lib/common_test.js

@@ -64,9 +64,9 @@ exports.crudSourceFiles = [
 
 exports.bxdevConfigFile = 'cli-config.yml'
 exports.cloudFoundryManifestFile = 'manifest.yml'
-exports.deploymentRegion = '{{deploymentRegion}}'
-exports.deploymentSpace = '{{deploymentSpace}}'
-exports.deploymentOrg = '{{deploymentOrg}}'
+exports.deploymentRegion = '{{region}}'
+exports.deploymentSpace = '{{space}}'
+exports.deploymentOrg = '{{organization}}'
 exports.toolchainName = 'toolchainName'
 exports.cloudFoundryFiles = [ exports.cloudFoundryManifestFile, '.cfignore' ]
 exports.bluemixPipelineFile = '.bluemix/pipeline.yml'