From 856619e9022fc879271547d392c7f6215bffa254 Mon Sep 17 00:00:00 2001 From: Andrew Stewart Date: Wed, 18 Jun 2014 14:44:46 -0700 Subject: [PATCH 1/2] Only require the API/Express when using it Fixes an issue with the Tessel, which cannot load Express. --- lib/cylon.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/cylon.js b/lib/cylon.js index b457513..f5d3721 100644 --- a/lib/cylon.js +++ b/lib/cylon.js @@ -10,8 +10,7 @@ var Async = require('async'); -var API = require('./api'), - Logger = require('./logger'), +var Logger = require('./logger'), Robot = require('./robot'), Utils = require('./utils'); @@ -60,6 +59,8 @@ Cylon.api = function api(opts) { opts = {}; } + var API = require('./api'); + this.api_instance = new API(opts); this.api_instance.listen(); }; From c5989c2028bfc82c671a11bfdc0a6c5649ec838d Mon Sep 17 00:00:00 2001 From: Andrew Stewart Date: Wed, 18 Jun 2014 15:19:26 -0700 Subject: [PATCH 2/2] Bump version to 0.15.1 --- README.markdown | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 0247ba7..b759328 100644 --- a/README.markdown +++ b/README.markdown @@ -244,6 +244,8 @@ on the [https://github.com/hybridgroup/cylon-site](https://github.com/hybridgrou ## Release History +Version 0.15.1 - Fixed issue with the API on Tessel + Version 0.15.0 - Better halting, cleaner startup, removed 'connect' and 'start' events, and misc other cleanups/refactors. diff --git a/package.json b/package.json index 20af39b..ecf41be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cylon", - "version": "0.15.0", + "version": "0.15.1", "main": "lib/cylon.js", "description": "A JavaScript robotics framework using Node.js", "homepage": "http://cylonjs.com",