Merge branch 'develop' of https://github.com/fabric-composer/fabric-c…

…omposer into develop

.travis.yml

@@ -29,10 +29,10 @@ install: |
     set -ev
     set -o pipefail
     npm install 2>&1 | tee
-script: npm run script
+script: ./.travis/script.sh
 deploy:
     provider: script
-    script: npm run deploy
+    script: ./.travis/deploy.sh
     skip_cleanup: true
     on:
         all_branches: true

scripts/deploy.sh → .travis/deploy.sh

@@ -34,6 +34,9 @@ set-up-ssh --key "$encrypted_568b95f14ac3_key" \
            --iv "$encrypted_568b95f14ac3_iv" \
            --path-encrypted-key ".travis/github_deploy_key.enc"
 
+# Change from HTTPS to SSH.
+./.travis/fix_github_https_repo.sh
+
 # Push the code to npm.
 if [ -z "${TRAVIS_TAG}" ]; then
 

.travis/fix_github_https_repo.sh

@@ -0,0 +1,33 @@
+#/bin/bash
+#-- Script to automate https://help.github.com/articles/why-is-git-always-asking-for-my-password
+
+REPO_URL=`git remote -v | grep -m1 '^origin' | sed -Ene's#.*(https://[^[:space:]]*).*#\1#p'`
+if [ -z "$REPO_URL" ]; then
+  echo "-- ERROR:  Could not identify Repo url."
+  echo "   It is possible this repo is already using SSH instead of HTTPS."
+  exit
+fi
+
+USER=`echo $REPO_URL | sed -Ene's#https://github.com/([^/]*)/(.*).git#\1#p'`
+if [ -z "$USER" ]; then
+  echo "-- ERROR:  Could not identify User."
+  exit
+fi
+
+REPO=`echo $REPO_URL | sed -Ene's#https://github.com/([^/]*)/(.*).git#\2#p'`
+if [ -z "$REPO" ]; then
+  echo "-- ERROR:  Could not identify Repo."
+  exit
+fi
+
+NEW_URL="[email protected]:$USER/$REPO.git"
+echo "Changing repo url from "
+echo "  '$REPO_URL'"
+echo "      to "
+echo "  '$NEW_URL'"
+echo ""
+
+CHANGE_CMD="git remote set-url origin $NEW_URL"
+`$CHANGE_CMD`
+
+echo "Success"

lerna.json

@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.3.10"
+  "version": "0.3.11"
 }

package.json

@@ -8,15 +8,13 @@
   },
   "name": "fabric-composer",
   "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "main": "index.js",
   "private": true,
   "scripts": {
     "postinstall": "npm run pkgcheck && npm run bootstrap",
     "bootstrap": "lerna bootstrap",
     "test": "lerna run test",
-    "script": "./scripts/script.sh",
-    "deploy": "./scripts/deploy.sh",
     "scanlicenses": "./scripts/scan-all-licenses.sh",
     "pkgcheck": "node ./scripts/pkgcheck.js",
     "pkgstamp": "node ./scripts/pkgstamp.js",

packages/composer-admin/package.json

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

packages/composer-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-cli",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "Fabric Composer command line interfaces (CLIs)",
   "bin": {
     "concerto": "cli.js"
@@ -37,9 +37,9 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "composer-admin": "^0.3.10",
-    "composer-client": "^0.3.10",
-    "composer-common": "^0.3.10",
+    "composer-admin": "^0.3.11",
+    "composer-client": "^0.3.11",
+    "composer-common": "^0.3.11",
     "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.3.10",
+  "version": "0.3.11",
   "description": "The node.js client library for Fabric Composer, the Hyperledger Fabric development framework",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -39,8 +39,8 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.3.10",
-    "composer-connector-hlf": "^0.3.10",
+    "composer-common": "^0.3.11",
+    "composer-connector-hlf": "^0.3.11",
     "uuid": "^3.0.0"
   },
   "devDependencies": {

packages/composer-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-common",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "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.3.10",
+  "version": "0.3.11",
   "description": "The embedded client connector for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -49,8 +49,8 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.3.10",
-    "composer-runtime": "^0.3.10",
-    "composer-runtime-embedded": "^0.3.10"
+    "composer-common": "^0.3.11",
+    "composer-runtime": "^0.3.11",
+    "composer-runtime-embedded": "^0.3.11"
   }
 }

packages/composer-connector-hlf/package.json

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

packages/composer-connector-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-proxy",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "The proxying client connector for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -50,7 +50,7 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.3.10",
+    "composer-common": "^0.3.11",
     "socket.io-client": "^1.7.2"
   }
 }

packages/composer-connector-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-server",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "The remote connector server for Fabric Composer",
   "bin": {
     "concerto-connector-server": "cli.js"
@@ -41,9 +41,9 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.3.10",
-    "composer-connector-embedded": "^0.3.10",
-    "composer-connector-hlf": "^0.3.10",
+    "composer-common": "^0.3.11",
+    "composer-connector-embedded": "^0.3.11",
+    "composer-connector-hlf": "^0.3.11",
     "serializerr": "^1.0.3",
     "socket.io": "^1.7.2",
     "uuid": "^3.0.1",

packages/composer-connector-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-connector-web",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "The web client connector for Fabric Composer",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -59,8 +59,8 @@
     "watchify": "^3.7.0"
   },
   "dependencies": {
-    "composer-common": "^0.3.10",
-    "composer-runtime": "^0.3.10",
-    "composer-runtime-web": "^0.3.10"
+    "composer-common": "^0.3.11",
+    "composer-runtime": "^0.3.11",
+    "composer-runtime-web": "^0.3.11"
   }
 }

packages/composer-loopback-connector/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-loopback-connector",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "A Loopback connector for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -25,11 +25,11 @@
   "author": "Fabric Composer",
   "license": "Apache-2",
   "dependencies": {
-    "composer-admin": "^0.3.10",
-    "composer-client": "^0.3.10",
-    "composer-common": "^0.3.10",
-    "composer-connector-embedded": "^0.3.10",
-    "composer-connector-web": "^0.3.10",
+    "composer-admin": "^0.3.11",
+    "composer-client": "^0.3.11",
+    "composer-common": "^0.3.11",
+    "composer-connector-embedded": "^0.3.11",
+    "composer-connector-web": "^0.3.11",
     "loopback-connector": "^2.5.0"
   },
   "devDependencies": {

packages/composer-runtime-embedded/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-embedded",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "The embedded runtime container for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -50,7 +50,7 @@
     "logError": true
   },
   "dependencies": {
-    "composer-runtime": "^0.3.10",
+    "composer-runtime": "^0.3.11",
     "dexie": "^1.5.1",
     "fake-indexeddb": "^1.0.8",
     "uuid": "^3.0.1"

packages/composer-runtime-hlf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-hlf",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "The Hyperledger Fabric runtime container for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "license": "Apache-2.0",
   "dependencies": {},
   "devDependencies": {
-    "composer-runtime": "^0.3.10",
+    "composer-runtime": "^0.3.11",
     "babel-polyfill": "^6.20.0",
     "babel-preset-es2015": "^6.18.0",
     "babelify": "^7.3.0",

packages/composer-runtime-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime-web",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "The web runtime container for Fabric Composer",
   "main": "index.js",
   "scripts": {
@@ -59,7 +59,7 @@
     "logError": true
   },
   "dependencies": {
-    "composer-runtime": "^0.3.10",
+    "composer-runtime": "^0.3.11",
     "dexie": "^1.5.1",
     "uuid": "^3.0.1"
   }

packages/composer-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-runtime",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "The runtime execution environment for Fabric Composer",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -62,7 +62,7 @@
     "logError": true
   },
   "dependencies": {
-    "composer-common": "^0.3.10",
+    "composer-common": "^0.3.11",
     "debug": "^2.4.4",
     "fast-json-patch": "^1.1.2",
     "jsonata": "^1.0.10",

packages/composer-systests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "composer-systests",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "private": true,
   "description": "System tests and automation for Fabric Composer",
   "main": "index.js",
@@ -26,11 +26,11 @@
     "solutions"
   ],
   "devDependencies": {
-    "composer-admin": "^0.3.10",
-    "composer-client": "^0.3.10",
-    "composer-common": "^0.3.10",
-    "composer-connector-embedded": "^0.3.10",
-    "composer-connector-web": "^0.3.10",
+    "composer-admin": "^0.3.11",
+    "composer-client": "^0.3.11",
+    "composer-common": "^0.3.11",
+    "composer-connector-embedded": "^0.3.11",
+    "composer-connector-web": "^0.3.11",
     "brfs": "^1.4.3",
     "browserfs": "^1.1.0",
     "chai": "^3.5.0",