Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
civa86 committed Mar 12, 2017
2 parents 5942787 + 51d2bab commit 7ce32ed
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 16 deletions.
24 changes: 11 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
script: bash ./publish.sh

language: node_js

node_js:
- "6.1.0"

- 6.1.0
cache:
directories:
- node_modules
- app/node_modules

- node_modules
- app/node_modules
branches:
only:
- master

- master
deploy:
provider: npm
email: dario.civallero@gmail.com
api_key:
secure: LDugzqerJCidbsmdN90AGjkIePCeAD0Z40qVa1WWdNjGYSMsj0tm6k+YkQLMi+/0paUbjAWpkTXgCbmbwI6WsHbokQlhhsP1g8yi2DwVYsQDA3ULceUHas5zKe71UnI0pSwQsNZkssYrjodLLmPFIlqtDbYELmzNXhAnepFbtHx5NNlKK5mjDpKatIVjEKG8zy2fj/nwXtNs0yk5Sv2CiL7k8Rbjb+ZoSYeoS0Sjfdj5b4efqmlwO92DDtI6+t03UK1Bfl+0UuQdTQmsmoxTEFv+VxjY26fnEj6A06mjtbhAIjk+kicYSTF92kMuPRivz5277BS9JrQZb3luVEHIJp3ppiqkedU+sw/J3AW6GxkozsK648SfUW+O3w5RtDug6vy/AcxRZcDYmh6u2D+dPY3K+lcVuu+bOYdd4/o+vtrX2ViL0vqTvVw7rWBvh8zgulXxaAy1jrL++NZiSrFAtMUbEXsxFYGofxoVz4pOsvuPg39oIfsw0xIwPySQlgk/XBAH6R7HDoNKMP9nzWSrPn3ZM8mAng5tMYck20j/KzH7Ql+vU+EYMzlHLSlpiZ4MmOTtnyxRAJuICcjeBvtU7Xy1hKV5JY8xPK04LIoXgbPgsnLHgOn5LXp+CfxWwcgDvgWpoEMLBcytUevNLHOrJa0tbTzp5BbwQCzuQqymBMo=
env:
global:
# GITHUB_TOKEN
- secure: CP44yoiNZ5q0JgZksF1zgZzyYqg0NHLDHvdzjrkYJggEPzxHYXX69W83xL5MtKWeZ56Bj0m+zFgDygPVkL12rxZ/3xqf/YDYcKuJ/rzDbsYNtE9KFmd1kQgVVEvcl5F6FkoXVDT4rkcEecC2BOcNYRLSUnbLFEMLoHH0Yeik9zVyjNfj24aGYtBJ4FOptlBMornETU6rql1I/ZEFGrJxQj9Thqn2DmKXIX0xH6+sqinP+r6jRUk+UsA5VZ4XJkOrAy3yvZa6xlu5ZShUaGSbXTkeS8wa+r46P/0UPGbiXGSsJyizLDr9RP2hAoVZEUCkTEBdiAKnLbqUhZe1pApdLYoBlj6GfigD0tlKjIAcUIAab1Elq0A6a8kjm7SOg0FaoPYDc0EPDthNGE/k9siywieQ7wdxBwKidM/XRZ6AINfFhKp7oFXSZHAO7yEw9kUoIqx1mltljLrorts/qrjDXJrAZ1KRu/V7G5WtUEPAo8IIwRQPyenP+VJwp9QjsUSTdjugYhkIoZAb2aBekv/B10AEB8AYIVuoiqR3ajSf70ggvQj+q1/Lmmo//448mq4sXRjMUAwcKDmpwsDko2gXzFTdgaOStnFFuNv6spBIpxAchfZDd2qHz+nXnTe6Vv2HGhm3JwPgVKMyiUF3If+MU7A4nsCen4mEZD6gXqI2pAE=
# COVERALLS_TOKEN
- secure: kjHQZ2FqT4TCqjJiX2tazc0NoWcFn8meN5+b8WQ+ga0b4IBuq871TVcRU/qJT/4SmPignKzI8Be6r3eu4JvGGyOvZujcdyBxMqlpKtlJfJBOHKFKwHTlpU0pW94kvY1sev6ixEYBOHxmq8scUBrZ9PoE638uNdvDIwtOGj7Mn4NoreHzl+FYsH1N+HFkH2qYjA33cd7rzgVNmtLHBAUXV1uxXY6vCJg5vTCvXaxIYAQ/6CqSctGpnW1uByasQDMIFKr02UuYmF6PXtqJo2ojr1VnyInJbnriKkrovo7BeBXXFGypu2urxnwo0pCuM79NEBjFg0UHNEXPM9xeJ4vnzNOgkFVjMHaGpZRbH0QHUtYsek82xMnoJBTdpb8oRBuNKvBDyhn4qMs4eGOvcIt93qgaLPbT9OtF2u9mNUWCYGi7ub9h/kK0IkTTEElflQks7k1a11h1teAvQRk93+eNtnUDWcIhumReMEsZjaJFL9NUDgykt9fmDeGx3TOrjUMt3RPlmArR+StKltRGIv+3+Pm3yywnZHBDbpPynCQh5Gjw5SO0/VsKRg0G+ATUrvr17to32ulX9k6DfeQ7A3X6hPClGCWYQdoUgSorARGMVdbSQXoP22E5z4t7/p3Zs8s6WecUPalK6xozvOCn2MZdfKcdoV+OC+V2UY7UndF/pHI=
- secure: CP44yoiNZ5q0JgZksF1zgZzyYqg0NHLDHvdzjrkYJggEPzxHYXX69W83xL5MtKWeZ56Bj0m+zFgDygPVkL12rxZ/3xqf/YDYcKuJ/rzDbsYNtE9KFmd1kQgVVEvcl5F6FkoXVDT4rkcEecC2BOcNYRLSUnbLFEMLoHH0Yeik9zVyjNfj24aGYtBJ4FOptlBMornETU6rql1I/ZEFGrJxQj9Thqn2DmKXIX0xH6+sqinP+r6jRUk+UsA5VZ4XJkOrAy3yvZa6xlu5ZShUaGSbXTkeS8wa+r46P/0UPGbiXGSsJyizLDr9RP2hAoVZEUCkTEBdiAKnLbqUhZe1pApdLYoBlj6GfigD0tlKjIAcUIAab1Elq0A6a8kjm7SOg0FaoPYDc0EPDthNGE/k9siywieQ7wdxBwKidM/XRZ6AINfFhKp7oFXSZHAO7yEw9kUoIqx1mltljLrorts/qrjDXJrAZ1KRu/V7G5WtUEPAo8IIwRQPyenP+VJwp9QjsUSTdjugYhkIoZAb2aBekv/B10AEB8AYIVuoiqR3ajSf70ggvQj+q1/Lmmo//448mq4sXRjMUAwcKDmpwsDko2gXzFTdgaOStnFFuNv6spBIpxAchfZDd2qHz+nXnTe6Vv2HGhm3JwPgVKMyiUF3If+MU7A4nsCen4mEZD6gXqI2pAE=
- secure: kjHQZ2FqT4TCqjJiX2tazc0NoWcFn8meN5+b8WQ+ga0b4IBuq871TVcRU/qJT/4SmPignKzI8Be6r3eu4JvGGyOvZujcdyBxMqlpKtlJfJBOHKFKwHTlpU0pW94kvY1sev6ixEYBOHxmq8scUBrZ9PoE638uNdvDIwtOGj7Mn4NoreHzl+FYsH1N+HFkH2qYjA33cd7rzgVNmtLHBAUXV1uxXY6vCJg5vTCvXaxIYAQ/6CqSctGpnW1uByasQDMIFKr02UuYmF6PXtqJo2ojr1VnyInJbnriKkrovo7BeBXXFGypu2urxnwo0pCuM79NEBjFg0UHNEXPM9xeJ4vnzNOgkFVjMHaGpZRbH0QHUtYsek82xMnoJBTdpb8oRBuNKvBDyhn4qMs4eGOvcIt93qgaLPbT9OtF2u9mNUWCYGi7ub9h/kK0IkTTEElflQks7k1a11h1teAvQRk93+eNtnUDWcIhumReMEsZjaJFL9NUDgykt9fmDeGx3TOrjUMt3RPlmArR+StKltRGIv+3+Pm3yywnZHBDbpPynCQh5Gjw5SO0/VsKRg0G+ATUrvr17to32ulX9k6DfeQ7A3X6hPClGCWYQdoUgSorARGMVdbSQXoP22E5z4t7/p3Zs8s6WecUPalK6xozvOCn2MZdfKcdoV+OC+V2UY7UndF/pHI=
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ JavaScript Library to build a modular synthesizer.

Based on WebAudio API and WebAudio Effects Libray [tuna](https://github.com/Theodeus/tuna)

[![npm version](https://badge.fury.io/js/electrophone.svg)](http://badge.fury.io/js/electrophone)
[![Build Status](https://travis-ci.org/civa86/electrophone.svg?branch=master)](https://travis-ci.org/civa86/electrophone)
[![Coverage Status](https://coveralls.io/repos/github/civa86/electrophone/badge.svg?branch=master)](https://coveralls.io/github/civa86/electrophone?branch=master)

Expand All @@ -22,9 +23,25 @@ Frameworks and Libraries:
| jQuery | 1.12.11 | [https://jquery.com/](https://jquery.com/) |
| jquery-knob | 1.2.11 | [http://anthonyterrien.com/knob/](http://anthonyterrien.com/knob/) |
| Cytoscape.js | 2.5.5 | [http://js.cytoscape.org/](http://js.cytoscape.org/) |
| Moment.js | 2.13.0 | [https://momentjs.com/](https://momentjs.com/) |
| ReduxForm | 6.5.0 | [http://redux-form.com/6.5.0/](http://redux-form.com/6.5.0/) |
| Bootstrap | 3.3.6 | [http://getbootstrap.com/](http://getbootstrap.com/) |
| Ionicons | 2.0.1 | [http://ionicons.com/](http://ionicons.com/) |

Development Tools:

| Name | Version | Link |
| ------------ | ------- | ------------------------------------------------------------------------------------ |
| Babel | 6.18.0 | [https://babeljs.io/](https://babeljs.io/) |
| ESLint | 1.10.3 | [http://eslint.org/](http://eslint.org/) |
| Less | 2.5.3 | [http://lesscss.org/](http://lesscss.org/) |
| webpack | 1.13.3 | [https://webpack.github.io/](https://webpack.github.io/) |
| Mocha | 3.2.0 | [https://mochajs.org/](https://mochajs.org/) |
| Chai | 3.5.0 | [http://chaijs.com/](http://chaijs.com/) |
| ESDoc | 0.4.7 | [https://esdoc.org/](https://esdoc.org/) |
| isparta | 4.0.0 | [https://github.com/douglasduteil/isparta](https://github.com/douglasduteil/isparta) |


## Library Code Documentation

[Documentation Page](http://civa86.github.io/electrophone/docs/)
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"webpack-dev-server": "1.16.2"
},
"scripts": {
"test": "mocha ./test/**/*.js ./test/components/**/*.js --reporter spec --compilers js:babel-core/register --recursive --colors",
"test": "mocha ./test/**/*.js --reporter spec --compilers js:babel-core/register --recursive --colors",
"test::watch": "npm test -- --watch",
"app::dev": "node server.js",
"app::build": "rm -rf ./dist; NODE_ENV=production webpack --config webpack.config.js --progress --colors --profile --bail",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electrophone",
"version": "0.9.1",
"version": "1.0.0",
"description": "Modular Synth Javascript Library",
"main": "dist/electrophone.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ then

git checkout development

echo "PUSH MASTER BRANCH TO PUBLISH YOUR BUILD WITH Travis CI!"
echo "PUSH MASTER BRANCH TO PUBLISH DEMO APPLICATION WITH Travis CI!"
else
echo "REVERTING PACKAGE VERSION: $START_V"

Expand Down

0 comments on commit 7ce32ed

Please sign in to comment.