Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit e17cb3f

Browse files
fix(version): return actual js-ipfs version
Closes #377
1 parent e67f6df commit e17cb3f

File tree

5 files changed

+10
-18
lines changed

5 files changed

+10
-18
lines changed

src/cli/commands/version.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports = {
4242
return
4343
}
4444

45-
console.log('ipfs version', version)
45+
console.log(`js-ipfs version: ${version}`)
4646
})
4747
})
4848
}

src/core/ipfs/version.js

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const utils = require('../utils')
3+
const readPkgUp = require('read-pkg-up')
44

55
module.exports = function version (self) {
66
return (opts, callback) => {
@@ -9,18 +9,10 @@ module.exports = function version (self) {
99
opts = {}
1010
}
1111

12-
utils.ifRepoExists(self._repo, (err) => {
13-
if (err) {
14-
return callback(err)
15-
}
16-
17-
self._repo.config.get((err, config) => {
18-
if (err) {
19-
return callback(err)
20-
}
21-
22-
callback(null, config.Version.Current)
12+
readPkgUp()
13+
.then((res) => {
14+
callback(null, res.pkg.version)
2315
})
24-
})
16+
.catch(callback)
2517
}
2618
}

test/cli/test-version.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('version', () => {
1616
nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'version'], {env})
1717
.run((err, stdout, exitcode) => {
1818
expect(err).to.not.exist
19-
expect(stdout[0]).to.equal('ipfs version 0.4.0-dev')
19+
expect(stdout[0]).to.equal('js-ipfs version: 0.14.1')
2020
expect(exitcode).to.equal(0)
2121
done()
2222
})
@@ -46,7 +46,7 @@ describe('version', () => {
4646
.run((err, stdout, exitcode) => {
4747
expect(err).to.not.exist
4848
expect(exitcode).to.equal(0)
49-
expect(stdout[0]).to.equal('ipfs version 0.4.0-dev')
49+
expect(stdout[0]).to.equal('js-ipfs version: 0.14.1')
5050
done()
5151
})
5252
})

test/core/both/test-version.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('version', () => {
1616
it('get version', (done) => {
1717
ipfs.version((err, version) => {
1818
expect(err).to.not.exist
19-
expect(version).to.equal('0.4.0-dev')
19+
expect(version).to.equal('0.14.1')
2020
done()
2121
})
2222
})

test/http-api/test-version.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = (httpAPI) => {
1818
method: 'GET',
1919
url: '/api/v0/version'
2020
}, (res) => {
21-
expect(res.result.Version).to.equal('0.4.0-dev')
21+
expect(res.result.Version).to.equal('0.14.1')
2222
expect(res.result).to.have.a.property('Commit')
2323
expect(res.result).to.have.a.property('Repo')
2424
done()

0 commit comments

Comments
 (0)