Update 'files' and 'util' command paths.

Author: hackergrrl

src/load-commands.js

@@ -1,10 +1,7 @@
 'use strict'
 
 function requireCommands () {
-  return {
-    add: require('./api/add'),
-    addFiles: require('./api/add-files'),
-    addUrl: require('./api/add-url'),
+  var cmds = {
     bitswap: require('./api/bitswap'),
     block: require('./api/block'),
     cat: require('./api/cat'),
@@ -13,7 +10,6 @@ function requireCommands () {
     dht: require('./api/dht'),
     diag: require('./api/diag'),
     id: require('./api/id'),
-    files: require('./api/files'),
     log: require('./api/log'),
     ls: require('./api/ls'),
     mount: require('./api/mount'),
@@ -26,6 +22,24 @@ function requireCommands () {
     update: require('./api/update'),
     version: require('./api/version')
   }
+
+  // TODO: crowding the 'files' namespace temporarily for interface-ipfs-core
+  // compatibility, until 'files vs mfs' naming decision is resolved.
+  cmds.files = function (send) {
+    var files = require('./api/files')(send)
+    files.add = require('./api/add')(send)
+    return files
+  }
+
+  cmds.util = function (send) {
+    var util = {
+      addFiles: require('./api/add-files')(send),
+      addUrl: require('./api/add-url')(send)
+    }
+    return util
+  }
+
+  return cmds
 }
 
 function loadCommands (send) {

test/api/add.spec.js

@@ -23,7 +23,7 @@ describe('.add', () => {
       content: new Buffer(testfile)
     }
 
-    apiClients.a.add([file], (err, res) => {
+    apiClients.a.files.add([file], (err, res) => {
       expect(err).to.not.exist
 
       const added = res[0] != null ? res[0] : res
@@ -36,7 +36,7 @@ describe('.add', () => {
 
   it('add buffer', (done) => {
     let buf = new Buffer(testfile)
-    apiClients.a.add(buf, (err, res) => {
+    apiClients.a.files.add(buf, (err, res) => {
       expect(err).to.not.exist
 
       expect(res).to.have.length(1)
@@ -52,7 +52,7 @@ describe('.add', () => {
       return done()
     }
 
-    apiClients.a.add(testfileBig, (err, res) => {
+    apiClients.a.files.add(testfileBig, (err, res) => {
       expect(err).to.not.exist
 
       expect(res).to.have.length(1)
@@ -80,7 +80,7 @@ describe('.add', () => {
   })
 
   it('local fs: add nested dir (follow symlinks)', (done) => {
-    apiClients.a.addFiles(path.join(__dirname, '/../test-folder'), { recursive: true }, (err, res) => {
+    apiClients.a.util.addFiles(path.join(__dirname, '/../test-folder'), { recursive: true }, (err, res) => {
       if (isNode) {
         expect(err).to.not.exist
 
@@ -98,7 +98,7 @@ describe('.add', () => {
   })
 
   it('local fs: add nested dir (don\'t follow symlinks)', (done) => {
-    apiClients.a.addFiles(path.join(__dirname, '/../test-folder'), { recursive: true, followSymlinks: false }, (err, res) => {
+    apiClients.a.util.addFiles(path.join(__dirname, '/../test-folder'), { recursive: true, followSymlinks: false }, (err, res) => {
       if (isNode) {
         expect(err).to.not.exist
 
@@ -138,7 +138,7 @@ describe('.add', () => {
       }
     ]
 
-    apiClients.a.add(dirs, { recursive: true }, (err, res) => {
+    apiClients.a.files.add(dirs, { recursive: true }, (err, res) => {
       expect(err).to.not.exist
 
       const added = res[res.length - 1]
@@ -154,7 +154,7 @@ describe('.add', () => {
     stream.push('Hello world')
     stream.push(null)
 
-    apiClients.a.add(stream, (err, res) => {
+    apiClients.a.files.add(stream, (err, res) => {
       expect(err).to.not.exist
 
       const added = res[0] != null ? res[0] : res
@@ -167,7 +167,7 @@ describe('.add', () => {
 
   it('add url', (done) => {
     const url = 'https://raw.githubusercontent.com/ipfs/js-ipfs-api/2a9cc63d7427353f2145af6b1a768a69e67c0588/README.md'
-    apiClients.a.addUrl(url, (err, res) => {
+    apiClients.a.util.addUrl(url, (err, res) => {
       expect(err).to.not.exist
 
       const added = res[0] != null ? res[0] : res
@@ -181,7 +181,7 @@ describe('.add', () => {
   describe('promise', () => {
     it('add buffer', () => {
       let buf = new Buffer(testfile)
-      return apiClients.a.add(buf)
+      return apiClients.a.files.add(buf)
         .then((res) => {
           const added = res[0] != null ? res[0] : res
           const mh = bs58.encode(added.multihash()).toString()