lerna bootstrap now works

.travis.yml

@@ -19,8 +19,6 @@ before_install: |
     set -ev
     set -o pipefail
     npm install -g npm
-    npm config set @ibm:registry https://npm-registry.whitewater.ibm.com
-    npm config set //npm-registry.whitewater.ibm.com/:_authToken ${NPM_TOKEN}
     wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
     sudo dpkg -i google-chrome*.deb
 install: |

README.md

@@ -21,7 +21,7 @@ linked together:
 
     $ lerna bootstrap
 
-You can then work with the packages under [packages/@ibm](packages/@ibm) on a per-package
+You can then work with the packages under [packages/](packages/) on a per-package
 basis as any normal node.js package.
 
 Alternatively, you can execute npm commands across all of the packages at once using

contrib-notes/getting-started.md

@@ -265,7 +265,7 @@ Functions    : 94.54% ( 173/183 )
 Lines        : 92.68% ( 734/792 )
 ================================================================================
 
-> @ibm/ibm-concerto@0.0.3 posttest /Users/anthonyodowd/Documents/CTO/GitHub/a-o-dowd/Concerto
+> composer@0.0.3 posttest /Users/anthonyodowd/Documents/CTO/GitHub/a-o-dowd/Concerto
 > istanbul check-coverage
 ```
 
@@ -349,10 +349,10 @@ Creating systest_vp0_1
 npm info it worked it ends with ok
 npm info using [email protected]
 npm info using [email protected]
-npm info presystest @ibm/ibm-concerto@0.0.3
-npm info systest @ibm/ibm-concerto@0.0.3
+npm info presystest composer@0.0.3
+npm info systest composer@0.0.3
 
-> @ibm/ibm-concerto@0.0.3 systest /usr/src/app
+> composer@0.0.3 systest /usr/src/app
 > mocha -t 0 systest && cucumber-js systest
 
 
@@ -390,7 +390,7 @@ Feature: Example feature
 1 scenario (1 passed)
 3 steps (3 passed)
 0m00.001s
-npm info postsystest @ibm/ibm-concerto@0.0.3
+npm info postsystest composer@0.0.3
 npm info ok
 
 # Shut down the Docker containers for the system tests.
@@ -506,7 +506,7 @@ Functions    : 97.41% ( 226/232 )
 Lines        : 95.9% ( 1029/1073 )
 ================================================================================
 
-> @ibm/ibm-concerto@0.0.3 posttest /Users/anthonyodowd/Documents/CTO/GitHub/a-o-dowd/Concerto
+> composer@0.0.3 posttest /Users/anthonyodowd/Documents/CTO/GitHub/a-o-dowd/Concerto
 > istanbul check-coverage
 
 ```
@@ -693,8 +693,6 @@ services:
 before_install: |
     set -ev
     npm install -g npm
-    npm config set @ibm:registry https://npm-registry.whitewater.ibm.com
-    npm config set //npm-registry.whitewater.ibm.com/:_authToken ${NPM_TOKEN}
 install: ./scripts/install-deps.sh
 script: |
     set -ev

package.json

@@ -6,7 +6,7 @@
     "semver": "^5.3.0",
     "sleep-promise": "^2.0.0"
   },
-  "name": "@ibm/concerto",
+  "name": "fabric-composer",
   "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
   "version": "0.3.9",
   "main": "index.js",
@@ -24,7 +24,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.ibm.com:Blockchain-WW-Labs/Concerto.git"
+    "url": "https://github.com/fabric-composer/fabric-composer.git"
   },
   "keywords": [
     "blockchain",
@@ -33,4 +33,4 @@
   ],
   "author": "IBM",
   "license": "ISC"
-}
+}

packages/composer-admin/index.js

@@ -30,5 +30,5 @@ module.exports.AdminConnection = require('./lib/adminconnection');
  * Expose key concerto-common classes to simplify client application dependencies
  * @ignore
  */
-module.exports.BusinessNetworkDefinition = require('@ibm/concerto-common').BusinessNetworkDefinition;
-module.exports.Logger = require('@ibm/concerto-common').Logger;
+module.exports.BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
+module.exports.Logger = require('composer-common').Logger;

packages/composer-admin/lib/adminconnection.js

@@ -14,9 +14,9 @@
 
 'use strict';
 
-const Util = require('@ibm/concerto-common').Util;
-const ConnectionProfileManager = require('@ibm/concerto-common').ConnectionProfileManager;
-const FSConnectionProfileStore = require('@ibm/concerto-common').FSConnectionProfileStore;
+const Util = require('composer-common').Util;
+const ConnectionProfileManager = require('composer-common').ConnectionProfileManager;
+const FSConnectionProfileStore = require('composer-common').FSConnectionProfileStore;
 
 const fs = require('fs');
 

packages/composer-admin/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@ibm/concerto-admin",
+  "name": "composer-admin",
   "version": "0.3.9",
   "description": "IBM Concerto admin, code that manages business networks",
   "main": "index.js",
@@ -43,8 +43,8 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "@ibm/concerto-common": "^0.3.9",
-    "@ibm/concerto-connector-hlf": "^0.3.9"
+    "composer-common": "^0.3.9",
+    "composer-connector-hlf": "^0.3.9"
   },
   "publishConfig": {
     "registry": "https://npm-registry.whitewater.ibm.com"

packages/composer-admin/scripts/api-changelog.sh

@@ -15,6 +15,6 @@ system*)
 esac
 
 rm $DIR/api.txt
-node $DIR/node_modules/@ibm/concerto-common/lib/codegen/parsejs.js --format APISignature --inputDir "$DIR/lib" --outputDir $DIR
+node $DIR/node_modules/composer-common/lib/codegen/parsejs.js --format APISignature --inputDir "$DIR/lib" --outputDir $DIR
 
-node $DIR/node_modules/@ibm/concerto-common/lib/tools/changelog.js --api "$DIR/api.txt" --changelog $DIR/changelog.txt
+node $DIR/node_modules/composer-common/lib/tools/changelog.js --api "$DIR/api.txt" --changelog $DIR/changelog.txt

packages/composer-admin/scripts/generate-uml.sh

@@ -15,10 +15,10 @@ system*)
 esac
 
 echo $(date) Generating PlantUML source files for public and private APIs...
-node ./node_modules/@ibm/concerto-common/lib/codegen/parsejs.js --format PlantUML --inputDir "$DIR/lib" --outputDir "$DIR/out/uml"
-node ./node_modules/@ibm/concerto-common/lib/codegen/parsejs.js --format PlantUML --private --inputDir "$DIR/lib" --outputDir "$DIR/out/uml-private"
+node ./node_modules/composer-common/lib/codegen/parsejs.js --format PlantUML --inputDir "$DIR/lib" --outputDir "$DIR/out/uml"
+node ./node_modules/composer-common/lib/codegen/parsejs.js --format PlantUML --private --inputDir "$DIR/lib" --outputDir "$DIR/out/uml-private"
 
 echo $(date) Generating images for public and private APIs...
-node ./node_modules/@ibm/concerto-common/lib/tools/plantumltoimage.js --inputDir "$DIR/out/uml" --outputDir "$DIR/out/diagrams"
-node ./node_modules/@ibm/concerto-common/lib/tools/plantumltoimage.js --inputDir "$DIR/out/uml-private" --outputDir "$DIR/out/diagrams-private"
+node ./node_modules/composer-common/lib/tools/plantumltoimage.js --inputDir "$DIR/out/uml" --outputDir "$DIR/out/diagrams"
+node ./node_modules/composer-common/lib/tools/plantumltoimage.js --inputDir "$DIR/out/uml-private" --outputDir "$DIR/out/diagrams-private"
 echo $(date) Processed UML files

packages/composer-admin/test/adminconnection.js

@@ -16,7 +16,7 @@
 
 const Module = require('../');
 const AdminConnection = require('../lib/adminconnection');
-const ConcertoCommon = require('@ibm/concerto-common');
+const ConcertoCommon = require('composer-common');
 const BusinessNetworkDefinition = ConcertoCommon.BusinessNetworkDefinition;
 const Connection = ConcertoCommon.Connection;
 const ConnectionManager = ConcertoCommon.ConnectionManager;

packages/composer-cli/.travis.yml

@@ -5,8 +5,6 @@ dist: trusty
 before_install: |
     set -ev
     npm install -g npm
-    npm config set @ibm:registry https://npm-registry.whitewater.ibm.com
-    npm config set //npm-registry.whitewater.ibm.com/:_authToken ${NPM_TOKEN}
 install: ./scripts/install-deps.sh
 script: |
     set -ev

packages/composer-cli/cli.js

@@ -26,15 +26,15 @@ yargs
     .demand(1)
     .wrap(null)
     .strict()
-    .epilogue('For more information: https://pages.github.ibm.com/Blockchain-WW-Labs/Concerto/reference')
+    .epilogue('For more information: https://pages.github.ibm.com/fabric-composer/fabric-composer/reference')
     .alias('v', 'version')
     .version(function() {
 
 
-        return getInfo('@ibm/ibm-concerto-cli')+'\n'+
-          getInfo('@ibm/concerto-admin')+'\n'+getInfo('@ibm/concerto-client')+'\n'+
-          getInfo('@ibm/concerto-common')+'\n'+getInfo('@ibm/concerto-runtime-hlf')+
-          '\n'+getInfo('@ibm/concerto-connector-hlf')+'\n';
+        return getInfo('composer-cli')+'\n'+
+          getInfo('composer-admin')+'\n'+getInfo('composer-client')+'\n'+
+          getInfo('composer-common')+'\n'+getInfo('composer-runtime-hlf')+
+          '\n'+getInfo('composer-connector-hlf')+'\n';
 
 
     })

packages/composer-cli/gen/transactiontemplate

@@ -4,9 +4,9 @@
 
 'use strict';
 const fs = require('fs');
-const Client = require('@ibm/ibm-concerto-client');
-const Admin = require('@ibm/ibm-concerto-admin');
-const Common = require('@ibm/ibm-concerto-common');
+const Client = require('composer-client');
+const Admin = require('composer-admin');
+const Common = require('composer-common');
 const BusinessNetworkDefinition = Admin.BusinessNetworkDefinition;
 const BusinessNetworkConnection = Client.BusinessNetworkConnection;
 const AdminConnection = Admin.AdminConnection;

packages/composer-cli/lib/cmds/archive/lib/create.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Admin = require('@ibm/concerto-admin');
+const Admin = require('composer-admin');
 const BusinessNetworkDefinition = Admin.BusinessNetworkDefinition;
 const fs = require('fs');
 const sanitize = require('sanitize-filename');

packages/composer-cli/lib/cmds/archive/lib/list.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Admin = require('@ibm/concerto-admin');
+const Admin = require('composer-admin');
 const BusinessNetworkDefinition = Admin.BusinessNetworkDefinition;
 const fs = require('fs');
 

packages/composer-cli/lib/cmds/generator/lib/tests.js

@@ -18,7 +18,7 @@ const CmdUtil = require('../../utils/cmdutils');
 const path = require('path');
 const fs = require('fs');
 const nunjucks = require('nunjucks');
-const Common = require('@ibm/concerto-common');
+const Common = require('composer-common');
 const BusinessNetworkDefinition = Common.BusinessNetworkDefinition;
 
 const TEMPLATES_DIR = path.join(__dirname, './../../../../gen');

packages/composer-cli/lib/cmds/network/lib/deploy.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Admin = require('@ibm/concerto-admin');
+const Admin = require('composer-admin');
 const BusinessNetworkDefinition = Admin.BusinessNetworkDefinition;
 const cmdUtil = require('../../utils/cmdutils');
 const fs = require('fs');

packages/composer-cli/lib/cmds/network/lib/list.js

@@ -15,7 +15,7 @@
 'use strict';
 
 
-const Client = require('@ibm/concerto-client');
+const Client = require('composer-client');
 const Pretty = require('prettyjson');
 const BusinessNetworkConnection = Client.BusinessNetworkConnection;
 const DEFAULT_PROFILE_NAME = 'defaultProfile';

packages/composer-cli/lib/cmds/utils/cmdutils.js

@@ -15,8 +15,8 @@
 'use strict';
 
 const prompt = require('prompt');
-const Admin = require('@ibm/concerto-admin');
-const Client = require('@ibm/concerto-client');
+const Admin = require('composer-admin');
+const Client = require('composer-client');
 const BusinessNetworkConnection = Client.BusinessNetworkConnection;
 
 /**

packages/composer-cli/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@ibm/concerto-cli",
+  "name": "composer-cli",
   "version": "0.3.9",
   "description": "IBM Concerto command line interfaces (CLIs)",
   "bin": {
@@ -37,9 +37,9 @@
     "sinon-as-promised": "^4.0.2"
   },
   "dependencies": {
-    "@ibm/concerto-admin": "^0.3.9",
-    "@ibm/concerto-client": "^0.3.9",
-    "@ibm/concerto-common": "^0.3.9",
+    "composer-admin": "^0.3.9",
+    "composer-client": "^0.3.9",
+    "composer-common": "^0.3.9",
     "homedir": "^0.6.0",
     "moment": "^2.17.1",
     "npm-paths": "^0.1.3",

packages/composer-cli/scripts/api-changelog.sh

@@ -15,6 +15,6 @@ system*)
 esac
 
 rm $DIR/api.txt
-node $DIR/node_modules/@ibm/ibm-concerto-common/lib/codegen/parsejs.js --format APISignature --inputDir "$DIR/lib" --outputDir $DIR
+node $DIR/node_modules/composer-common/lib/codegen/parsejs.js --format APISignature --inputDir "$DIR/lib" --outputDir $DIR
 
-node $DIR/node_modules/@ibm/ibm-concerto-common/lib/tools/changelog.js --api "$DIR/api.txt" --changelog $DIR/changelog.txt
+node $DIR/node_modules/composer-common/lib/tools/changelog.js --api "$DIR/api.txt" --changelog $DIR/changelog.txt

packages/composer-cli/scripts/deploy.sh

@@ -28,13 +28,13 @@ if [ "${TRAVIS_BRANCH}" = "develop" ]; then
 
     # Publish with unstable tag. These are development builds.
     echo "Pushing with tag unstable"
-    npm publish --scope=@ibm --tag=unstable
+    npm publish --tag=unstable
 
 else
 
     # Publish with latest tag (default). These are release builds.
     echo "Pushing with tag develop"
-    npm publish --scope=@ibm
+    npm publish
 
 fi
 
@@ -55,8 +55,8 @@ for PROJ in Concerto-System-Tests; do
         rm -rf temp
         git clone -b ${TRAVIS_BRANCH} ${THISREPO} temp
         cd temp
-        git config user.email "noreply@ibm.com"
-        git config user.name "Blockchain WW Labs - Solutions"
+        git config user.email "noreply@fabric-composer.org"
+        git config user.name "Fabric Composer"
         git config push.default simple
         git commit -m "Automated commit to trigger downstream build" --allow-empty
         git push && break

packages/composer-cli/test/archive/create.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Admin = require('@ibm/concerto-admin');
+const Admin = require('composer-admin');
 const BusinessNetworkDefinition = Admin.BusinessNetworkDefinition;
 // const homedir = require('homedir');
 const fs = require('fs');

packages/composer-cli/test/archive/list.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Admin = require('@ibm/concerto-admin');
+const Admin = require('composer-admin');
 const BusinessNetworkDefinition = Admin.BusinessNetworkDefinition;
 // const homedir = require('homedir');
 const fs = require('fs');

packages/composer-cli/test/generator/tests.js

@@ -14,9 +14,9 @@
 
 'use strict';
 
-const Client = require('@ibm/concerto-client');
-// const Admin = require('@ibm/concerto-admin');
-const Common = require('@ibm/concerto-common');
+const Client = require('composer-client');
+// const Admin = require('composer-admin');
+const Common = require('composer-common');
 const BusinessNetworkConnection = Client.BusinessNetworkConnection;
 const BusinessNetworkDefinition = Common.BusinessNetworkDefinition;
 const Serializer = Common.Serializer;

packages/composer-cli/test/identity/issue.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Client = require('@ibm/concerto-client');
+const Client = require('composer-client');
 const BusinessNetworkConnection = Client.BusinessNetworkConnection;
 
 const Issue = require('../../lib/cmds/identity/issueCommand.js');

packages/composer-cli/test/identity/revoke.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Client = require('@ibm/concerto-client');
+const Client = require('composer-client');
 const BusinessNetworkConnection = Client.BusinessNetworkConnection;
 
 const Revoke = require('../../lib/cmds/identity/revokeCommand.js');

packages/composer-cli/test/network/deploy.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Admin = require('@ibm/concerto-admin');
+const Admin = require('composer-admin');
 const BusinessNetworkDefinition = Admin.BusinessNetworkDefinition;
 const homedir = require('homedir');
 const fs = require('fs');

packages/composer-cli/test/network/ping.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Client = require('@ibm/concerto-client');
+const Client = require('composer-client');
 const BusinessNetworkConnection = Client.BusinessNetworkConnection;
 
 const Ping = require('../../lib/cmds/network/pingCommand.js');

packages/composer-cli/test/network/undeploy.js

@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Admin = require('@ibm/concerto-admin');
+const Admin = require('composer-admin');
 
 const Undeploy = require('../../lib/cmds/network/lib/undeploy.js');
 const CmdUtil = require('../../lib/cmds/utils/cmdutils.js');