Merge pull request #48 from ipfs/feat/config

daviddias · daviddias · commit de3aa7d1ba4f · 2016-01-14T15:00:25.000Z
WIP feat/config
diff --git a/src/cli/commands/add.js b/src/cli/commands/add.js
@@ -5,5 +5,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/bootstrap/list.js b/src/cli/commands/bootstrap/list.js
@@ -15,7 +15,9 @@ module.exports = Command.extend({
     var node = new IPFS()
     node.bootstrap.list((err, list) => {
       if (err) { return log.error(err) }
-      list.forEach(node => { console.log(node) })
+      list.forEach(node => {
+        console.log(node)
+      })
     })
   }
 })
diff --git a/src/cli/commands/commands.js b/src/cli/commands/commands.js
@@ -5,5 +5,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/config/edit.js b/src/cli/commands/config/edit.js
@@ -0,0 +1,36 @@
+'use strict'
+
+const Command = require('ronin').Command
+const IPFS = require('../../../ipfs-core')
+const debug = require('debug')
+const log = debug('cli:version')
+log.error = debug('cli:version:error')
+
+module.exports = Command.extend({
+  desc: 'Shows IPFS version information',
+
+  options: {
+    number: {
+      alias: 'n',
+      type: 'boolean',
+      default: false
+    },
+    commit: {
+      type: 'boolean',
+      default: false
+    },
+    repo: {
+      type: 'boolean',
+      default: false
+    }
+  },
+
+  run: (name) => {
+    var node = new IPFS()
+    node.version((err, version) => {
+      if (err) { return log.error(err) }
+
+      console.log(version)
+    })
+  }
+})
diff --git a/src/cli/commands/config/replace.js b/src/cli/commands/config/replace.js
@@ -0,0 +1,25 @@
+'use strict'
+
+const Command = require('ronin').Command
+const IPFS = require('../../../ipfs-core')
+const debug = require('debug')
+const path = require('path')
+const log = debug('cli:version')
+log.error = debug('cli:version:error')
+
+module.exports = Command.extend({
+  desc: 'Replaces the config with <file>',
+
+  options: {},
+
+  run: (configPath) => {
+    var node = new IPFS()
+    var config = require(path.resolve(process.cwd(), configPath))
+
+    node.config.replace(config, (err, version) => {
+      if (err) { return log.error(err) }
+
+      console.log(version)
+    })
+  }
+})
diff --git a/src/cli/commands/config/show.js b/src/cli/commands/config/show.js
@@ -0,0 +1,22 @@
+'use strict'
+
+const Command = require('ronin').Command
+const IPFS = require('../../../ipfs-core')
+const debug = require('debug')
+const log = debug('cli:version')
+log.error = debug('cli:version:error')
+
+module.exports = Command.extend({
+  desc: 'Outputs the content of the config file',
+
+  options: {},
+
+  run: () => {
+    var node = new IPFS()
+    node.config.show((err, config) => {
+      if (err) { return log.error(err) }
+
+      console.log(JSON.stringify(config, null, 4))
+    })
+  }
+})
diff --git a/src/cli/commands/dns.js b/src/cli/commands/dns.js
@@ -5,5 +5,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/get.js b/src/cli/commands/get.js
@@ -3,5 +3,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/init.js b/src/cli/commands/init.js
@@ -20,9 +20,10 @@ module.exports = Command.extend({
     'empty-repo': {
       alias: 'e',
       type: 'boolean',
-      desc: 'Don\'t add and pin help files to the local storage'
+      desc: "Don't add and pin help files to the local storage"
     }
   },
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/ls.js b/src/cli/commands/ls.js
@@ -5,5 +5,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/mount.js b/src/cli/commands/mount.js
@@ -5,5 +5,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/ping.js b/src/cli/commands/ping.js
@@ -5,5 +5,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/refs.js b/src/cli/commands/refs.js
@@ -5,5 +5,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/repo/gc.js b/src/cli/commands/repo/gc.js
@@ -7,6 +7,5 @@ module.exports = Command.extend({
   options: {
   },
 
-  run: function (name) {
-  }
+  run: function (name) {}
 })
diff --git a/src/cli/commands/repo/init.js b/src/cli/commands/repo/init.js
@@ -7,6 +7,5 @@ module.exports = Command.extend({
   options: {
   },
 
-  run: function (name) {
-  }
+  run: function (name) {}
 })
diff --git a/src/cli/commands/resolve.js b/src/cli/commands/resolve.js
@@ -5,5 +5,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/cli/commands/update.js b/src/cli/commands/update.js
@@ -5,5 +5,6 @@ const Command = require('ronin').Command
 module.exports = Command.extend({
   desc: '',
 
-  run: name => {}
+  run: name => {
+  }
 })
diff --git a/src/http-api/resources/id.js b/src/http-api/resources/id.js
@@ -11,4 +11,3 @@ exports.get = (request, reply) => {
     return reply(id)
   })
 }
-
diff --git a/src/http-api/resources/version.js b/src/http-api/resources/version.js
@@ -11,4 +11,3 @@ exports.get = (request, reply) => {
     return reply(version)
   })
 }
-
diff --git a/src/ipfs-core/index.js b/src/ipfs-core/index.js
@@ -110,4 +110,18 @@ function IPFS () {
       })
     }
   }
+
+  this.config = {
+    // cli only feature built with show and replace
+    // edit: (callback) => {},
+    replace: (config, callback) => {
+      repo.config.set(config, callback)
+    },
+    show: callback => {
+      repo.config.get((err, config) => {
+        if (err) { return callback(err) }
+        callback(null, config)
+      })
+    }
+  }
 }
diff --git a/tests/test-api/test-id.js b/tests/test-api/test-id.js
@@ -13,10 +13,9 @@ describe('id', function () {
     }, res => {
       expect(res.result).to.deep.equal({ ID: 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A',
         PublicKey: '',
-        Addresses:
-         { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],
-           API: '/ip4/127.0.0.1/tcp/5001',
-           Gateway: '/ip4/127.0.0.1/tcp/8080' },
+        Addresses: { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],
+          API: '/ip4/127.0.0.1/tcp/5001',
+        Gateway: '/ip4/127.0.0.1/tcp/8080' },
         AgentVersion: 'js-ipfs',
         ProtocolVersion: '9000'
       })
diff --git a/tests/test-cli-offline/test-bootstrap.js b/tests/test-cli-offline/test-bootstrap.js
@@ -33,43 +33,43 @@ describe('bootstrap', () => {
 
   it('list the bootstrap nodes', done => {
     nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
-     .run((err, stdout, exitcode) => {
-       expect(stdout).to.deep.equal(defaultList)
-       expect(err).to.not.exist
-       expect(exitcode).to.equal(0)
-       done()
-     })
+      .run((err, stdout, exitcode) => {
+        expect(stdout).to.deep.equal(defaultList)
+        expect(err).to.not.exist
+        expect(exitcode).to.equal(0)
+        done()
+      })
   })
 
   it('add another bootstrap node', done => {
     nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'add', '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'])
-     .run((err, stdout, exitcode) => {
-       expect(err).to.not.exist
-       expect(exitcode).to.equal(0)
+      .run((err, stdout, exitcode) => {
+        expect(err).to.not.exist
+        expect(exitcode).to.equal(0)
 
-       nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
-        .run((err, stdout, exitcode) => {
-          expect(stdout).to.deep.equal(updatedList)
-          expect(err).to.not.exist
-          expect(exitcode).to.equal(0)
-          done()
-        })
-     })
+        nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
+          .run((err, stdout, exitcode) => {
+            expect(stdout).to.deep.equal(updatedList)
+            expect(err).to.not.exist
+            expect(exitcode).to.equal(0)
+            done()
+          })
+      })
   })
 
   it('rm a bootstrap node', done => {
     nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'rm', '/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT'])
-     .run((err, stdout, exitcode) => {
-       expect(err).to.not.exist
-       expect(exitcode).to.equal(0)
+      .run((err, stdout, exitcode) => {
+        expect(err).to.not.exist
+        expect(exitcode).to.equal(0)
 
-       nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
-        .run((err, stdout, exitcode) => {
-          expect(stdout).to.deep.equal(defaultList)
-          expect(err).to.not.exist
-          expect(exitcode).to.equal(0)
-          done()
-        })
-     })
+        nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'bootstrap', 'list'])
+          .run((err, stdout, exitcode) => {
+            expect(stdout).to.deep.equal(defaultList)
+            expect(err).to.not.exist
+            expect(exitcode).to.equal(0)
+            done()
+          })
+      })
   })
 })
diff --git a/tests/test-cli-offline/test-id.js b/tests/test-cli-offline/test-id.js
@@ -8,27 +8,27 @@ const nexpect = require('nexpect')
 describe('id', () => {
   it('get the id', done => {
     nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'id'])
-     .run((err, stdout, exitcode) => {
-       var expected = [ '{ ID: \'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A\',',
-                        '  PublicKey: \'\',',
-                        '  Addresses: ',
-                        '   { Swarm: [ \'/ip4/0.0.0.0/tcp/4001\', \'/ip6/::/tcp/4001\' ],',
-                        '     API: \'/ip4/127.0.0.1/tcp/5001\',',
-                        '     Gateway: \'/ip4/127.0.0.1/tcp/8080\' },',
-                        '  AgentVersion: \'js-ipfs\',',
-                        '  ProtocolVersion: \'9000\' }' ]
+      .run((err, stdout, exitcode) => {
+        var expected = [ "{ ID: 'QmQ2zigjQikYnyYUSXZydNXrDRhBut2mubwJBaLXobMt3A',",
+          "  PublicKey: '',",
+          '  Addresses: ',
+          "   { Swarm: [ '/ip4/0.0.0.0/tcp/4001', '/ip6/::/tcp/4001' ],",
+          "     API: '/ip4/127.0.0.1/tcp/5001',",
+          "     Gateway: '/ip4/127.0.0.1/tcp/8080' },",
+          "  AgentVersion: 'js-ipfs',",
+          "  ProtocolVersion: '9000' }" ]
 
-       expect(stdout[0]).to.equal(expected[0])
-       expect(stdout[1]).to.equal(expected[1])
-       expect(stdout[2]).to.equal(expected[2])
-       expect(stdout[3]).to.equal(expected[3])
-       expect(stdout[4]).to.equal(expected[4])
-       expect(stdout[5]).to.equal(expected[5])
-       expect(stdout[6]).to.equal(expected[6])
-       expect(stdout[7]).to.equal(expected[7])
-       expect(err).to.not.exist
-       expect(exitcode).to.equal(0)
-       done()
-     })
+        expect(stdout[0]).to.equal(expected[0])
+        expect(stdout[1]).to.equal(expected[1])
+        expect(stdout[2]).to.equal(expected[2])
+        expect(stdout[3]).to.equal(expected[3])
+        expect(stdout[4]).to.equal(expected[4])
+        expect(stdout[5]).to.equal(expected[5])
+        expect(stdout[6]).to.equal(expected[6])
+        expect(stdout[7]).to.equal(expected[7])
+        expect(err).to.not.exist
+        expect(exitcode).to.equal(0)
+        done()
+      })
   })
 })
diff --git a/tests/test-cli-offline/test-version.js b/tests/test-cli-offline/test-version.js
@@ -8,11 +8,11 @@ const nexpect = require('nexpect')
 describe('version', () => {
   it('get the version', done => {
     nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'version'])
-     .expect('0.4.0-dev')
-     .run((err, stdout, exitcode) => {
-       expect(err).to.not.exist
-       expect(exitcode).to.equal(0)
-       done()
-     })
+      .expect('0.4.0-dev')
+      .run((err, stdout, exitcode) => {
+        expect(err).to.not.exist
+        expect(exitcode).to.equal(0)
+        done()
+      })
   })
 })
diff --git a/tests/test-cli/test-id.js b/tests/test-cli/test-id.js
diff --git a/tests/test-cli/test-version.js b/tests/test-cli/test-version.js
diff --git a/tests/test-core/test-config.js b/tests/test-core/test-config.js
diff --git a/tests/test-core/test-id.js b/tests/test-core/test-id.js
