Merge branch 'master' of https://github.com/fabric-composer/fabric-composer

Author: liam-grace

.gitignore

@@ -8,6 +8,9 @@ pids
 *.pid
 *.seed
 
+# License files
+license-*.txt
+
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 

.travis/deploy.sh

@@ -125,8 +125,8 @@ else
 
     # Configure the Git repository and clean any untracked and unignored build files.
     git config user.name "Travis CI"
-    git config user.email "noreply@travis.ibm.com"
-    git checkout -b develop
+    git config user.email "noreply@travis-ci.org"
+    git checkout -b master
     git reset --hard
     git clean -d -f
 
@@ -137,7 +137,7 @@ else
     # Add the version number changes and push them to Git.
     git add .
     git commit -m "Automatic version bump to ${NEW_VERSION}"
-    git push origin develop
+    git push origin master
 
 fi
 date

README.md

@@ -15,6 +15,8 @@ You must run the following commands in order to pull the Hyperledger fabric chai
 
 You should see messages indicating that the required git repositories have been cloned into the correct vendor subdirectory.
 
+> The git submodule should not be required now, they have been added to the npm install step. When this has been confirmed as working well, this will be updated. 
+
 You must install [Lerna](https://lernajs.io) to build this multi-package repository:
 
     $ npm install -g lerna

package.json

@@ -2,6 +2,7 @@
   "devDependencies": {
     "colors": "^1.1.2",
     "lerna": "2.0.0-beta.32",
+    "licensecheck": "^1.3.0",
     "moment": "^2.17.1",
     "semver": "^5.3.0",
     "sleep-promise": "^2.0.0"
@@ -13,7 +14,7 @@
   "private": true,
   "scripts": {
     "postinstall": "npm run pkgcheck && npm run bootstrap",
-    "bootstrap": "lerna bootstrap",
+    "bootstrap": "git submodule init && git submodule update && lerna bootstrap",
     "test": "lerna run test",
     "scanlicenses": "./scripts/scan-all-licenses.sh",
     "pkgcheck": "node ./scripts/pkgcheck.js",

packages/composer-common/lib/introspect/modelfile.js

@@ -51,7 +51,7 @@ class ModelFile {
         this.fileName = 'UNKNOWN';
 
         if(!definitions || typeof definitions !== 'string') {
-            throw new Error('ModelFile expects a Concerto model as a string as input.');
+            throw new Error('ModelFile expects a Composer model as a string as input.');
         }
         this.definitions = definitions;
 

packages/composer-playground-api/package.json

@@ -17,6 +17,7 @@
     "doc": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template",
     "postdoc": "npm run lint",
     "lint": "eslint .",
+    "start": "node cli.js",
     "test": "mocha --recursive && istanbul cover --include-all-sources --report cobertura --report html ./node_modules/mocha/bin/_mocha -- --recursive",
     "posttest": "istanbul check-coverage"
   },

packages/composer-rest-server/header.txt

@@ -0,0 +1,13 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

packages/composer-rest-server/server/server.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 /*
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the 'License');
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an 'AS IS' BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
@@ -19,11 +19,11 @@ const chalk       = require('chalk');
 const clear       = require('clear');
 const figlet      = require('figlet');
 const util        = require('../lib/util');
-
 const loopback = require('loopback');
 const boot = require('loopback-boot');
-
 const app = module.exports = loopback();
+process.env.SUPPRESS_NO_CONFIG_WARNING = true;
+
 app.start = function() {
 
     // start the web server
@@ -37,41 +37,70 @@ app.start = function() {
     });
 };
 
-// clear the console and display a nice welcome message
-clear();
-console.log(
-  chalk.yellow(
-    figlet.textSync('Fabric-Composer', { horizontalLayout: 'full' })
-  )
-);
 
-// Get details of the server that we want to run
-util.getFabricDetails(function(answers)  {
-    // augment the app with the extra config that we've just collected
-    let ds = {
-        'name' : 'Composer',    // not sure this matters
-        'connectionProfileName' : answers.profilename,
-        'businessNetworkIdentifier' : answers.businessNetworkId,
-        'participantId' : answers.userid,
-        'participantPwd' : answers.secret
-    };
-    app.cfg = ds;
-    boot(app, __dirname, function(err) {
-        if(err) {
-            throw err;
-        }
-
-        // start the server if `$ node server.js`
-        if (require.main === module) {
-            app.start();
-        }
+const yargs = require( 'yargs' )
+    .wrap(null)
+    .usage( 'Usage: $0 -p connection profile -b business network identifier -u participant id -s participant password' )
+    .option( 'c', { alias: 'connectionProfile', describe: 'connection profile Name', type: 'string' } )
+    .option( 'b', { alias: 'businessNetwork', describe: 'business network identifier', type: 'string' } )
+    .option( 'i', { alias: 'participantId', describe: 'participant id', type: 'string' } )
+    .option( 'p', { alias: 'participantPwd', describe: 'participant password', type: 'string' } )
+    .help( 'h' )
+    .alias( 'h', 'help' )
+    .argv;
+
+// see if we need to run interactively
+if(yargs.c === undefined && yargs.b === undefined && yargs.i === undefined && yargs.p === undefined) {
+    // Gather some args interactively
+    clear();
+    console.log(
+        chalk.yellow(
+            figlet.textSync('Fabric-Composer', { horizontalLayout: 'full' })
+        )
+    );
+    // Get details of the server that we want to run
+    util.getFabricDetails(function(answers)  {
+        // augment the app with the extra config that we've just collected
+        let ds = {
+            'name' : 'Composer',    // not sure this matters
+            'connectionProfileName' : answers.profilename,
+            'businessNetworkIdentifier' : answers.businessNetworkId,
+            'participantId' : answers.userid,
+            'participantPwd' : answers.secret
+        };
+        app.cfg = ds;
+        boot(app, __dirname, function(err) {
+            if(err) {
+                throw err;
+            }
+            // start the server if `$ node server.js`
+            if (require.main === module) {
+                app.start();
+            }
+        });
     });
-});
-
-
-
-
-
-
-
 
+} else {
+    // make sure we have args for all required parms otherwise error
+    if(yargs.c === undefined || yargs.b === undefined || yargs.i === undefined || yargs.p === undefined) {
+        console.log('Error: Missing parameter.   Please run compposer-rest-server -h to see usage details');
+    } else {
+        let ds = {
+            'name' : 'Composer',    // not sure this matters
+            'connectionProfileName' : yargs.c,
+            'businessNetworkIdentifier' : yargs.b,
+            'participantId' : yargs.i,
+            'participantPwd' : yargs.p
+        };
+        app.cfg = ds;
+        boot(app, __dirname, function(err) {
+            if(err) {
+                throw err;
+            }
+            // start the server if `$ node server.js`
+            if (require.main === module) {
+                app.start();
+            }
+        });
+    }
+}

packages/composer-website/jekylldocs/tasks/genapp.md

@@ -30,7 +30,7 @@ npm install -g typings
 
 npm install -g bower
 
-npm install -g angular-cli
+npm install -g @angular/cli
 ```
 
 

packages/generator-fabric-composer/generators/angular/index.js

@@ -382,7 +382,7 @@ module.exports = yeoman.Base.extend({
             assetList.forEach((asset) => {
                 assetComponentNames.push(asset.name+'Component');
             });
-
+            
             let model = self._generateTemplateModel();
             self.fs.copyTpl(self.templatePath('**/!(node_modules|typings|asset|Transaction)*'), self.destinationPath(), model);
 
@@ -424,6 +424,11 @@ module.exports = yeoman.Base.extend({
             let parameters = {};
             parameters.fileWriter = new FileWriter(self.destinationPath()+'/src/app');
             modelManager.accept(visitor, parameters);
+
+
+            assetList = [];
+            assetComponentNames = [];
+            assetServiceNames = [];
         }
 
 
@@ -455,7 +460,7 @@ module.exports = yeoman.Base.extend({
             enrollmentSecret: this.enrollmentSecret
         };
     },
-
+    
     end: function() {
         console.log('Complete');
     }