Skip to content

Commit 14a9451

Browse files
kazuhitoyokoikazuhitoyokoi
committed
Resolve the conflict in swagger node template
2 parents 8665b83 + aabec5a commit 14a9451

File tree

73 files changed

+1243
-2301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1243
-2301
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ addons:
88
matrix:
99
include:
1010
- node_js: "10"
11+
script:
12+
- ./node_modules/.bin/grunt && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
1113
- node_js: "8"
1214
- node_js: "6"
13-
script:
14-
- istanbul cover ./node_modules/.bin/grunt --report lcovonly && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
1515
before_script:
1616
- docker pull swaggerapi/petstore
1717
- docker run -d -e SWAGGER_URL=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore

‎Gruntfile.js‎

Lines changed: 3 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,6 @@
11
module.exports = function (grunt) {
22
grunt.initConfig({
33
shell: {
4-
generateNode_sendToMultipleOutputs : {
5-
command: 'node bin/node-red-nodegen.js samples/send-to-multiple-outputs.js -o ./nodegen'
6-
},
7-
generateNode_sendToMultipleMessages : {
8-
command: 'node bin/node-red-nodegen.js samples/send-to-multiple-messages.js -o ./nodegen'
9-
},
10-
generateNode_allowInputToBeDiscardedByReturningNull : {
11-
command: 'node bin/node-red-nodegen.js samples/allow-input-to-be-discarded-by-returning-null.js -o ./nodegen'
12-
},
13-
generateNode_handleNullAmongstValidMessages : {
14-
command: 'node bin/node-red-nodegen.js samples/handle-null-amongst-valid-messages.js -o ./nodegen'
15-
},
16-
generateNode_getKeysInGlobalContext : {
17-
command: 'node bin/node-red-nodegen.js samples/get-keys-in-global-context.js -o ./nodegen'
18-
},
19-
generateNode_dropAndLogNonObjectMessageTypesString : {
20-
command: 'node bin/node-red-nodegen.js samples/drop-and-log-nonobject-message-types-string.js -o ./nodegen'
21-
},
22-
generateNode_dropAndLogNonObjectMessageTypesBuffer : {
23-
command: 'node bin/node-red-nodegen.js samples/drop-and-log-nonobject-message-types-buffer.js -o ./nodegen'
24-
},
25-
generateNode_dropAndLogNonObjectMessageTypesArray : {
26-
command: 'node bin/node-red-nodegen.js samples/drop-and-log-nonobject-message-types-array.js -o ./nodegen'
27-
},
28-
generateNode_dropAndLogNonObjectMessageTypesBoolean : {
29-
command: 'node bin/node-red-nodegen.js samples/drop-and-log-nonobject-message-types-boolean.js -o ./nodegen'
30-
},
31-
generateNode_dropAndLogNonObjectMessageTypesNumber : {
32-
command: 'node bin/node-red-nodegen.js samples/drop-and-log-nonobject-message-types-number.js -o ./nodegen'
33-
},
34-
generateNode_handleNodeon : {
35-
command: 'node bin/node-red-nodegen.js samples/handle-nodeon.js -o ./nodegen'
36-
},
37-
generateNode_sendReturnedMessageUsingSend: {
38-
command: 'node bin/node-red-nodegen.js samples/send-returned-message-using-send.js -o ./nodegen'
39-
},
40-
generateNode_sendReturnedMessage: {
41-
command: 'node bin/node-red-nodegen.js samples/send-returned-message.js -o ./nodegen'
42-
},
43-
generateNode_passThroughTopic: {
44-
command: 'node bin/node-red-nodegen.js samples/pass-through-topic.js -o ./nodegen'
45-
},
46-
generateNode_setNodeContext: {
47-
command: 'node bin/node-red-nodegen.js samples/set-node-context.js -o ./nodegen'
48-
},
49-
getGlobalContext1: {
50-
command: 'node bin/node-red-nodegen.js samples/get-global-context1.js -o ./nodegen'
51-
},
52-
getGlobalContext2: {
53-
command: 'node bin/node-red-nodegen.js samples/get-global-context2.js -o ./nodegen'
54-
},
55-
generateNode_getFlowContext1: {
56-
command: 'node bin/node-red-nodegen.js samples/get-flow-context1.js -o ./nodegen'
57-
},
58-
generateNode_getFlowContext2: {
59-
command: 'node bin/node-red-nodegen.js samples/get-flow-context2.js -o ./nodegen'
60-
},
61-
generateNode_setFlowContext: {
62-
command: 'node bin/node-red-nodegen.js samples/set-flow-context.js -o ./nodegen'
63-
},
64-
generateNode_setGlobalContext: {
65-
command: 'node bin/node-red-nodegen.js samples/set-global-context.js -o ./nodegen'
66-
},
67-
generateNode_getNodeContext: {
68-
command: 'node bin/node-red-nodegen.js samples/get-node-context.js -o ./nodegen'
69-
},
70-
generateNode_getKeysInNodeContext: {
71-
command: 'node bin/node-red-nodegen.js samples/get-keys-in-node-context.js -o ./nodegen'
72-
},
73-
generateNode_getKeysInFlowContext: {
74-
command: 'node bin/node-red-nodegen.js samples/get-keys-in-flow-context.js -o ./nodegen'
75-
},
76-
generateNode_handleClearInterval: {
77-
command: 'node bin/node-red-nodegen.js samples/handle-clearInterval.js -o ./nodegen'
78-
},
79-
generateNode_handleSetInterval: {
80-
command: 'node bin/node-red-nodegen.js samples/handle-setInterval.js -o ./nodegen'
81-
},
82-
generateNode_handleSetTimeout: {
83-
command: 'node bin/node-red-nodegen.js samples/handle-setTimeout.js -o ./nodegen'
84-
},
85-
generateNode_useTheSameDateObjectFromOutsideTheSandbox: {
86-
command: 'node bin/node-red-nodegen.js samples/use-the-same-Date-object-from-outside-the-sandbox.js -o ./nodegen'
87-
},
88-
generateNode_logADebugMessage: {
89-
command: 'node bin/node-red-nodegen.js samples/log-a-Debug-Message.js -o ./nodegen'
90-
},
91-
generateNode_logATraceMessage: {
92-
command: 'node bin/node-red-nodegen.js samples/log-a-Trace-Message.js -o ./nodegen'
93-
},
94-
generateNode_logAWarningMessage: {
95-
command: 'node bin/node-red-nodegen.js samples/log-a-Warning-Message.js -o ./nodegen'
96-
},
97-
generateNode_logAnErrorMessage: {
98-
command: 'node bin/node-red-nodegen.js samples/log-an-Error-Message.js -o ./nodegen'
99-
},
100-
generateNode_logAnInfoMessage: {
101-
command: 'node bin/node-red-nodegen.js samples/log-an-Info-Message.js -o ./nodegen'
102-
},
1034
generateNode_lowerCase: {
1045
command: 'node bin/node-red-nodegen.js samples/lower-case.js -o ./nodegen'
1056
},
@@ -122,7 +23,7 @@ module.exports = function (grunt) {
12223
options: {
12324
timeout: 10000
12425
},
125-
coverage: {
26+
all: {
12627
src: [ 'test/**/*_spec.js' ]
12728
}
12829
}
@@ -131,6 +32,6 @@ module.exports = function (grunt) {
13132
grunt.loadNpmTasks('grunt-shell');
13233
grunt.loadNpmTasks('grunt-simple-mocha');
13334
grunt.loadNpmTasks('grunt-mocha-istanbul');
134-
grunt.registerTask('default', ['shell', 'simplemocha']);
135-
grunt.registerTask('coverage', 'Run Istanbul code test coverage task', ['shell', 'mocha_istanbul']);
35+
grunt.registerTask('default', ['shell', 'mocha_istanbul:all']);
36+
grunt.registerTask('coverage', 'Run Istanbul code test coverage task', ['shell', 'mocha_istanbul:all']);
13637
};

‎README.md‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Node generator for Node-RED
22

3-
Node generator is command line tool to generate Node-RED node modules from a number of different sources including Swagger specification and function node's source.
3+
Node generator is command line tool to generate Node-RED node modules from several various sources including Swagger specification and function node's source.
44
Using this tool, node developers can dramatically reduce their time to implement Node-RED node modules.
55

66
## Installation
@@ -34,28 +34,34 @@ You may need to run this with `sudo`, or from within an Administrator command sh
3434
--tgz : Save node as tgz file
3535
--help : Show help
3636

37-
### Example 1. Create original node from function node (JavaScript code)
37+
### Example 1. Create original node from Swagger definition
3838

39-
- On Node-RED flow editor, save function node to library with file name (lower-case.js).
40-
- node-red-nodegen ~/.node-red/lib/function/lower-case.js
41-
- cd node-red-contrib-lower-case
39+
- node-red-nodegen http://petstore.swagger.io/v2/swagger.json
40+
- cd node-red-contrib-swagger-petstore
4241
- sudo npm link
4342
- cd ~/.node-red
44-
- npm link node-red-contrib-lower-case
43+
- npm link node-red-contrib-swagger-petstore
4544
- node-red
4645

47-
-> You can use lower-case node on Node-RED flow editor.
46+
-> You can use swagger-petstore node on Node-RED flow editor.
4847

49-
### Example 2. Create original node from Swagger definition
48+
### Example 2. Create original node from function node (JavaScript code)
5049

51-
- node-red-nodegen http://petstore.swagger.io/v2/swagger.json
52-
- cd node-red-contrib-swagger-petstore
50+
- On Node-RED flow editor, save function node to library with file name (lower-case.js).
51+
- node-red-nodegen ~/.node-red/lib/function/lower-case.js
52+
- cd node-red-contrib-lower-case
5353
- sudo npm link
5454
- cd ~/.node-red
55-
- npm link node-red-contrib-swagger-petstore
55+
- npm link node-red-contrib-lower-case
5656
- node-red
5757

58-
-> You can use swagger-petstore node on Node-RED flow editor.
58+
-> You can use lower-case node on Node-RED flow editor.
5959

60-
Note: Currently node generator supports GET and POST methods using JSON format without authentication.
60+
## Documentation
61+
- [Use cases](docs/index.md#use-cases) ([Japanese](docs/index_ja.md#use-cases))
62+
- [How to use Node generator](docs/index.md#how-to-use-node-generator) ([Japanese](docs/index_ja.md#how-to-use-node-generator))
63+
- [Generated files which node package contains](docs/index.md#generated-files-which-node-package-contains) ([Japanese](docs/index_ja.md#generated-files-which-node-package-contains))
64+
- [How to create node from Swagger definition](docs/index.md#how-to-create-node-from-swagger-definition) ([Japanese](docs/index_ja.md#how-to-create-node-from-swagger-definition))
65+
- [How to create node from function node](docs/index.md#how-to-create-node-from-function-node) ([Japanese](docs/index_ja.md#how-to-create-node-from-function-node))
6166

67+
Note: Currently node generator supports GET and POST methods using JSON format without authentication.

0 commit comments

Comments
 (0)