@@ -32,18 +32,17 @@ var storage = gcloud.storage();
3232 * @param {string } name The name of the new bucket.
3333 * @param {function } cb The callback function.
3434 */
35- function createBucketExample ( name , callback ) {
35+ function createBucket ( name , callback ) {
3636 if ( ! name ) {
3737 return callback ( new Error ( '"name" is required!' ) ) ;
3838 }
3939
40- // See https://googlecloudplatform.github.io/gcloud-node/#/docs/storage?method=createBucket
41- storage . createBucket ( name , function ( err , bucket , apiResponse ) {
40+ storage . createBucket ( name , function ( err , bucket ) {
4241 if ( err ) {
4342 return callback ( err ) ;
4443 }
4544
46- console . log ( 'Created bucket: ' + name ) ;
45+ console . log ( 'Created bucket: %s' , name ) ;
4746 return callback ( null , bucket ) ;
4847 } ) ;
4948}
@@ -55,15 +54,14 @@ function createBucketExample (name, callback) {
5554 *
5655 * @param {function } cb The callback function.
5756 */
58- function listBucketsExample ( callback ) {
59- // See https://googlecloudplatform.github.io/gcloud-node/#/docs/storage?method=getBuckets
60- storage . getBuckets ( function ( err , buckets , apiResponse ) {
57+ function listBuckets ( callback ) {
58+ storage . getBuckets ( function ( err , buckets ) {
6159 if ( err ) {
6260 return callback ( err ) ;
6361 }
6462
65- console . log ( 'Found ' + buckets . length + ' buckets!' ) ;
66- return callback ( null , buckets , apiResponse ) ;
63+ console . log ( 'Found %d buckets!' , buckets . length ) ;
64+ return callback ( null , buckets ) ;
6765 } ) ;
6866}
6967// [END list]
@@ -75,21 +73,19 @@ function listBucketsExample (callback) {
7573 * @param {string } name The name of the bucket to delete.
7674 * @param {function } cb The callback function.
7775 */
78- function deleteBucketExample ( name , callback ) {
76+ function deleteBucket ( name , callback ) {
7977 if ( ! name ) {
8078 return callback ( new Error ( '"name" is required!' ) ) ;
8179 }
8280
83- // See https://googlecloudplatform.github.io/gcloud-node/#/docs/storage?method=bucket
8481 var bucket = storage . bucket ( name ) ;
8582
86- // See https://googlecloudplatform.github.io/gcloud-node/#/docs/storage/bucket?method=delete
8783 bucket . delete ( function ( err , apiResponse ) {
8884 if ( err ) {
8985 return callback ( err ) ;
9086 }
9187
92- console . log ( 'Deleted bucket: ' + name ) ;
88+ console . log ( 'Deleted bucket: %s' , name ) ;
9389 return callback ( null , apiResponse ) ;
9490 } ) ;
9591}
@@ -105,28 +101,31 @@ function printUsage () {
105101}
106102// [END usage]
107103
108- // Run the command-line program
109- function main ( args , cb ) {
110- var command = args . shift ( ) ;
111- if ( command === 'create' ) {
112- createBucketExample ( args [ 0 ] , cb ) ;
113- } else if ( command === 'list' ) {
114- listBucketsExample ( cb ) ;
115- } else if ( command === 'delete' ) {
116- deleteBucketExample ( args [ 0 ] , cb ) ;
117- } else {
118- printUsage ( ) ;
119- cb ( ) ;
104+ // The command-line program
105+ var program = {
106+ createBucket : createBucket ,
107+ listBuckets : listBuckets ,
108+ deleteBucket : deleteBucket ,
109+ printUsage : printUsage ,
110+
111+ // Executed when this program is run from the command-line
112+ main : function ( args , cb ) {
113+ var command = args . shift ( ) ;
114+ if ( command === 'create' ) {
115+ this . createBucket ( args [ 0 ] , cb ) ;
116+ } else if ( command === 'list' ) {
117+ this . listBuckets ( cb ) ;
118+ } else if ( command === 'delete' ) {
119+ this . deleteBucket ( args [ 0 ] , cb ) ;
120+ } else {
121+ this . printUsage ( ) ;
122+ }
120123 }
121- }
124+ } ;
122125
123126if ( module === require . main ) {
124- main ( process . argv . slice ( 2 ) , console . log ) ;
127+ program . main ( process . argv . slice ( 2 ) , console . log ) ;
125128}
126129// [END all]
127130
128- exports . createBucketExample = createBucketExample ;
129- exports . listBucketsExample = listBucketsExample ;
130- exports . deleteBucketExample = deleteBucketExample ;
131- exports . printUsage = printUsage ;
132- exports . main = main ;
131+ module . exports = program ;
0 commit comments