Merge pull request #3 from conjurinc/role-graph

Role graph

Author: kgilpin

.gitignore

@@ -1,10 +1,10 @@
+xunit.xml
+report/
 *.log
 conjur-api.js
-integration-result.xml
 integration/testdata
 integration/policy.json
-test-result.xml
 test.log
 node_modules
 *.iml
-.idea
+.idea

Dockerfile

@@ -0,0 +1,7 @@
+FROM dockerfile/nodejs
+
+ADD . /app
+
+WORKDIR /app
+
+RUN npm update

README.md

@@ -3,14 +3,25 @@
 # Testing
 
 * Install global dependencies
-
-    $ sudo npm install -g mocha coffee-script
+```
+    $ sudo npm install -g mocha coffee-script gulp
+```
 
 * Load the test data set
-
+```
     $ cd integration
     $ conjur policy load -c policy.json policy.rb
+```
+
+* Configure gulp reporting (optional)
+```
+    # To write reports to a file in xunit format
+    $ export TEST_REPORTER=xunit-file
+    $ export XUNIT_FILE=reports/report.xml
+```
 
-* Run the tests
+* Run jslint and tests
+```
+    $ gulp
+```
 
-    $ test.sh

gulpfile.js

@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2013 Conjur Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
+ */
+
+"use strict";
+
+var gulp    = require('gulp'),
+    jslint  = require('gulp-jslint'),
+    mocha   = require('gulp-mocha'),
+    silenceLogger = require('./testconfig');
+
+require('coffee-script/register');
+
+var sources = ['lib/**/*.js'];
+var tests   = ['test/**/*_test.coffee'];
+
+
+function chooseMochaReporter(){
+    // if TEST_REPORTER is set, use that
+    if(process.env.TEST_REPORTER){
+        return process.env.TEST_REPORTER;
+    }
+
+    if(process.stdout.isTTY){
+        // use the always popular nyancat reporter if we're
+        // in someones terminal
+        return 'nyan';
+    }
+    // spec is a useful format, and looks good whether or not you're
+    // in a terminal.
+    return 'spec';
+}
+
+
+
+var mochaOpts = {
+    reporter: chooseMochaReporter()
+};
+
+var jslintOpts = {
+    // assume node.js
+    node: true,
+    // don't worry about sloppy whitespace
+    white: true,
+    // this one makes regexps of any kind impossible to use,
+    // for example it calls "." insecure, as well as "^", even
+    // when using it in a character class like "[^foo]".
+    regexp: true,
+    // This one makes maintaining backwards compatibility more or less impossible.
+    // See the xyzUrl functions in lib/config.js
+    unparam: true,
+    // don't print successes
+    errorsOnly: true
+};
+
+
+gulp.task('lint', function(){
+    return gulp.src(sources)
+        .pipe(jslint(jslintOpts));
+});
+
+gulp.task('test', function(){
+    silenceLogger();
+    return gulp.src(tests, {read: false})
+        .pipe(mocha(mochaOpts));
+});
+
+gulp.task('default', ['lint', 'test']);
+
+gulp.task('watch', function(){
+    gulp.watch(['lib/**/*.js', 'test/**/*.coffee', 'gulpfile.js'], ['default']);
+});

jenkins.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+job=$JOB_NAME
+if [ -z $job ]; then
+	job=sandbox
+fi
+
+docker build -t api-node:$job .
+
+rm -rf report
+mkdir report
+
+docker run --rm -e TEST_REPORTER=xunit-file -e XUNIT_FILE=report/xunit.xml -v $PWD/report:/app/report api-node:$job node node_modules/gulp/bin/gulp.js
+
+echo "Test results are available in report/xunit.xml"

lib/conjur/authn.js

@@ -18,34 +18,36 @@
  * 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.
  */
+"use strict";
 
-var g = require('../global')
+var g = require('../global');
 
 module.exports = {
-  connect: function(url) {
-    return {
-      casLogin: function(ticket, callback) {
-        var path = g.format(url + '/users/login?ticket=%s', ticket);
-        g.getURL(path, callback);
-      },
-      authenticate: function(username, apiKey, callback) {
-        var path = g.format(url + '/users/%s/authenticate', g.escape(username));
-        g.info(g.format("POST %s", path));
-        g.rest.post(path, { data: apiKey }).on('complete', function(token, response) {
-          if ( token instanceof Error)
-            return callback(token);
-          else if ( response.statusCode !== 200 )
-            return callback(g.format("POST %s failed : %s", path, response.statusCode));
-          
-          callback(null, token);
-        })
-      }    
+    connect: function (url) {
+        return {
+            casLogin: function (ticket, callback) {
+                var path = g.format(url + '/users/login?ticket=%s', ticket);
+                g.getURL(path, callback);
+            },
+            authenticate: function (username, apiKey, callback) {
+                var path = g.format(url + '/users/%s/authenticate', g.escape(username));
+                g.info(g.format("POST %s", path));
+                g.rest.post(path, {data: apiKey}).on('complete', function (token, response) {
+                    if (token instanceof Error){
+                        return callback(token);
+                    }
+                    if (response.statusCode !== 200) {
+                        return callback(g.format("POST %s failed : %s", path, response.statusCode));
+                    }
+                    callback(null, token);
+                });
+            }
+        };
+    },
+    username: function (token) {
+        return g.username(token);
+    },
+    tokenHeader: function (token) {
+        return g.format('Token token="%s"', new Buffer(JSON.stringify(token)).toString('base64'));
     }
-  },
-  username: function(token) {
-    return g.username(token);
-  },
-  tokenHeader: function(token) {
-    return g.format('Token token="%s"', new Buffer(JSON.stringify(token)).toString('base64'))
-  }
-}
+};