pr #72

package.json

@@ -9,5 +9,9 @@
     "grunt-contrib-nodeunit": "~0.2.2",
     "grunt-contrib-jshint": "~0.7.2",
     "express": "~3.4.8"
+  },
+  "dependencies": {
+    "underscore": "~1.6.0",
+    "socket.io-client": "~0.9.16"
   }
 }

src/client/cloak.js

@@ -1,7 +1,19 @@
 /* cloak client */
-/* global cloak:true,module,io:true,console,_:true */
+/* global module,console */
+
+(function(global, factory) {
+
+  if (typeof global.define === 'function' && global.define.amd) {
+    define(['underscore', 'socket.io-client'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    module.exports = factory(
+      require('underscore'), require('socket.io-client')
+    );
+  } else {
+    global.cloak = factory(global._, global.io);
+  }
 
-(function() {
+})(this, function(_, io) {
 
   var removeKey = function(val, key, obj) {
     delete obj[key];
@@ -18,17 +30,6 @@
 
     var cloak = {
 
-      _setLibs: function(a, b) {
-        _ = a;
-        io = b;
-      },
-
-      /**
-       * Set configuration options for Cloak. These options will be applied
-       * immediately if Cloak has already been started (see `cloak.run`), and
-       * they will be referenced in all future calls to `clock.run` until
-       * overwritten.
-       */
       configure: function(configArg) {
 
         // When specified, the `messages` option should trigger the complete
@@ -226,11 +227,5 @@
 
   };
 
-  if (typeof window === 'undefined') {
-    module.exports = createCloak;
-  }
-  else {
-    cloak = createCloak();
-  }
-
-}());
+  return createCloak();
+});

test/lib/superSuite.js

@@ -59,9 +59,12 @@ module.exports = {
   // function instead of doing it manually means clients
   // will be properly cleaned up after tests are done.
   createClient: function() {
-    var client = createCloakClient();
-    client._setLibs(_, io);
+    var client;
+
+    delete require.cache[require.resolve('../../src/client/cloak')];
+    client = require('../../src/client/cloak');
     clients.push(client);
+
     return client;
   }