Merge branch 'dev' into feature/graph-layout

epam · May 11, 2017 · c256a9e · c256a9e
2 parents 5dbbd32 + de9992f
commit c256a9e
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,41 @@
+env:
+    - EMAIL="aleksandr_sidoruk@epam.com" PACKAGE_NAME="pipeline-builder"
 language: node_js
 node_js: "6"
 os: linux
 dist: trusty
+before_install: 
+    - |-
+          if [[ $TRAVIS_BRANCH == "dev" ]] || [[ $TRAVIS_BRANCH == "master" ]]; then
+              NPM_TAG="$(if [[ $TRAVIS_BRANCH == "dev" ]]; then echo "dev"; else echo "latest"; fi)"
+
+              LAST_PUBLISHED="$(npm view $PACKAGE_NAME@$NPM_TAG version)"
+              CURRENT_VERSION="$(npm version | grep -Po "(?<='$PACKAGE_NAME': ')[^']*")"
+
+              if [[ $LAST_PUBLISHED == $CURRENT_VERSION ]]; then
+                  echo "Version change required"
+                  exit 1; 
+              fi
+          fi
 install: 
     - yarn global add gulp-cli
     - yarn install
 script: gulp
 after_script: gulp test:coveralls
+deploy:
+    - provider: npm
+      skip_cleanup: true
+      email: $EMAIL
+      api_key: $NPM_AUTH_TOKEN
+      tag: dev
+      on:
+          branch: dev
+    - provider: npm
+      skip_cleanup: true
+      email: $EMAIL
+      api_key: $NPM_AUTH_TOKEN
+      tag: latest
+      on:
+          branch: master
+after_deploy:
+    - "curl \"http://35.164.165.183:8080/job/pipeline-wdl-builder-$TRAVIS_BRANCH/build?token=$JENKINS_SECRET_TOKEN\""
diff --git a/README.md b/README.md
@@ -14,7 +14,8 @@ Pipeline Builder is a JavaScript library for visualizing and constructing bioinf
 
 ## Demo environment
 
-Example of a **Pipeline Builder** usage is available at [http://pb.opensource.epam.com](http://pb.opensource.epam.com)
+Example of a **Pipeline Builder** usage is available at [http://pb.opensource.epam.com](http://pb.opensource.epam.com) built on master branch and 
+[http://pb.opensource.epam.com:10000](http://pb.opensource.epam.com:10000) built on dev branch
 
 This demo application demonstrates major capabilities of a **Pipeline Builder**
 

diff --git a/src/generator/WDL/entities/WorkflowGenerator.js b/src/generator/WDL/entities/WorkflowGenerator.js
@@ -243,7 +243,7 @@ export default class WorkflowGenerator {
 
       _.forEach(outputMappings, (val, key) => {
         if (key.indexOf('.') >= 0) {
-          res += `${this.buildPortValue(val)}${EOL}`;
+          res += `${DOUBLE_SCOPE_INDENT}${key}${EOL}`;
         } else {
           res += `${DOUBLE_SCOPE_INDENT}${val.desc.type} ${key} ${constants.EQ} ${this.buildPortValue(val)}${EOL}`;
         }

diff --git a/src/parser/WDL/entities/WDLWorkflow.js b/src/parser/WDL/entities/WDLWorkflow.js
@@ -177,7 +177,12 @@ export default class WDLWorkflow {
       }
     } else if (declaration && nodeValue.str === 'identifier') {
       const portName = nodeValue.source_string;
-      step.i[declaration].bind(WDLWorkflow.groupNameResolver(parentStep, portName).i[portName]);
+      const portStep = WDLWorkflow.groupNameResolver(parentStep, portName);
+      if (_.isUndefined(portStep)) {
+        step.i[declaration].bind(portName);
+      } else {
+        step.i[declaration].bind(portStep.i[portName]);
+      }
     } else {
       const expression = extractExpression(nodeValue);
       step.i[declaration].bind(expression.string);

diff --git a/test/parser/WDL/entities/WDLWorkflowTest.js b/test/parser/WDL/entities/WDLWorkflowTest.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 
 import WDLWorkflow from '../../../../src/parser/WDL/entities/WDLWorkflow';
 import WDLParserError from '../../../../src/parser/WDL/utils/utils';
+import Port from '../../../../src/model/Port';
 
 describe('parser/WDL/entities/WDLWorkflow', () => {
 
@@ -237,7 +238,46 @@ describe('parser/WDL/entities/WDLWorkflow', () => {
                           col: 6,
                         },
                         alias: null,
-                        body: null,
+                        body: {
+                          name: 'CallBody',
+                          attributes: {
+                            declarations: {
+                              list: [],
+                            },
+                            io: {
+                              list: [
+                                {
+                                  name: 'Inputs',
+                                  attributes: {
+                                    map: {
+                                      list: [
+                                        {
+                                          name: 'IOMapping',
+                                          attributes: {
+                                            key: {
+                                              id: 14,
+                                              str: 'identifier',
+                                              source_string: 'currSample',
+                                              line: 8,
+                                              col: 9,
+                                            },
+                                            value: {
+                                              id: 14,
+                                              str: 'identifier',
+                                              source_string: 'i',
+                                              line: 8,
+                                              col: 20,
+                                            },
+                                          },
+                                        },
+                                      ],
+                                    },
+                                  },
+                                },
+                              ],
+                            },
+                          },
+                        },
                       },
                     },
                   ],
@@ -251,6 +291,9 @@ describe('parser/WDL/entities/WDLWorkflow', () => {
       const context = {
         actionMap: {
           bar: {
+            i: {
+              currSample: new Port('currSample'),
+            },
           },
         },
       };