Fix unix sockets issue. Fix tests. Merge with master.

.gitignore

@@ -1 +1,2 @@
 node_modules
+/.idea/

.travis.yml

@@ -10,15 +10,20 @@ node_js:
 # Create a Travis memcached enabled environment for the test suite to run in and
 # ensure that we test against localhost on Travis-CI.
 services: memcache
-env: MEMCACHED__HOST=localhost
+#env:
+#  global:
+#  - MEMCACHED__HOST="localhost"
+#  - MEMCACHED__SOCKET_PATH=`pwd`/memcached.sock
 
 # The `sevices: memcache` will start a memcached service on localhost
 # and on the default port, but in order to test against multiple memcached
 # instances we need to spawn a couple more, so we do that during the before
 # script
 before_script:
+  - memcached -p 11211 -d
   - memcached -p 11212 -d
   - memcached -p 11213 -d
+  - memcached -s memcached.sock -d
 
 # Fix broken builds caused by packages using the carrot semver bullshit.
 before_install:

lib/memcached.js

@@ -119,7 +119,7 @@ Client.config = {
   // will receive the connection if the operation was successful
   memcached.connect = function connect(server, callback) {
     // Default port to 11211
-    if(!server.match(/(.+):(\d+)$/)) {
+    if(server[0] !== '/' && !server.match(/(.+):(\d+)$/)) {
         server = server + ':11211';
     }
 
@@ -545,7 +545,7 @@ Client.config = {
     }
 
   , 'VERSION': function version(tokens, dataSet) {
-      var versionTokens = /(\d+)(?:\.)(\d+)(?:\.)(\d+)$/.exec(tokens[1]);
+      var versionTokens = /^(\d+)(?:\.)(\d+)(?:\.)(\d+)/.exec(tokens[1]);
 
       return [CONTINUE, {
         server: this.serverAddress

test/common.js

@@ -15,13 +15,16 @@
  * @api public
  */
 var testMemcachedHost = process.env.MEMCACHED__HOST || '10.211.55.5';
+var testMemcachedSocketPath = process.env.MEMCACHED__SOCKET_PATH;
 
 exports.servers = {
-    single: testMemcachedHost + ':11211'
+    single: testMemcachedHost + ':11211',
+    singleSocket: testMemcachedSocketPath
   , multi: [
       testMemcachedHost + ':11211'
     , testMemcachedHost + ':11212'
     , testMemcachedHost + ':11213'
+    , testMemcachedSocketPath
   ]
 };
 

test/memcached-add.test.js

@@ -6,7 +6,9 @@
 var assert = require('assert')
   , fs = require('fs')
   , common = require('./common')
-  , Memcached = require('../');
+  , Memcached = require('../')
+  , should = require('should')
+;
 
 global.testnumbers = global.testnumbers || +(Math.random(10) * 1000000).toFixed();
 

test/memcached-cas.test.js

@@ -5,7 +5,9 @@
  */
 var assert = require('assert')
   , common = require('./common')
-  , Memcached = require('../');
+  , Memcached = require('../')
+  , should = require('should')
+;
 
 global.testnumbers = global.testnumbers || +(Math.random(10) * 1000000).toFixed();
 

test/memcached-connections.test.js

@@ -9,7 +9,9 @@
 var assert = require('assert')
   , fs = require('fs')
   , common = require('./common')
-  , Memcached = require('../');
+  , Memcached = require('../')
+  , should = require('should')
+;
 
 global.testnumbers = global.testnumbers || +(Math.random(10) * 1000000).toFixed();