Updated ping command to stick to The New Way

PR-URL: #110

Author: zkat

lib/ping.js

@@ -1,26 +1,23 @@
-
 module.exports = ping
 
-var url = require("url")
+var url = require('url')
+var assert = require('assert')
+
+function ping (uri, params, cb) {
+  assert(typeof uri === 'string', 'must pass registry URI to ping')
+  assert(params && typeof params === 'object', 'must pass params to ping')
+  assert(typeof cb === 'function', 'must pass callback to ping')
+
+  var auth = params.auth
+  assert(auth && typeof auth === 'object', 'must pass auth to ping')
 
-function ping (uri, cb) {
-  var c = this.conf.getCredentialsByURI(uri)
-  if (!c || !c.auth) {
-    var er = new Error("Must be logged in to ping the registry")
-    er.code = "ENEEDAUTH"
-    return cb(er)
-  }
-  var parsed = url.parse(uri)
-  parsed.auth = c.username + ":" + escape(c.password)
-  uri = url.resolve(parsed, "/-/ping?write=true")
-  this.get(uri, null, function (er, fullData) {
+  this.request(url.resolve(uri, '-/ping?write=true'), { auth: auth }, function (er, fullData) {
     if (er) {
       cb(er)
     } else if (fullData) {
-      console.log(fullData)
       cb(null, fullData)
     } else {
-      cb(new Error("No data received"))
+      cb(new Error('No data received'))
     }
   })
 }

test/ping.js

@@ -1,40 +1,73 @@
-var tap = require("tap")
+var test = require('tap').test
 
-var server = require("./lib/server.js")
-var common = require("./lib/common.js")
+var server = require('./lib/server.js')
+var common = require('./lib/common.js')
+var client = common.freshClient()
 
-var DEP_USER = "username"
-var HOST = "localhost"
+function nop () {}
 
-var nerfed = "//" + HOST + ":" + server.port + "/:"
+var TOKEN = 'not-bad-meaning-bad-but-bad-meaning-wombat'
+var AUTH = { token: TOKEN }
+var PARAMS = { auth: AUTH }
+var DEP_USER = 'username'
+var HOST = 'localhost'
 
-var configuration = {}
-configuration[nerfed + "username"]  = DEP_USER
-configuration[nerfed + "_password"] = new Buffer("%1234@asdf%").toString("base64")
-configuration[nerfed + "email"]     = "[email protected]"
+test('ping call contract', function (t) {
+  t.throws(function () {
+    client.ping(undefined, AUTH, nop)
+  }, 'requires a URI')
 
-var client = common.freshClient(configuration)
+  t.throws(function () {
+    client.ping([], AUTH, nop)
+  }, 'requires URI to be a string')
 
-tap.test("ping registry", function (t) {
-  t.plan(3)
-  server.expect("GET", "/-/ping?write=true", function (req, res) {
-    t.equal(req.method, "GET")
+  t.throws(function () {
+    client.ping(common.registry, undefined, nop)
+  }, 'requires params object')
+
+  t.throws(function () {
+    client.ping(common.registry, '', nop)
+  }, 'params must be object')
+
+  t.throws(function () {
+    client.ping(common.registry, AUTH, undefined)
+  }, 'requires callback')
+
+  t.throws(function () {
+    client.ping(common.registry, AUTH, 'callback')
+  }, 'callback must be function')
+
+  t.throws(
+    function () {
+      var params = {}
+      client.ping(common.registry, params, nop)
+    },
+    { name: 'AssertionError', message: 'must pass auth to ping' },
+    'must pass auth to ping'
+  )
+
+  t.end()
+})
+
+test('ping', function (t) {
+  server.expect('GET', '/-/ping?write=true', function (req, res) {
+    t.equal(req.method, 'GET')
     res.statusCode = 200
     res.json({
-      ok: true
-    , host: HOST
-    , peer: HOST
-    , username: DEP_USER
+      ok: true,
+      host: HOST,
+      peer: HOST,
+      username: DEP_USER
     })
   })
 
-  client.ping(common.registry, function (er, found) {
-    t.ifError(er, "no errors")
+  client.ping(common.registry, PARAMS, function (error, found) {
+    t.ifError(error, 'no errors')
     var wanted = {
-      ok: true
-    , host: HOST
-    , peer: HOST
-    , username: DEP_USER
+      ok: true,
+      host: HOST,
+      peer: HOST,
+      username: DEP_USER
     }
     t.same(found, wanted)
     t.end()