summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Faivre <contact@jeremyfa.com>2019-09-17 00:32:55 +0200
committerJeremy Faivre <contact@jeremyfa.com>2019-09-17 00:33:17 +0200
commitd2662e9a95e486d30bb8b97422d53c79c2c3e15b (patch)
tree36884e12efc3ed02098612b7276743b367ba1c66
parent0b53177b26dfe0c2081465e3a496c9b4cb5b1c63 (diff)
downloadyamljs-d2662e9a95e486d30bb8b97422d53c79c2c3e15b.tar.gz
Build with latest coffeescript, fix a few errors
-rw-r--r--.travis.yml2
-rw-r--r--Cakefile10
-rw-r--r--src/Exception/DumpException.coffee6
-rw-r--r--src/Exception/ParseException.coffee6
-rw-r--r--src/Exception/ParseMore.coffee6
5 files changed, 24 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 3d496c3..4c57c80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,6 @@ language: node_js
node_js:
- "5.0"
before_script:
- - npm install -g coffee-script
+ - npm install -g coffeescript
- npm install -g browserify
- npm install -g uglify-js
diff --git a/Cakefile b/Cakefile
index edc0878..44528dd 100644
--- a/Cakefile
+++ b/Cakefile
@@ -69,7 +69,7 @@ task 'build', 'build project', ->
# Minify
minify = ->
- exec 'uglifyjs --mangle sort '+esc(distDir+'/yaml.js')+' > '+esc(distDir+'/yaml.min.js'), (err, res) ->
+ exec 'uglifyjs '+esc(distDir+'/yaml.js')+' > '+esc(distDir+'/yaml.min.js'), (err, res) ->
if err then throw err
console.log "Minified yaml.min.js"
@@ -106,7 +106,13 @@ task 'build', 'build project', ->
task 'test', 'test project', ->
# Test
- spawn 'node', [modulesDir+'/jasmine-node/lib/jasmine-node/cli.js', '--verbose', '--coffee', specDir+'/YamlSpec.coffee'], stdio: "inherit"
+ proc = spawn 'node', [modulesDir+'/jasmine-node/lib/jasmine-node/cli.js', '--verbose', '--coffee', specDir+'/YamlSpec.coffee'], stdio: "inherit"
+ proc.on 'exit', (code) ->
+ if code != 0
+ process.exit(code)
+ proc.on 'close', (code) ->
+ if code != 0
+ process.exit(code)
task 'doc', 'generate documentation', ->
diff --git a/src/Exception/DumpException.coffee b/src/Exception/DumpException.coffee
index 9cc6c27..53c19e3 100644
--- a/src/Exception/DumpException.coffee
+++ b/src/Exception/DumpException.coffee
@@ -1,7 +1,11 @@
class DumpException extends Error
- constructor: (@message, @parsedLine, @snippet) ->
+ constructor: (message, parsedLine, snippet) ->
+ super message
+ @message = message
+ @parsedLine = parsedLine
+ @snippet = snippet
toString: ->
if @parsedLine? and @snippet?
diff --git a/src/Exception/ParseException.coffee b/src/Exception/ParseException.coffee
index a6a0785..049710f 100644
--- a/src/Exception/ParseException.coffee
+++ b/src/Exception/ParseException.coffee
@@ -1,7 +1,11 @@
class ParseException extends Error
- constructor: (@message, @parsedLine, @snippet) ->
+ constructor: (message, parsedLine, snippet) ->
+ super message
+ @message = message
+ @parsedLine = parsedLine
+ @snippet = snippet
toString: ->
if @parsedLine? and @snippet?
diff --git a/src/Exception/ParseMore.coffee b/src/Exception/ParseMore.coffee
index faeb946..6fd533d 100644
--- a/src/Exception/ParseMore.coffee
+++ b/src/Exception/ParseMore.coffee
@@ -1,7 +1,11 @@
class ParseMore extends Error
- constructor: (@message, @parsedLine, @snippet) ->
+ constructor: (message, parsedLine, snippet) ->
+ super message
+ @message = message
+ @parsedLine = parsedLine
+ @snippet = snippet
toString: ->
if @parsedLine? and @snippet?