Skip to content

Commit

Permalink
Merge pull request #1 from kevinsawicki/babel
Browse files Browse the repository at this point in the history
Precompile using babel before publishing
  • Loading branch information
malept committed Sep 14, 2016
2 parents a95db65 + 10ba0aa commit d904a01
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 16 deletions.
9 changes: 8 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ platform:
- x64
environment:
matrix:
- nodejs_version: "0.10"
- nodejs_version: "0.12"
- nodejs_version: "4"
- nodejs_version: "5"
- nodejs_version: "6"
Expand All @@ -18,6 +20,11 @@ install:
test_script:
- node --version
- npm --version
- npm run ci
- ps: |
if (($env:nodejs_version -eq "0.10") -or ($env:nodejs_version -eq "0.12")) {
npm run oldNodeCI
} else {
npm run ci
}
build: off
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
build.js
tests/transpiled.js
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
node_modules
lcov.info
npm-debug.log
build.js
tests/transpiled.js
8 changes: 8 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.appveyor.yml
.codeclimate.yml
.editorconfig
.eslintignore
.npmignore
.travis.yml
index.js
tests
16 changes: 12 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ os:
osx_image: xcode8
language: node_js
node_js:
- '0.10'
- '0.12'
- '4'
- '5'
- '6'
cache:
directories:
- node_modules
addons:
code_climate:
repo_token: f38fa2f1de8a3a776fe3587f9eef2df022f9822241563e4df82cbc9ab3d7997b
script: npm run ci
env:
global:
- CODECLIMATE_REPO_TOKEN=f38fa2f1de8a3a776fe3587f9eef2df022f9822241563e4df82cbc9ab3d7997b
script:
- |
if [[ ${TRAVIS_NODE_VERSION:0:1} = "0" ]]; then
npm run oldNodeCI
else
npm run ci
fi
1 change: 1 addition & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const debug = require('debug')('sumchecker')
const crypto = require('crypto')
const fs = require('fs')
const path = require('path')
const Promise = global.Promise || require('es6-promise').Promise

const CHECKSUM_LINE = /^([\da-fA-F]+) ([ *])(.+)$/

Expand Down
19 changes: 15 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Mark Lee",
"license": "Apache-2.0",
"description": "Checksum validator",
"main": "index.js",
"main": "build.js",
"repository": {
"type": "git",
"url": "git+https://github.com/malept/sumchecker.git"
Expand All @@ -18,6 +18,9 @@
},
"homepage": "https://github.com/malept/sumchecker#readme",
"devDependencies": {
"babel-cli": "^6.14.0",
"babel-preset-es2015": "^6.14.0",
"babel-register": "^6.14.0",
"codeclimate-test-reporter": "^0.3.3",
"eslint": "^3.3.1",
"eslint-config-standard": "^6.0.0-beta.3",
Expand All @@ -27,11 +30,14 @@
"nyc": "^8.1.0"
},
"dependencies": {
"debug": "^2.2.0"
"debug": "^2.2.0",
"es6-promise": "^3.2.1"
},
"scripts": {
"ci": "eslint . && intern-client config=tests/intern reporters=Lcov reporters=Console && codeclimate-test-reporter < lcov.info",
"test": "eslint . && intern-client config=tests/intern reporters=Pretty"
"ci": "eslint . && intern-client config=tests/intern suites=tests/index reporters=Lcov reporters=Console && codeclimate-test-reporter < lcov.info",
"oldNodeCI": "babel --out-file tests/transpiled.js tests/index.js && intern-client config=tests/intern suites=tests/transpiled reporters=Console",
"prepublish": "babel --out-file build.js index.js",
"test": "eslint . && intern-client config=tests/intern suites=tests/index reporters=Pretty"
},
"eslintConfig": {
"env": {
Expand All @@ -46,5 +52,10 @@
"error"
]
}
},
"babel": {
"presets": [
"es2015"
]
}
}
15 changes: 10 additions & 5 deletions tests/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ define((require) => {
const assert = require('intern/chai!assert')
const path = require('intern/dojo/node!path')
const registerSuite = require('intern!object')
const sumchecker = require('intern/dojo/node!../index')
const sumchecker = require('intern/dojo/node!../build')

let fixture = (filename) => {
return path.join('tests', 'fixtures', filename)
Expand All @@ -34,6 +34,11 @@ define((require) => {
return sumchecker('sha256', fixture(checksumFilename), fixture(''), filesToCheck)
}

let assertError = (error, errorClass) => {
// Because of transpiling, Error subclasses don't actually work
assert.instanceOf(error, Error)
}

registerSuite({
'Checksum validates': function () {
let deferred = this.async(1000)
Expand All @@ -60,7 +65,7 @@ define((require) => {
let deferred = this.async(1000)
testSumChecker('invalid.sha256sum', 'example')
.then(reject(deferred), deferred.callback(error => {
assert.instanceOf(error, sumchecker.ChecksumParseError)
assertError(error, sumchecker.ChecksumParseError)
assert.strictEqual(error.lineNumber, 1)
assert.strictEqual(error.line, 'invalid')
}))
Expand All @@ -70,7 +75,7 @@ define((require) => {
let deferred = this.async(1000)
testSumChecker('example.sha256sum', 'nonexistent')
.then(reject(deferred), deferred.callback(error => {
assert.instanceOf(error, sumchecker.NoChecksumFoundError)
assertError(error, sumchecker.NoChecksumFoundError)
assert.equal(error.filename, 'nonexistent')
}))
},
Expand All @@ -79,7 +84,7 @@ define((require) => {
let deferred = this.async(1000)
testSumChecker('example.sha256sum', 'wrong-checksum')
.then(reject(deferred), deferred.callback(error => {
assert.instanceOf(error, sumchecker.ChecksumMismatchError)
assertError(error, sumchecker.ChecksumMismatchError)
assert.equal(error.filename, 'wrong-checksum')
}))
},
Expand All @@ -88,7 +93,7 @@ define((require) => {
let deferred = this.async(1000)
testSumChecker('example.sha256sum', ['example', 'wrong-checksum'])
.then(reject(deferred), deferred.callback(error => {
assert.instanceOf(error, sumchecker.ChecksumMismatchError)
assertError(error, sumchecker.ChecksumMismatchError)
assert.equal(error.filename, 'wrong-checksum')
}))
},
Expand Down
3 changes: 1 addition & 2 deletions tests/intern.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use strict'

define({
excludeInstrumentation: /^(?:tests|node_modules)\//,
suites: ['tests/index']
excludeInstrumentation: /^(?:tests|node_modules)\//
})

0 comments on commit d904a01

Please sign in to comment.