Merge branch 'master' into master

.gitmodules

@@ -8,3 +8,9 @@
 [submodule "packages/composer-runtime-hlf/vendor/github.com/robertkrimen/otto"]
 	path = packages/composer-runtime-hlf/vendor/github.com/robertkrimen/otto
 	url = https://github.com/robertkrimen/otto
+[submodule "packages/composer-runtime-hlfv1/vendor/github.com/robertkrimen/otto"]
+	path = packages/composer-runtime-hlfv1/vendor/github.com/robertkrimen/otto
+	url = https://github.com/robertkrimen/otto.git
+[submodule "packages/composer-runtime-hlfv1/vendor/gopkg.in/sourcemap.v1"]
+	path = packages/composer-runtime-hlfv1/vendor/gopkg.in/sourcemap.v1
+	url = https://gopkg.in/sourcemap.v1.git

.travis.yml

@@ -29,7 +29,7 @@ before_install: |
     date
 install: |
     date
-    ./.travis/install.sh
+    travis_wait 30 ./.travis/install.sh
     date
 script: ./.travis/script.sh
 deploy:

.travis/deploy.sh

@@ -83,6 +83,12 @@ if [ -z "${TRAVIS_TAG}" ]; then
 
     done
 
+    # Push to public Bluemix.
+    pushd ${DIR}/packages/composer-ui
+    cf login -a https://api.ng.bluemix.net -u ${CF_USERNAME} -p ${CF_PASSWORD} -o ${CF_ORGANIZATION} -s ${CF_SPACE}
+    cf push fabric-composer-unstable -c "node cli.js" -i 2 -m 256M
+    popd
+
 else
 
     # Grab the current version.
@@ -106,10 +112,9 @@ else
     done
 
     # Push to public Bluemix.
-    pushd ${DIR}/packages/composer-ui/dist
-    touch Staticfile
+    pushd ${DIR}/packages/composer-ui
     cf login -a https://api.ng.bluemix.net -u ${CF_USERNAME} -p ${CF_PASSWORD} -o ${CF_ORGANIZATION} -s ${CF_SPACE}
-    cf push fabric-composer
+    cf push fabric-composer -c "node cli.js" -i 2 -m 256M
     popd
 
     # Configure the Git repository and clean any untracked and unignored build files.

lerna.json

@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.4.4"
+  "version": "0.4.5"
 }

package.json

@@ -8,7 +8,7 @@
   },
   "name": "fabric-composer",
   "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "main": "index.js",
   "private": true,
   "scripts": {
@@ -31,4 +31,4 @@
   ],
   "author": "Fabric Composer",
   "license": "Apache-2"
-}
+}

packages/composer-admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-admin",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Fabric Composer Admin, code that manages business networks deployed to Hyperledger Fabric",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -43,8 +43,9 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "composer-common": "^0.4.4",
-    "composer-connector-hlf": "^0.4.4"
+    "composer-common": "^0.4.5",
+    "composer-connector-hlf": "^0.4.5",
+    "composer-connector-hlfv1": "^0.4.5"
   },
   "license-check-config": {
     "src": [

packages/composer-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-cli",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Fabric Composer command line interfaces (CLIs)",
   "bin": {
     "composer": "cli.js"
@@ -37,9 +37,9 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "composer-admin": "^0.4.4",
-    "composer-client": "^0.4.4",
-    "composer-common": "^0.4.4",
+    "composer-admin": "^0.4.5",
+    "composer-client": "^0.4.5",
+    "composer-common": "^0.4.5",
     "homedir": "^0.6.0",
     "moment": "^2.17.1",
     "npm-paths": "^0.1.3",

packages/composer-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-client",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "The node.js client library for Fabric Composer, a development framework for Hyperledger Fabric",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -39,8 +39,9 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.4.4",
-    "composer-connector-hlf": "^0.4.4",
+    "composer-common": "^0.4.5",
+    "composer-connector-hlf": "^0.4.5",
+    "composer-connector-hlfv1": "^0.4.5",
     "uuid": "^3.0.0"
   },
   "devDependencies": {

packages/composer-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-common",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Fabric Composer Common, code that is common across client, admin and runtime.",
   "main": "index.js",
   "typings": "index.d.ts",

packages/composer-connector-embedded/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-embedded",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "The embedded client connector for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -49,8 +49,8 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.4.4",
-    "composer-runtime": "^0.4.4",
-    "composer-runtime-embedded": "^0.4.4"
+    "composer-common": "^0.4.5",
+    "composer-runtime": "^0.4.5",
+    "composer-runtime-embedded": "^0.4.5"
   }
 }

packages/composer-connector-hlf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-hlf",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "The Hyperledger Fabric Client connector for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -37,8 +37,8 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.4.4",
-    "composer-runtime-hlf": "^0.4.4",
+    "composer-common": "^0.4.5",
+    "composer-runtime-hlf": "^0.4.5",
     "fs-extra": "^1.0.0",
     "hfc": "^0.6.5",
     "semver": "^5.3.0",

packages/composer-ui/.dockerignore → packages/composer-connector-hlfv1/.eslintignore

@@ -1,4 +1,3 @@
-dist
+coverage
 node_modules
 out
-scripts

packages/composer-connector-hlfv1/.eslintrc.yml

@@ -0,0 +1,48 @@
+env:
+    es6: true
+    node: true
+    mocha: true
+extends: 'eslint:recommended'
+parserOptions:
+    ecmaVersion: 2015
+    sourceType:
+        - script
+rules:
+    indent:
+        - error
+        - 4
+    linebreak-style:
+        - error
+        - unix
+    quotes:
+        - error
+        - single
+    semi:
+        - error
+        - always
+    no-unused-vars:
+        - error
+        - args: none
+    no-console: off
+    curly: error
+    eqeqeq: error
+    no-throw-literal: error
+    strict: error
+    no-var: error
+    dot-notation: error
+    no-tabs: error
+    no-trailing-spaces: error
+    no-use-before-define: error
+    no-useless-call: error
+    no-with: error
+    operator-linebreak: error
+    require-jsdoc:
+        - error
+        - require:
+            ClassDeclaration: true
+            MethodDefinition: true
+            FunctionDeclaration: true
+    valid-jsdoc:
+        - error
+        - requireReturn: false
+    yoda: error