From 0ee721549d717f03b1cec6bee493b217663cf885 Mon Sep 17 00:00:00 2001
From: Friedel Ziegelmayer <dignifiedquire@gmail.com>
Date: Thu, 15 Sep 2016 14:52:15 +0200
Subject: [PATCH] fix(version): better http-api and interface-ipfs-core
 compliant

---
 src/cli/commands/version.js          |  6 +-----
 src/http-api/resources/version.js    | 10 ++++++++--
 test/cli/test-version.js             |  4 ++--
 test/http-api/inject/test-version.js |  6 +++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/cli/commands/version.js b/src/cli/commands/version.js
index bea6e9fecd..9158bffc31 100644
--- a/src/cli/commands/version.js
+++ b/src/cli/commands/version.js
@@ -37,11 +37,7 @@ module.exports = {
           throw err
         }
 
-        if (typeof version === 'object') { // js-ipfs-api output
-          version = version.Version
-        }
-
-        console.log(`js-ipfs version: ${version}`)
+        console.log(`js-ipfs version: ${version.version}`)
       })
     })
   }
diff --git a/src/http-api/resources/version.js b/src/http-api/resources/version.js
index a5ead9f068..6d66211cb4 100644
--- a/src/http-api/resources/version.js
+++ b/src/http-api/resources/version.js
@@ -5,11 +5,17 @@ const boom = require('boom')
 exports = module.exports
 
 exports.get = (request, reply) => {
-  request.server.app.ipfs.version((err, version) => {
+  const ipfs = request.server.app.ipfs
+
+  ipfs.version((err, version) => {
     if (err) {
       return reply(boom.badRequest(err))
     }
 
-    reply(version)
+    reply({
+      Version: version.version,
+      Commit: version.commit,
+      Repo: version.repo
+    })
   })
 }
diff --git a/test/cli/test-version.js b/test/cli/test-version.js
index d5606f38a0..2378bd2df5 100644
--- a/test/cli/test-version.js
+++ b/test/cli/test-version.js
@@ -12,7 +12,7 @@ describe('version', () => {
   const env = _.clone(process.env)
   env.IPFS_PATH = repoPath
 
-  describe.skip('api offline', () => {
+  describe('api offline', () => {
     it('get the version', (done) => {
       nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'version'], {env})
         .run((err, stdout, exitcode) => {
@@ -24,7 +24,7 @@ describe('version', () => {
     })
   })
 
-  describe.skip('api running', () => {
+  describe('api running', () => {
     let httpAPI
 
     before((done) => {
diff --git a/test/http-api/inject/test-version.js b/test/http-api/inject/test-version.js
index 569228712b..8d8afaa339 100644
--- a/test/http-api/inject/test-version.js
+++ b/test/http-api/inject/test-version.js
@@ -17,9 +17,9 @@ module.exports = (http) => {
         method: 'GET',
         url: '/api/v0/version'
       }, (res) => {
-        expect(res.result.version).to.equal(pkgversion)
-        expect(res.result).to.have.a.property('commit')
-        expect(res.result).to.have.a.property('repo')
+        expect(res.result).to.have.a.property('Version', pkgversion)
+        expect(res.result).to.have.a.property('Commit')
+        expect(res.result).to.have.a.property('Repo')
         done()
       })
     })