Merge branch 'master' of github.com:hybridgroup/cylon into add-litcoffee

README.md

@@ -117,6 +117,7 @@ Cylon.js has a extensible system for connecting to hardware devices. The followi
 - [Pebble](http://www.getpebble.com/) <==> [Adaptor/Driver](https://github.com/hybridgroup/cylon-pebble)
 - [Raspberry Pi](http://www.raspberrypi.org/) <==> [Adaptor](https://github.com/hybridgroup/cylon-raspi)
 - [Salesforce](http://www.force.com/) <==> [Adaptor/Driver](https://github.com/hybridgroup/cylon-force)
+- [Skynet](http://skynet.im/) <==> [Adaptor](https://github.com/hybridgroup/cylon-skynet)
 - [Spark](http://www.spark.io/) <==> [Adaptor](https://github.com/hybridgroup/cylon-spark)
 - [Sphero](http://www.gosphero.com/) <==> [Adaptor/Driver](https://github.com/hybridgroup/cylon-sphero)
 
@@ -219,6 +220,12 @@ Thank you!
 
 ## Release History
 
+Version 0.10.3 - Fix dependency issue
+
+Version 0.10.2 - Create connections convenience vars, refactor config loading
+
+Version 0.10.1 - Updates required for test driven robotics, update Robeaux version, bugfixes
+
 Version 0.10.0 - Use Robeaux UX, add CLI commands for helping connect to devices, bugfixes
 
 Version 0.9.0 - Add AngularJS web interface to API, extensible commands for CLI

dist/cylon.js

@@ -19,6 +19,10 @@
 
   require('./logger');
 
+  require('./driver');
+
+  require('./adaptor');
+
   Logger.setup();
 
   Cylon = (function() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cylon",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "main": "dist/cylon.js",
   "description": "A JavaScript robotics framework using Node.js",
   "homepage": "http://cylonjs.com",

src/adaptor.coffee

@@ -53,9 +53,3 @@ namespace 'Cylon', ->
     # Returns nothing
     disconnect: ->
       Logger.info "Disconnecting from adaptor '#{@name}'..."
-
-    # # Public: Disconnects from the adaptor
-    # #
-    # # Returns nothing
-    # proxyTestStubs: (testAdaptor) ->
-    #   proxyTestStubs(@self.commands(), testAdaptor)

src/cylon.coffee

@@ -11,6 +11,8 @@
 require './config'
 require './utils'
 require './logger'
+require './driver'
+require './adaptor'
 
 Logger.setup()