Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Jakeeyturner authored Mar 13, 2017
2 parents 217f36c + 8d93680 commit 0df9910
Show file tree
Hide file tree
Showing 127 changed files with 2,776 additions and 2,318 deletions.
17 changes: 5 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,10 @@ node_js:
matrix:
include:
- env: DOCS=full FC_TASK=docs
sudo: false
node_js :
- '6'
- env: SYSTEST=embedded FC_TASK=systest
- env: SYSTEST=web FC_TASK=systest
- env: SYSTEST=hlf SYSTEST_HLF=hlf FC_TASK=systest
sudo: required
services:
- docker
- env: SYSTEST=hlf SYSTEST_HLF=hlf FC_TASK=systest
- env: SYSTEST=hlf SYSTEST_HLF=ibm FC_TASK=systest
sudo: required
services:
- docker
dist: trusty
addons:
apt:
Expand All @@ -36,8 +27,10 @@ deploy:
script: ./.travis/deploy.sh
skip_cleanup: true
on:
all_branches: true
cache: false
branch: master
cache:
directories:
- node_modules
sudo: required
notifications:
pushover:
Expand Down
14 changes: 7 additions & 7 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!--- Provide a general summary of the pull request in the Title above -->

## Checklist
[ ] A link to the issue/user story that the pull request relates to
[ ] How to recreate the problem without the fix
[ ] Design of the fix
[ ] How to prove that the fix works
[ ] Automated tests that prove the fix keeps on working
[ ] Documentation - any JSDoc, website, or Stackoverflow answers?
- [ ] A link to the issue/user story that the pull request relates to
- [ ] How to recreate the problem without the fix
- [ ] Design of the fix
- [ ] How to prove that the fix works
- [ ] Automated tests that prove the fix keeps on working
- [ ] Documentation - any JSDoc, website, or Stackoverflow answers?


## Issue/User story
Expand Down Expand Up @@ -39,4 +39,4 @@
<!-- Please describe the automated tests that are put in place to stop this recurring -->

## What documentation has been provided for this pull request
<!-- JSDocs, WebSite and answers to StackOverflow questions are possible documentation sources -->
<!-- JSDocs, WebSite and answers to StackOverflow questions are possible documentation sources -->
8 changes: 8 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
environment:
nodejs_version: "6"
install:
- ps: Install-Product node $env:nodejs_version
- npm install
test_script:
- npm test
build: off
5 changes: 3 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"lerna": "2.0.0-beta.32",
"lerna": "2.0.0-beta.38",
"packages": [
"packages/*"
],
"version": "0.4.5"
"version": "0.5.2",
"hoist": true
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"devDependencies": {
"colors": "^1.1.2",
"lerna": "2.0.0-beta.32",
"lerna": "2.0.0-beta.38",
"licensecheck": "^1.3.0",
"moment": "^2.17.1",
"semver": "^5.3.0",
"sleep-promise": "^2.0.0"
},
"name": "fabric-composer",
"description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
"version": "0.4.5",
"version": "0.5.2",
"main": "index.js",
"private": true,
"scripts": {
Expand All @@ -32,4 +32,4 @@
],
"author": "Fabric Composer",
"license": "Apache-2"
}
}
19 changes: 0 additions & 19 deletions packages/composer-admin/.istanbul.yml

This file was deleted.

11 changes: 7 additions & 4 deletions packages/composer-admin/jsdoc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@
"dictionaries": ["jsdoc","closure"]
},
"source": {
"includePattern": ".+\\.js(doc|x)?$",
"excludePattern": "(^|\\/|\\\\)_|(chaincode|node_modules|out|scripts).+"
"include": [
"./lib",
"./index.js"
],
"includePattern": ".+\\.js(doc|x)?$"
},
"plugins": [],
"plugins": ["plugins/markdown"],
"templates": {
"logoFile": "",
"cleverLinks": false,
"monospaceLinks": false,
"dateFormat": "ddd MMM Do YYYY",
"outputSourceFiles": true,
"outputSourcePath": true,
"systemName": "IBM Concerto",
"systemName": "Fabric Composer",
"footer": "",
"copyright": "Copyright IBM Corp. 2016",
"navType": "vertical",
Expand Down
44 changes: 29 additions & 15 deletions packages/composer-admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "composer-admin",
"version": "0.4.5",
"version": "0.5.2",
"description": "Fabric Composer Admin, code that manages business networks deployed to Hyperledger Fabric",
"engines": {
"node": ">=6",
Expand All @@ -11,16 +11,12 @@
"scripts": {
"prepublish": "node ./scripts/tsgen.js",
"pretest": "npm run lint",
"test": "./scripts/api-changelog.sh && mocha --recursive && istanbul cover --include-all-sources --report cobertura --report html ./node_modules/mocha/bin/_mocha -- --recursive",
"posttest": "istanbul check-coverage",
"test": "node ./scripts/api-changelog.js && nyc mocha --recursive",
"lint": "eslint .",
"postlint": "npm run licchk",
"licchk": "license-check",
"postlicchk": "npm run doc",
"doc": "npm run docpub && npm run docpriv",
"docpub": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template -a public,undefined -d ./out/public .",
"docpriv": "jsdoc --pedantic --recurse -c jsdoc.conf -t ./node_modules/ink-docstrap/template -a all -d ./out/private .",
"systest": "mocha -t 0 systest && cucumber-js systest"
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf"
},
"repository": {
"type": "git",
Expand All @@ -37,18 +33,17 @@
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"chai-things": "^0.2.0",
"eslint": "^3.5.0",
"ink-docstrap": "^1.3.0",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
"eslint": "^3.17.1",
"jsdoc": "^3.4.3",
"license-check": "^1.1.5",
"mocha": "^3.0.2",
"sinon": "^1.17.6",
"mocha": "^3.2.0",
"nyc": "^10.1.2",
"sinon": "^1.17.7",
"sinon-as-promised": "^4.0.2"
},
"dependencies": {
"composer-common": "^0.4.5",
"composer-connector-hlf": "^0.4.5"
"composer-common": "^0.5.2",
"composer-connector-hlf": "^0.5.2"
},
"license-check-config": {
"src": [
Expand All @@ -61,5 +56,24 @@
"blocking": true,
"logInfo": false,
"logError": true
},
"nyc": {
"exclude": [
"coverage/**",
"out/**",
"scripts/**",
"systest/**",
"test/**"
],
"reporter": [
"text-summary",
"html"
],
"all": true,
"check-coverage": true,
"statements": 100,
"branches": 100,
"functions": 100,
"lines": 100
}
}
56 changes: 56 additions & 0 deletions packages/composer-admin/scripts/api-changelog.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* 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.
*/

'use strict';

const child_process = require('child_process');
const fs = require('fs');
const path = require('path');

const parentDirectory = path.resolve(__dirname, '..');
const apiSignatureFile = path.resolve(parentDirectory, 'api.txt');

if (fs.existsSync(apiSignatureFile)) {
fs.unlinkSync(apiSignatureFile);
}

return Promise.resolve()
.then(() => {
return new Promise((resolve, reject) => {
const parsejs = require.resolve('composer-common/lib/codegen/parsejs.js');
const command = child_process.fork(parsejs, ['--format', 'APISignature', '--inputDir', path.resolve(parentDirectory, 'lib'), '--outputDir', parentDirectory]);
command.on('exit', (code) => {
if (code !== 0) {
process.exit(code);
}
resolve();
});
});
})
.then(() => {
return new Promise((resolve, reject) => {
const changelog = require.resolve('composer-common/lib/tools/changelog.js');
const command = child_process.fork(changelog, ['--api', apiSignatureFile, '--changelog', path.resolve(parentDirectory, 'changelog.txt')]);
command.on('exit', (code) => {
if (code !== 0) {
process.exit(code);
}
resolve();
});
});
})
.catch((error) => {
console.error(error);
process.exit(1);
});
20 changes: 0 additions & 20 deletions packages/composer-admin/scripts/api-changelog.sh

This file was deleted.

Empty file modified packages/composer-admin/scripts/tsgen.js
100644 → 100755
Empty file.
15 changes: 0 additions & 15 deletions packages/composer-cli/.istanbul.yml

This file was deleted.

16 changes: 0 additions & 16 deletions packages/composer-cli/.travis.yml

This file was deleted.

Loading

0 comments on commit 0df9910

Please sign in to comment.