finish cli refactor

Author: dignifiedquire

package.json

@@ -92,7 +92,6 @@
     "promisify-es6": "^1.0.1",
     "read-pkg-up": "^1.0.1",
     "readable-stream": "1.1.13",
-    "ronin": "^0.3.11",
     "run-parallel": "^1.1.6",
     "run-parallel-limit": "^1.0.3",
     "run-series": "^1.1.4",

src/cli/bin.js

@@ -12,8 +12,10 @@ updateNotifier({
   updateCheckInterval: 1000 * 60 * 60 * 24 * 7 // 1 week
 }).notify()
 
-require('yargs')
+yargs
   .commandDir('commands')
   .demand(1)
   .help()
+  .strict()
+  .completion()
   .argv

src/cli/commands/bitswap/stat.js

@@ -7,10 +7,9 @@ module.exports = {
 
   describe: 'Show some diagnostic information on the bitswap agent.',
 
-  builder: {
-  },
+  builder: {},
 
-  handler: () => {
+  handler () {
     utils.getIPFS((err, ipfs) => {
       if (err) {
         throw err

src/cli/commands/bitswap/unwant.js

@@ -3,17 +3,11 @@
 const utils = require('../../utils')
 
 module.exports = {
-  command: 'unwant',
+  command: 'unwant <key>',
 
   describe: 'Remove a given block from your wantlist.',
 
-  builder: {
-    key: {
-      required: true
-    }
-  },
-
-  handler: (key) => {
+  handler (argv) {
     utils.getIPFS((err, ipfs) => {
       if (err) {
         throw err

src/cli/commands/bitswap/wantlist.js

@@ -8,9 +8,15 @@ module.exports = {
   describe: 'Print out all blocks currently on the bitswap wantlist for the local peer.',
 
   builder: {
+    peer: {
+      alias: 'p',
+      describe: 'Specify which peer to show wantlist for.',
+      type: 'string'
+    }
   },
 
-  handler: () => {
+  handler (argv) {
+    // TODO: handle argv.peer
     utils.getIPFS((err, ipfs) => {
       if (err) {
         throw err

src/cli/commands/block/get.js

@@ -7,25 +7,21 @@ const log = debug('cli:block')
 log.error = debug('cli:block:error')
 
 module.exports = {
-  command: 'get',
+  command: 'get <key>',
 
   describe: 'Get a raw IPFS block',
 
   builder: {},
 
-  handler: (key) => {
-    if (!key) {
-      throw new Error("Argument 'key' is required")
-    }
-
+  handler (argv) {
     utils.getIPFS((err, ipfs) => {
       if (err) {
         throw err
       }
 
       const mh = utils.isDaemonOn()
-        ? key
-        : new Buffer(bs58.decode(key))
+        ? argv.key
+        : new Buffer(bs58.decode(argv.key))
 
       ipfs.block.get(mh, (err, block) => {
         if (err) {

src/cli/commands/block/put.js

@@ -38,15 +38,15 @@ function addBlock (buf) {
 }
 
 module.exports = {
-  command: 'put',
+  command: 'put [data]',
 
   describe: 'Stores input as an IPFS block',
 
   builder: {},
 
-  handler: (filePath) => {
-    if (filePath) {
-      return addBlock(fs.readFileSync(filePath))
+  handler (argv) {
+    if (argv.data) {
+      return addBlock(fs.readFileSync(argv.data))
     }
 
     process.stdin.pipe(bl((err, input) => {

src/cli/commands/block/rm.js

@@ -7,17 +7,13 @@ const log = debug('cli:block')
 log.error = debug('cli:block:error')
 
 module.exports = {
-  command: 'rm',
+  command: 'rm <key>',
 
   describe: 'Remove a raw IPFS block',
 
   builder: {},
 
-  handler: (key) => {
-    if (!key) {
-      throw new Error("Argument 'key' is required")
-    }
-
+  handler (argv) {
     utils.getIPFS((err, ipfs) => {
       if (err) {
         throw err
@@ -28,14 +24,14 @@ module.exports = {
         throw new Error('rm block with daemon running is not yet implemented')
       }
 
-      const mh = new Buffer(bs58.decode(key))
+      const mh = new Buffer(bs58.decode(argv.key))
 
       ipfs.block.del(mh, (err) => {
         if (err) {
           throw err
         }
 
-        console.log('removed', key)
+        console.log('removed', argv.key)
       })
     })
   }

src/cli/commands/block/stat.js

@@ -7,25 +7,21 @@ const log = debug('cli:block')
 log.error = debug('cli:block:error')
 
 module.exports = {
-  command: 'stat',
+  command: 'stat <key>',
 
   describe: 'Print information of a raw IPFS block',
 
   builder: {},
 
-  handler: (key) => {
-    if (!key) {
-      throw new Error("Argument 'key' is required")
-    }
-
+  handler (argv) {
     utils.getIPFS((err, ipfs) => {
       if (err) {
         throw err
       }
 
       const mh = utils.isDaemonOn()
-        ? key
-        : new Buffer(bs58.decode(key))
+        ? argv.key
+        : new Buffer(bs58.decode(argv.key))
 
       ipfs.block.stat(mh, (err, block) => {
         if (err) {

src/cli/commands/bootstrap/add.js

@@ -6,18 +6,18 @@ const utils = require('../../utils')
 log.error = debug('cli:bootstrap:error')
 
 module.exports = {
-  command: 'add',
+  command: 'add <peer>',
 
   describe: 'Add peers to the bootstrap list',
 
   builder: {},
 
-  handler: (multiaddr) => {
+  handler (argv) {
     utils.getIPFS((err, ipfs) => {
       if (err) {
         throw err
       }
-      ipfs.bootstrap.add(multiaddr, (err, list) => {
+      ipfs.bootstrap.add(argv.peer, (err, list) => {
         if (err) {
           throw err
         }