Skip to content

Commit

Permalink
Merge branch 'release/v0.8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkGriffiths committed Jun 23, 2018
2 parents 1337f0b + eb805ba commit d4554d0
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 49 deletions.
36 changes: 21 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
---
branches:
only:
- master
- develop
- /^greenkeeper-.*$/
- /^greenkeeper/.*$/
language: node_js
node_js:
- stable
- 6
- 5
- 4
- 9
- 8
sudo: false
before_install: npm i -g npm@latest
notifications:
webhooks:
urls:
Expand All @@ -20,14 +18,22 @@ notifications:
on_failure: change
on_start: never
env:
- CXX=g++-4.8
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
code_climate:
repo_token: 027e05e388803c110e2bd2874962d470d838257ff0619faea6f28c495b646309
global:
- CC_TEST_REPORTER_ID=027e05e388803c110e2bd2874962d470d838257ff0619faea6f28c495b646309
- secure: k+PXexJeDTne3XBzuDa59S3V7lvZ1hXoivoD3AkSM30WXRFVhqvreCkpcrKcwLWD6DTJA7DYy2eQE26V4Q2NVIPSHo4cMhVKX4v6a4JITN8UCWKqa9oaDE4OuHWymVXcuS1FRDUJQEy59oRb1zM37f+3bfOEoEupgg4IDBErxiaWyLZV3d8f5mVNkZC2nhvXdfla/KNeJxCIBk8bzR9yCPgra8frwzGb0ZQazZfyy31D3JkHYNeJfIp/4ncXLiracUxzLLAevW0sb4RI3oP3KX8UKs//uT0ipjQnSqPQFM1gewDUPelk6XvI/glw6G1+nttqcyxj+LO6mlpJGXtcyNP2qziU86n2UYsxaocEtvcK4U7lKyo5tnrJr/WunZZ1k0H8YHASkHdKsef5m+lhlrKvk9ebMZER96bE1+p7gNSo9ghGNS+JSelVqs9hqNMFAAdiT8Y3Q5li5Yg81BNbLOXTYwFlXt1OKPrC2Ie3kKw/kbcYIhn9bofmsCHI2naULquISoEW94cqycpZzPfRmoWXOVqXM+jyWdQ/w1tEFuthYIiYJG1YIoptuW2ZIR6kIt8bLe6ZKCotkIfUY8fnENIq/VuNhIZWzHt5rtnqeP0XiH2aPGFXmAVGylVbUZLifQa8mS6CQiR9CTD7bOy5/odFtKrqGD1IN/QxpaLoa1I=
before_install:
- '[[ $(node -v) =~ ^v10.*$ ]] || npm install -g npm@latest'
- npm install -g greenkeeper-lockfile
install: npm install
before_script:
- greenkeeper-lockfile-update
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
after_script:
- "[ $TRAVIS_NODE_VERSION = stable ] && nyc report --reporter=text-lcov | codeclimate-test-reporter"
- greenkeeper-lockfile-upload
- "[ $TRAVIS_NODE_VERSION = stable ]
&& nyc report --reporter=lcov
&& ./cc-test-reporter after-build --debug -t lcov --exit-code $TRAVIS_TEST_RESULT
|| echo 'Coverage skipped'"

72 changes: 53 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 20 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
{
"name": "term-ng",
"version": "0.7.9",
"version": "0.8.1",
"description": "Terminal/$TERM feature snooping and whitelisting",
"main": "index.js",
"jsnext:main": "index-es.js",
"module": "index.mjs",
"bin": {
"termng": "./bin/termng"
},
"files": [
"index.js",
"index-es.js",
"index.mjs",
"bin"
],
"scripts": {
"test": "xo && nyc ava",
"doc-serve": "documentation serve --watch --theme node_modules/documentation-theme-bespoke --github --config src/docs/documentation.yml --name $npm_package_name --project-version $npm_package_version src/index.js",
"doc-build": "documentation build --format html --output docs --theme node_modules/documentation-theme-bespoke --github --config src/docs/documentation.yml --name $npm_package_name --project-version $npm_package_version src/index.js",
"readme": "compile-readme -u src/docs/example.md src/docs/readme.md > readme.md",
"code-climate": "nyc report --reporter=text-lcov | codeclimate-test-reporter",
"coverage": "nyc ava && nyc report --reporter=lcov --report-dir test/coverage; open test/coverage/lcov-report/index.html",
"clean": "gulp clean",
"colors": "scripts/colortest.pl"
},
"repository": {
"type": "git",
"url": "https://github.com/MarkGriffiths/term-ng.git"
},
"engines": {
"node": ">=4.0 <9.0"
"node": ">=8.0"
},
"keywords": [
"24bit",
Expand All @@ -42,19 +40,29 @@
"xterm"
],
"author": "Mark Griffiths <mark@thebespokepixel.com> (http://thebespokepixel.com/)",
"copyright": {
"year": "2018",
"owner": "The Bespoke Pixel"
},
"license": "MIT",
"bugs": {
"url": "https://github.com/MarkGriffiths/term-ng/issues"
},
"homepage": "https://github.com/MarkGriffiths/term-ng#readme",
"devDependencies": {
"@thebespokepixel/cordial": "^0.17.11",
"@babel/core": "^7.0.0-beta.51",
"@babel/preset-env": "^7.0.0-beta.51",
"ava": "^0.25.0",
"codeclimate-test-reporter": "^0.5.0",
"babel-plugin-lodash": "^3.3.4",
"documentation": "^8.0.0",
"documentation-theme-bespoke": "^0.3.4",
"gulp": "github:gulpjs/gulp#4.0",
"documentation-theme-bespoke": "^0.3.5",
"gulp": "^4.0.0",
"gulp-better-rollup": "^3.2.1",
"gulp-chmod": "^2.0.0",
"gulp-rename": "^1.3.0",
"gulp-strip-comments": "^2.5.2",
"nyc": "^12.0.2",
"rollup-plugin-babel": "^4.0.0-beta.5",
"shelljs": "^0.8.2",
"xo": "^0.21.1"
},
Expand All @@ -72,8 +80,7 @@
"esnext": true,
"ignores": [
"index.js",
"index-es.js",
"lib/**/*.js",
"index.mjs",
"bin/*.js",
"docs/**",
"src/docs/example.js"
Expand Down Expand Up @@ -137,6 +144,5 @@
"david"
]
]
},
"buildNumber": 0
}
}
2 changes: 1 addition & 1 deletion test/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import readPkg from 'read-pkg'

const pkg = readPkg.sync(resolve(__dirname, '..'))

const expectedVersion = pkg.buildNumber === 0 ? pkg.version : `${pkg.version}${pkg.buildNumber}`
const expectedVersion = pkg.version

test.cb(`Module name/version is '${pkg.name} v${expectedVersion}'.`, t => {
shell.exec('./bin/termng -vv', {
Expand Down

0 comments on commit d4554d0

Please sign in to comment.