Merge pull request #482 from ipfs/fix-online-cat

fix(cli): pipe content to the cli from cat it is a stream

Author: daviddias

package.json

@@ -68,7 +68,7 @@
     "detect-node": "^2.0.3",
     "glob": "^7.0.6",
     "hapi": "^15.0.3",
-    "ipfs-api": "^8.0.3",
+    "ipfs-api": "^8.0.4",
     "ipfs-bitswap": "^0.7.0",
     "ipfs-block": "^0.3.0",
     "ipfs-block-service": "^0.5.0",
@@ -132,4 +132,4 @@
     "nginnever <[email protected]>",
     "npmcdn-to-unpkg-bot <[email protected]>"
   ]
-}
+}

src/cli/commands/files/add.js

@@ -55,11 +55,17 @@ module.exports = {
     const index = inPath.lastIndexOf('/') + 1
 
     utils.getIPFS((err, ipfs) => {
-      if (err) throw err
+      if (err) {
+        throw err
+      }
 
       glob(path.join(inPath, '/**/*'), (err, list) => {
-        if (err) throw err
-        if (list.length === 0) list = [inPath]
+        if (err) {
+          throw err
+        }
+        if (list.length === 0) {
+          list = [inPath]
+        }
 
         pull(
           zip(

src/cli/commands/files/cat.js

@@ -18,21 +18,15 @@ module.exports = {
       if (err) {
         throw err
       }
-      if (utils.isDaemonOn()) {
-        ipfs.cat(path, (err, res) => {
-          if (err) {
-            throw err
-          }
-          console.log(res.toString())
-        })
-        return
-      }
-      ipfs.files.cat(path, (err, file) => {
-        if (err) {
-          throw (err)
-        }
-        file.pipe(process.stdout)
-      })
+
+      ipfs.files.cat(path, onFile)
     })
   }
 }
+
+function onFile (err, file) {
+  if (err) {
+    throw (err)
+  }
+  file.pipe(process.stdout)
+}

test/cli/test-files.js

@@ -80,6 +80,7 @@ describe('files', () => {
         .run((err, stdout, exitcode) => {
           expect(err).to.not.exist
           expect(exitcode).to.equal(0)
+          expect(stdout[0]).to.equal('hello world')
           done()
         })
     })