Index: sdk/lib/_internal/pub_generated/test/serve_packages.dart |
diff --git a/sdk/lib/_internal/pub/test/serve_packages.dart b/sdk/lib/_internal/pub_generated/test/serve_packages.dart |
similarity index 79% |
copy from sdk/lib/_internal/pub/test/serve_packages.dart |
copy to sdk/lib/_internal/pub_generated/test/serve_packages.dart |
index 35c970f78cac4955bdd506f57b8b4809fb8fddc4..2fad96dded98a5c2277e9297b17f6c8a1b46167b 100644 |
--- a/sdk/lib/_internal/pub/test/serve_packages.dart |
+++ b/sdk/lib/_internal/pub_generated/test/serve_packages.dart |
@@ -48,16 +48,13 @@ PackageServerBuilder _builder; |
/// If [replace] is false, subsequent calls to [servePackages] will add to the |
/// set of packages that are being served. Previous packages will continue to be |
/// served. Otherwise, the previous packages will no longer be served. |
-void servePackages(void callback(PackageServerBuilder builder), |
- {bool replace: false}) { |
+void servePackages(void callback(PackageServerBuilder builder), {bool replace: |
+ false}) { |
if (_servedPackageDir == null) { |
_builder = new PackageServerBuilder(); |
_servedApiPackageDir = d.dir('packages', []); |
_servedPackageDir = d.dir('packages', []); |
- serve([ |
- d.dir('api', [_servedApiPackageDir]), |
- _servedPackageDir |
- ]); |
+ serve([d.dir('api', [_servedApiPackageDir]), _servedPackageDir]); |
currentSchedule.onComplete.schedule(() { |
_builder = null; |
@@ -73,25 +70,25 @@ void servePackages(void callback(PackageServerBuilder builder), |
_servedApiPackageDir.contents.clear(); |
_servedPackageDir.contents.clear(); |
_builder._packages.forEach((name, versions) { |
- _servedApiPackageDir.contents.addAll([ |
- d.file('$name', JSON.encode({ |
+ _servedApiPackageDir.contents.addAll([d.file('$name', JSON.encode({ |
'name': name, |
'uploaders': ['nweiz@google.com'], |
- 'versions': versions.map((version) => |
- packageVersionApiMap(version.pubspec)).toList() |
- })), |
- d.dir(name, [ |
- d.dir('versions', versions.map((version) { |
- return d.file(version.version.toString(), JSON.encode( |
- packageVersionApiMap(version.pubspec, full: true))); |
- })) |
- ]) |
- ]); |
- |
- _servedPackageDir.contents.add(d.dir(name, [ |
- d.dir('versions', versions.map((version) => |
- d.tar('${version.version}.tar.gz', version.contents))) |
- ])); |
+ 'versions': versions.map( |
+ (version) => packageVersionApiMap(version.pubspec)).toList() |
+ })), d.dir(name, [d.dir('versions', versions.map((version) { |
+ return d.file( |
+ version.version.toString(), |
+ JSON.encode(packageVersionApiMap(version.pubspec, full: true))); |
+ }))])]); |
+ |
+ _servedPackageDir.contents.add( |
+ d.dir( |
+ name, |
+ [ |
+ d.dir( |
+ 'versions', |
+ versions.map( |
+ (version) => d.tar('${version.version}.tar.gz', version.contents)))])); |
}); |
}); |
}, 'initializing the package server'); |
@@ -123,10 +120,8 @@ class PackageServerBuilder { |
/// default, a package just contains a dummy lib directory. |
void serve(String name, String version, {Map deps, Map pubspec, |
Iterable<d.Descriptor> contents}) { |
- _futures.add(Future.wait([ |
- awaitObject(deps), |
- awaitObject(pubspec) |
- ]).then((pair) { |
+ _futures.add( |
+ Future.wait([awaitObject(deps), awaitObject(pubspec)]).then((pair) { |
var resolvedDeps = pair.first; |
var resolvedPubspec = pair.last; |
@@ -138,8 +133,8 @@ class PackageServerBuilder { |
if (resolvedDeps != null) pubspecFields["dependencies"] = resolvedDeps; |
if (contents == null) contents = [d.libDir(name, "$name $version")]; |
- contents = [d.file("pubspec.yaml", yaml(pubspecFields))] |
- ..addAll(contents); |
+ contents = |
+ [d.file("pubspec.yaml", yaml(pubspecFields))]..addAll(contents); |
var packages = _packages.putIfAbsent(name, () => []); |
packages.add(new _ServedPackage(pubspecFields, contents)); |
@@ -154,17 +149,19 @@ class PackageServerBuilder { |
_packages[name] = []; |
var root = packagePath(name); |
- var pubspec = new Map.from(loadYaml( |
- readTextFile(p.join(root, 'pubspec.yaml')))); |
+ var pubspec = |
+ new Map.from(loadYaml(readTextFile(p.join(root, 'pubspec.yaml')))); |
// Remove any SDK constraints since we don't have a valid SDK version |
// while testing. |
pubspec.remove('environment'); |
- _packages[name].add(new _ServedPackage(pubspec, [ |
- d.file('pubspec.yaml', yaml(pubspec)), |
- new d.DirectoryDescriptor.fromFilesystem('lib', p.join(root, 'lib')) |
- ])); |
+ _packages[name].add( |
+ new _ServedPackage( |
+ pubspec, |
+ [ |
+ d.file('pubspec.yaml', yaml(pubspec)), |
+ new d.DirectoryDescriptor.fromFilesystem('lib', p.join(root, 'lib'))])); |
if (pubspec.containsKey('dependencies')) { |
pubspec['dependencies'].keys.forEach(_addPackage); |