Skip to content
This repository has been archived by the owner on Feb 28, 2020. It is now read-only.

Commit

Permalink
fix(docs): clarified section for publishing and contributing
Browse files Browse the repository at this point in the history
clarified bluemix option
  • Loading branch information
Nana Amfo committed Nov 14, 2017
1 parent baf780b commit 1213563
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ npm install -g generator-ibm-service-enablement
## Usage

Following command line arguments are supported
* `--bluemix {stringified-json}` - used by Scaffolder to supply project information from `pman`. This will be referred as `projectConfig` in this document. You can also supply a local file containing compatible JSON object by using `--bluemix file:path/to/file.json`
* `--bluemix {stringified-json}` - used by Scaffolder to supply project information from `pman`. For an example of a bluemix.json look at the [fallback_bluemix.js](./generators/app/fallback_bluemix.js) file.

## Development

Expand All @@ -58,7 +58,7 @@ npm link
In a separate directory invoke the generator via

```bash
yo ibm-service-enablement
yo ibm-service-enablement --bluemix "{\"name\": \"projectName\", \"backendPlatform\": \"PYTHON\"}"
```

## Testing
Expand Down Expand Up @@ -118,5 +118,4 @@ Once you are finished with your changes, run `npm test` to make sure all tests p

Do a pull request against `development`, make sure the build passes. A team member will review and merge your pull request.
Once merged to development to master, the version will be auto-incremented and published according to the commit. Please follow the [conventional commit specification](https://conventionalcommits.org/)
before contributing. To help you with commit a commit template is provide. Run `config.sh` to initialize the commit template to your `.git/config`.

before contributing. To help you with commit a commit template is provide. Run `config.sh` to initialize the commit template to your `.git/config`.
4 changes: 0 additions & 4 deletions generators/lib/generatorbase.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,9 @@ module.exports = class extends Generator {

_addDependencies() {
this.logger.info("Adding dependencies");
console.log(this.context.dependenciesFile);
console.log(Array.isArray(this.context.dependenciesFile));
if (Array.isArray(this.context.dependenciesFile)){

for (let i = 0; i < this.context.dependenciesFile.length; i++) {
console.log('100 ' +this.languageTemplatePath);
console.log('101 ' + this.context.dependenciesFile[i]);
this.context.addDependencies(this.fs.read(this.languageTemplatePath + "/" + this.context.dependenciesFile[i]));
}
}else{
Expand Down
4 changes: 2 additions & 2 deletions test/integration-python-flask-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
'use strict'
'use strict';
const optionsBluemix = Object.assign({}, require('./resources/bluemix.int.json'));
const assert = require('chai').assert;
const path = require('path');
Expand All @@ -15,7 +15,7 @@ const axios = require('axios');

// Change these if you're getting SSL-related problems
const pythonRuntime = 'python3';
const pipRuntime = 'pip3'
const pipRuntime = 'pip3';

describe('integration test for services', function() {
before(function(done) {
Expand Down

0 comments on commit 1213563

Please sign in to comment.