Replace generic _exec with action specific functions.

cliffano · May 25, 2012 · da398fe · da398fe
1 parent a8d1796
commit da398fe
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/lib/cli.js b/lib/cli.js
@@ -12,10 +12,10 @@ function exec() {
 
   function _exec(command) {
     return function () {
-      new jenkins(url)[command](bag.cli.exit);
+      new jenkins(url)[command](bag.cli.exitCb());
     };
   }
-
+/*
   function _build() {
     var args = Array.prototype.slice.call(_build['arguments']),
       jobs = args.slice(0, args.length - 1);
@@ -24,7 +24,7 @@ function exec() {
       new jenkins(url).build(job);
     });
   }
-
+*/
   function _dashboard() {
     return function () {
       new jenkins(url).dashboard(bag.cli.exitCb(null, function (result) {
@@ -39,14 +39,18 @@ function exec() {
     }; 
   }
 
-  function _job(job) {
-
+  function _version() {
+    return function () {
+      new jenkins(url).version(bag.cli.exitCb(null, function (result) {
+        console.log('Jenkins ver. %s', result);
+      }));
+    };
   }
-
+  
   var commands = {
     build: {
       desc: 'Trigger one or more builds',
-      action: _build
+      action: _exec('build')
     },
     dashboard: {
       desc: 'View status of all jobs',
@@ -62,15 +66,15 @@ function exec() {
     },
     job: {
       desc: 'View job status',
-      action: _job
+      action: _exec('job')
     },
     queue: {
       desc: 'View the build queue',
       action: _exec('queue')
     },
-    version: {
+    ver: {
       desc: 'View Jenkins version number',
-      action: _exec('version')
+      action: _version()
     }
   };