Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(287)

Side by Side Diff: utils/pub/command_uploader.dart

Issue 12042053: Get rid of unneeded Future.immediate() calls. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | utils/pub/entrypoint.dart » ('j') | utils/pub/entrypoint.dart » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library command_uploader; 5 library command_uploader;
6 6
7 import 'dart:async'; 7 import 'dart:async';
8 import 'dart:io'; 8 import 'dart:io';
9 import 'dart:uri'; 9 import 'dart:uri';
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 this.printUsage(); 53 this.printUsage();
54 exit(exit_codes.USAGE); 54 exit(exit_codes.USAGE);
55 } else if (commandOptions.rest.isEmpty) { 55 } else if (commandOptions.rest.isEmpty) {
56 log.error('No uploader given for "pub uploader $command".'); 56 log.error('No uploader given for "pub uploader $command".');
57 this.printUsage(); 57 this.printUsage();
58 exit(exit_codes.USAGE); 58 exit(exit_codes.USAGE);
59 } 59 }
60 60
61 return new Future.immediate(null).then((_) { 61 return new Future.immediate(null).then((_) {
62 var package = commandOptions['package']; 62 var package = commandOptions['package'];
63 if (package != null) return new Future.immediate(package); 63 if (package != null) return package;
64 return Entrypoint.load(path.current, cache) 64 return Entrypoint.load(path.current, cache)
65 .then((entrypoint) => entrypoint.root.name); 65 .then((entrypoint) => entrypoint.root.name);
66 }).then((package) { 66 }).then((package) {
67 var uploader = commandOptions.rest[0]; 67 var uploader = commandOptions.rest[0];
68 return oauth2.withClient(cache, (client) { 68 return oauth2.withClient(cache, (client) {
69 if (command == 'add') { 69 if (command == 'add') {
70 var url = server.resolve("/packages/${encodeUriComponent(package)}" 70 var url = server.resolve("/packages/${encodeUriComponent(package)}"
71 "/uploaders.json"); 71 "/uploaders.json");
72 return client.post(url, fields: {"email": uploader}); 72 return client.post(url, fields: {"email": uploader});
73 } else { // command == 'remove' 73 } else { // command == 'remove'
74 var url = server.resolve("/packages/${encodeUriComponent(package)}" 74 var url = server.resolve("/packages/${encodeUriComponent(package)}"
75 "/uploaders/${encodeUriComponent(uploader)}.json"); 75 "/uploaders/${encodeUriComponent(uploader)}.json");
76 return client.delete(url); 76 return client.delete(url);
77 } 77 }
78 }); 78 });
79 }).then(handleJsonSuccess).catchError((asyncError) { 79 }).then(handleJsonSuccess).catchError((asyncError) {
80 if (asyncError.error is! PubHttpException) throw asyncError; 80 if (asyncError.error is! PubHttpException) throw asyncError;
81 handleJsonError(asyncError.error.response); 81 handleJsonError(asyncError.error.response);
82 }); 82 });
83 } 83 }
84 } 84 }
OLDNEW
« no previous file with comments | « no previous file | utils/pub/entrypoint.dart » ('j') | utils/pub/entrypoint.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698