move node-xmpp to a sub package

Author: sonnyp

.npmignore

@@ -3,10 +3,9 @@ sudo: false
 language: node_js
 
 node_js:
-  - '0.10'
   - '0.12'
   - '4'
   - '5'
-  - 'stable'
+  - '6'
 
-before_script: npm install -g mocha standard
+before_script: npm run bootstrap

.travis.yml

@@ -8,21 +8,20 @@ Here's some guidelines that will help you get your pull requests merged more qui
 
 __Note:__ If there's a feature you'd like, there's a bug you'd like to fix, or you'd just like to get involved please raise an issue and start a conversation. We'll help as much as we can so you can get contributing - although we may not always get back right away :)
 
-## Coding standards
-
-Most of the coding standards are covered by `.jshintrc`. You can also test 
-any changes with `grunt test` (this will also run the tests).
+## Getting started
 
-Things not covered by jshint:
+```
+git@github.com:node-xmpp/node-xmpp.git
+cd node-xmpp
+npm install
+npm run bootstrap # see https://github.com/lerna/lerna#bootstrap
+npm test
+```
 
-* Unless required __no semicolons__ they are not required
-* Short one-line `if` statements do not require nipple brackets (provided functionality is clear)
-* Multiple conditionals within an `if` statement should be surrounded by brackets
-* `exports`/`module.exports` should be at the end of the file
-* Longer, descriptive variable names are preferred, e.g. `error` vs `err`
+## Coding standards
 
-We acknowledge all the code does not meet these standards but we are working 
-to change this over time.
+Our coding standards are covered by [JavaScript Standard Style](http://standardjs.com/). You can also test
+any changes with `npm test` (this will also run the tests).
 
 ## Tests
 

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Stephan Maka
+Copyright (c) 2016 node-xmpp
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -17,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-

LICENSE

@@ -0,0 +1,4 @@
+{
+  "lerna": "2.0.0-beta.15",
+  "version": "4.0.0"
+}

lerna.json

@@ -1,59 +1,15 @@
 {
-  "name": "node-xmpp",
-  "version": "1.0.2",
-  "description": "XMPP for JavaScript",
-  "author": "Astro",
-  "dependencies": {
-    "node-xmpp-client": "^3.0.0",
-    "node-xmpp-component": "^2.0.0",
-    "node-xmpp-core": "^5.0.0",
-    "node-xmpp-server": "^2.1.2"
-  },
+  "private": true,
   "devDependencies": {
-    "pem": "^1.8.1"
+    "lerna": "2.0.0-beta.15",
+    "mocha": "^2.5.3",
+    "pem": "^1.8.3",
+    "standard": "^7.1.1"
   },
-  "repository": "github:node-xmpp/node-xmpp",
-  "homepage": "http://github.com/node-xmpp/node-xmpp",
-  "bugs": "http://github.com/node-xmpp/node-xmpp/issues",
-  "maintainers": [
-    {
-      "name": "Astro",
-      "email": "astro@spaceboyz.net",
-      "web": "http://spaceboyz.net/~astro/"
-    },
-    {
-      "name": "Lloyd Watkin",
-      "email": "lloyd@evilprofessor.co.uk",
-      "web": "http://www.evilprofessor.co.uk"
-    }
-  ],
-  "contributors": [
-    "Stephan Maka",
-    "Derek Hammer",
-    "Daniel Zelisko",
-    "Michael Geers",
-    "Nolan Darilek",
-    "Nathan Rajlich",
-    "Dhruv Matani",
-    "Camilo Aguilar",
-    "Henry Chan",
-    "Justin Campbell",
-    "Trent Mick",
-    "Alexey Shamrin",
-    "Sonny Piers",
-    "Chaitanya Gupta",
-    "Иван",
-    "Julien Genestoux",
-    "Ian Langworth",
-    "Eelco Cramer",
-    "dodo",
-    "Markus Kohlhase"
-  ],
-  "license": "MIT",
   "scripts": {
-    "preversion": "npm test",
-    "unit": "mocha --recursive test/ -t 3000",
     "lint": "standard",
+    "unit": "mocha --recursive packages/*/test/ -t 5000",
+    "bootstrap": "lerna bootstrap",
     "test": "npm run unit && npm run lint"
   }
 }

package.json

@@ -0,0 +1,4 @@
+examples/
+test/
+
+.npmignore

packages/node-xmpp/.npmignore

@@ -0,0 +1,18 @@
+{
+  "name": "node-xmpp",
+  "version": "1.0.2",
+  "description": "XMPP for JavaScript",
+  "dependencies": {
+    "node-xmpp-client": "^3.0.0",
+    "node-xmpp-component": "^2.0.0",
+    "node-xmpp-core": "^5.0.0",
+    "node-xmpp-server": "^2.1.2"
+  },
+  "repository": "github:node-xmpp/node-xmpp",
+  "homepage": "http://github.com/node-xmpp/node-xmpp",
+  "bugs": "http://github.com/node-xmpp/node-xmpp/issues",
+  "license": "MIT",
+  "scripts": {
+    "preversion": "npm test"
+  }
+}

examples/browser/chat.js packages/node-xmpp/examples/browser/chat.js

@@ -1,6 +1,6 @@
 'use strict'
 
-/* global describe, it, after, before */
+/* global describe, it, before */
 
 var assert = require('assert')
 var xmpp = require('../index')
@@ -14,12 +14,12 @@ var user = {
 var tls
 
 before(function (done) {
-  var cert_params = {
+  var certParams = {
     days: 1,
     selfSigned: true,
     altNames: ['localhost', '127.0.0.1']
   }
-  pem.createCertificate(cert_params, function (err, keys) {
+  pem.createCertificate(certParams, function (err, keys) {
     if (err) return done(err)
     tls = {key: keys.serviceKey + '\n', cert: keys.certificate + '\n'}
     tls.ca = tls.cert
@@ -40,14 +40,13 @@ function startServer (done) {
   })
 
   c2s.on('connection', function (client) {
-    // Allows the developer to authenticate users against anything they want.
     client.once('authenticate', function (opts, cb) {
       if ((opts.saslmech = 'PLAIN') &&
         (opts.jid.toString() === user.jid) &&
         (opts.password === user.password)) {
         cb(null, opts)
       } else {
-        cb(new Error('Authentication failure'))
+        cb()
       }
     })
 
@@ -68,9 +67,10 @@ describe('TLS', function () {
     startServer(done)
   })
 
-  after(function (done) {
-    c2s.shutdown(done)
-  })
+  // FIXME fails on Node.js 0.12 and 4.0
+  // after(function (done) {
+  //   c2s.shutdown(done)
+  // })
 
   describe('server', function () {
     it('should go online', function (done) {
@@ -118,7 +118,9 @@ describe('TLS', function () {
         done(new Error('should not allow any authentication'))
       })
 
-      cl.once('error', function () {
+      cl.once('error', function (err) {
+        // assert(err instanceof Error) FIXME should be an instance of Error
+        assert.equal(err.toString(), 'XMPP authentication failure')
         done()
       })
     })