OLD | NEW |
---|---|
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, 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 import 'dart:async'; | 5 import 'dart:async'; |
6 import 'dart:convert'; | 6 import 'dart:convert'; |
7 | 7 |
8 import 'package:path/path.dart' as p; | 8 import 'package:path/path.dart' as p; |
9 import 'package:pub/src/io.dart'; | 9 import 'package:pub/src/io.dart'; |
10 import 'package:pub/src/utils.dart'; | 10 import 'package:pub/src/utils.dart'; |
11 import 'package:pub_semver/pub_semver.dart'; | 11 import 'package:pub_semver/pub_semver.dart'; |
12 import 'package:scheduled_test/scheduled_test.dart'; | 12 import 'package:scheduled_test/scheduled_test.dart'; |
13 import 'package:yaml/yaml.dart'; | 13 import 'package:yaml/yaml.dart'; |
14 | 14 |
15 import 'descriptor.dart' as d; | 15 import 'descriptor.dart' as d; |
16 import 'test_pub.dart'; | 16 import 'test_pub.dart'; |
17 | 17 |
18 /// The [d.DirectoryDescriptor] describing the server layout of `/api/packages` | 18 /// The current global [PackageServer]. |
19 /// on the test server. | 19 PackageServer get globalPackageServer => _globalPackageServer; |
20 /// | 20 PackageServer _globalPackageServer; |
21 /// This contains metadata for packages that are being served via | |
22 /// [servePackages]. It's `null` if [servePackages] has not yet been called for | |
23 /// this test. | |
24 d.DirectoryDescriptor _servedApiPackageDir; | |
25 | 21 |
26 /// The [d.DirectoryDescriptor] describing the server layout of `/packages` on | 22 /// Creates an HTTP server that replicates the structure of pub.dartlang.org and |
27 /// the test server. | 23 /// makes it the current [globalServer]. |
28 /// | |
29 /// This contains the tarballs for packages that are being served via | |
30 /// [servePackages]. It's `null` if [servePackages] has not yet been called for | |
31 /// this test. | |
32 d.DirectoryDescriptor _servedPackageDir; | |
33 | |
34 /// The current [PackageServerBuilder] that a user uses to specify which package | |
35 /// to serve. | |
36 /// | |
37 /// This is preserved over multiple calls to [servePackages] within the same | |
38 /// test so that additional packages can be added. | |
39 PackageServerBuilder _builder; | |
40 | |
41 /// Creates an HTTP server that replicates the structure of pub.dartlang.org. | |
42 /// | 24 /// |
43 /// Calls [callback] with a [PackageServerBuilder] that's used to specify | 25 /// Calls [callback] with a [PackageServerBuilder] that's used to specify |
44 /// which packages to serve. | 26 /// which packages to serve. |
27 void servePackages(void callback(PackageServerBuilder builder)) { | |
28 _globalPackageServer = new PackageServer(callback); | |
29 globalServer = _globalPackageServer._inner; | |
30 | |
31 currentSchedule.onComplete.schedule(() { | |
32 _globalPackageServer = null; | |
33 }, 'clearing the global package server'); | |
34 } | |
35 | |
36 /// Like [servePackages], but instead creates an empty server with no packages | |
37 /// registered. | |
45 /// | 38 /// |
46 /// If [replace] is false, subsequent calls to [servePackages] will add to the | 39 /// This will always replace a previous server. |
47 /// set of packages that are being served. Previous packages will continue to be | 40 void serveNoPackages() => servePackages((_) {}, replace: true); |
48 /// served. Otherwise, the previous packages will no longer be served. | 41 |
49 void servePackages(void callback(PackageServerBuilder builder), | 42 /// A shortcut for [servePackages] that serves the version of barback used by |
50 {bool replace: false}) { | 43 /// pub. |
51 if (_servedPackageDir == null) { | 44 void serveBarback() { |
52 _builder = new PackageServerBuilder(); | 45 servePackages((builder) { |
53 _servedApiPackageDir = d.dir('packages', []); | 46 builder.serveRealPackage('barback'); |
54 _servedPackageDir = d.dir('packages', []); | 47 }); |
55 serve([ | 48 } |
49 | |
50 class PackageServer { | |
51 /// The inner [DescriptorServer] that this uses to serve its descriptors. | |
52 DescriptorServer _inner; | |
53 | |
54 /// The [d.DirectoryDescriptor] describing the server layout of `/api/packages ` | |
Bob Nystrom
2016/02/03 18:40:41
Some long lines here.
nweiz
2016/02/03 20:13:24
Done.
| |
55 /// on the test server. | |
56 /// | |
57 /// This contains metadata for packages that are being served via | |
58 /// [servePackages]. It's `null` if [servePackages] has not yet been called fo r | |
59 /// this test. | |
Bob Nystrom
2016/02/03 18:40:41
This never null now, is it?
nweiz
2016/02/03 20:13:23
Done.
| |
60 final _servedApiPackageDir = d.dir('packages', []); | |
61 | |
62 /// The [d.DirectoryDescriptor] describing the server layout of `/packages` on | |
63 /// the test server. | |
64 /// | |
65 /// This contains the tarballs for packages that are being served via | |
66 /// [servePackages]. It's `null` if [servePackages] has not yet been called fo r | |
67 /// this test. | |
Bob Nystrom
2016/02/03 18:40:41
Or this?
nweiz
2016/02/03 20:13:23
Done.
| |
68 final _servedPackageDir = d.dir('packages', []); | |
69 | |
70 /// The current [PackageServerBuilder] that a user uses to specify which packa ge | |
71 /// to serve. | |
72 /// | |
73 /// This is preserved so that additional packages can be added. | |
74 var _builder = new PackageServerBuilder._(); | |
75 | |
76 /// Creates an HTTP server that replicates the structure of pub.dartlang.org. | |
77 /// | |
78 /// Calls [callback] with a [PackageServerBuilder] that's used to specify | |
79 /// which packages to serve. | |
80 PackageServer(void callback(PackageServerBuilder builder)) { | |
81 _inner = new DescriptorServer([ | |
56 d.dir('api', [_servedApiPackageDir]), | 82 d.dir('api', [_servedApiPackageDir]), |
57 _servedPackageDir | 83 _servedPackageDir |
58 ]); | 84 ]); |
59 | 85 |
60 currentSchedule.onComplete.schedule(() { | 86 add(callback); |
61 _builder = null; | |
62 _servedApiPackageDir = null; | |
63 _servedPackageDir = null; | |
64 }, 'cleaning up served packages'); | |
65 } | 87 } |
66 | 88 |
67 schedule(() { | 89 /// Add to the current set of packages that are being served. |
68 if (replace) _builder = new PackageServerBuilder(); | 90 void add(void callback(PackageServerBuilder builder)) { |
69 callback(_builder); | 91 schedule(() async { |
70 return _builder._await().then((resolvedPubspecs) { | 92 callback(_builder); |
93 | |
94 await _builder._await(); | |
71 _servedApiPackageDir.contents.clear(); | 95 _servedApiPackageDir.contents.clear(); |
72 _servedPackageDir.contents.clear(); | 96 _servedPackageDir.contents.clear(); |
97 | |
73 _builder._packages.forEach((name, versions) { | 98 _builder._packages.forEach((name, versions) { |
74 _servedApiPackageDir.contents.addAll([ | 99 _servedApiPackageDir.contents.addAll([ |
75 d.file('$name', JSON.encode({ | 100 d.file('$name', JSON.encode({ |
76 'name': name, | 101 'name': name, |
77 'uploaders': ['nweiz@google.com'], | 102 'uploaders': ['nweiz@google.com'], |
78 'versions': versions.map((version) => | 103 'versions': versions.map((version) => |
79 packageVersionApiMap(version.pubspec)).toList() | 104 packageVersionApiMap(version.pubspec)).toList() |
80 })), | 105 })), |
81 d.dir(name, [ | 106 d.dir(name, [ |
82 d.dir('versions', versions.map((version) { | 107 d.dir('versions', versions.map((version) { |
83 return d.file(version.version.toString(), JSON.encode( | 108 return d.file(version.version.toString(), JSON.encode( |
84 packageVersionApiMap(version.pubspec, full: true))); | 109 packageVersionApiMap(version.pubspec, full: true))); |
85 })) | 110 })) |
86 ]) | 111 ]) |
87 ]); | 112 ]); |
88 | 113 |
89 _servedPackageDir.contents.add(d.dir(name, [ | 114 _servedPackageDir.contents.add(d.dir(name, [ |
90 d.dir('versions', versions.map((version) => | 115 d.dir('versions', versions.map((version) => |
91 d.tar('${version.version}.tar.gz', version.contents))) | 116 d.tar('${version.version}.tar.gz', version.contents))) |
92 ])); | 117 ])); |
93 }); | 118 }); |
94 }); | 119 }, 'adding packages to the package server'); |
95 }, 'initializing the package server'); | 120 } |
96 } | |
97 | 121 |
98 /// Like [servePackages], but instead creates an empty server with no packages | 122 /// Replace the current set of packages that are being served. |
99 /// registered. | 123 void replace(void callback(PackageServerBuilder builder)) { |
Bob Nystrom
2016/02/03 18:40:41
Maybe "replaceWith"? Right now, it reads like it r
nweiz
2016/02/03 20:13:24
I think this is pretty clear, given that it passes
| |
100 /// | 124 schedule(() => _builder._clear(), "clearing builder"); |
101 /// This will always replace a previous server. | 125 add(callback); |
102 void serveNoPackages() => servePackages((_) {}, replace: true); | 126 } |
103 | |
104 /// A shortcut for [servePackages] that serves the version of barback used by | |
105 /// pub. | |
106 void serveBarback() { | |
107 servePackages((builder) { | |
108 builder.serveRealPackage('barback'); | |
109 }); | |
110 } | 127 } |
111 | 128 |
112 /// A builder for specifying which packages should be served by [servePackages]. | 129 /// A builder for specifying which packages should be served by [servePackages]. |
113 class PackageServerBuilder { | 130 class PackageServerBuilder { |
114 /// A map from package names to a list of concrete packages to serve. | 131 /// A map from package names to a list of concrete packages to serve. |
115 final _packages = new Map<String, List<_ServedPackage>>(); | 132 final _packages = new Map<String, List<_ServedPackage>>(); |
116 | 133 |
117 /// A group of futures from [serve] calls. | 134 /// A group of futures from [serve] calls. |
118 /// | 135 /// |
119 /// This should be accessed by calling [_awair]. | 136 /// This should be accessed by calling [_awair]. |
120 var _futures = new FutureGroup(); | 137 var _futures = new FutureGroup(); |
121 | 138 |
139 PackageServerBuilder._(); | |
140 | |
122 /// Specifies that a package named [name] with [version] should be served. | 141 /// Specifies that a package named [name] with [version] should be served. |
123 /// | 142 /// |
124 /// If [deps] is passed, it's used as the "dependencies" field of the pubspec. | 143 /// If [deps] is passed, it's used as the "dependencies" field of the pubspec. |
125 /// If [pubspec] is passed, it's used as the rest of the pubspec. Either of | 144 /// If [pubspec] is passed, it's used as the rest of the pubspec. Either of |
126 /// these may recursively contain Futures. | 145 /// these may recursively contain Futures. |
127 /// | 146 /// |
128 /// If [contents] is passed, it's used as the contents of the package. By | 147 /// If [contents] is passed, it's used as the contents of the package. By |
129 /// default, a package just contains a dummy lib directory. | 148 /// default, a package just contains a dummy lib directory. |
130 void serve(String name, String version, {Map deps, Map pubspec, | 149 void serve(String name, String version, {Map deps, Map pubspec, |
131 Iterable<d.Descriptor> contents}) { | 150 Iterable<d.Descriptor> contents}) { |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
181 } | 200 } |
182 | 201 |
183 /// Returns a Future that completes once all the [serve] calls have been fully | 202 /// Returns a Future that completes once all the [serve] calls have been fully |
184 /// processed. | 203 /// processed. |
185 Future _await() { | 204 Future _await() { |
186 if (_futures.futures.isEmpty) return new Future.value(); | 205 if (_futures.futures.isEmpty) return new Future.value(); |
187 return _futures.future.then((_) { | 206 return _futures.future.then((_) { |
188 _futures = new FutureGroup(); | 207 _futures = new FutureGroup(); |
189 }); | 208 }); |
190 } | 209 } |
210 | |
211 /// Clears all existing packages from this builder. | |
212 void _clear() { | |
213 _packages.clear(); | |
214 } | |
191 } | 215 } |
192 | 216 |
193 /// A package that's intended to be served. | 217 /// A package that's intended to be served. |
194 class _ServedPackage { | 218 class _ServedPackage { |
195 final Map pubspec; | 219 final Map pubspec; |
196 final List<d.Descriptor> contents; | 220 final List<d.Descriptor> contents; |
197 | 221 |
198 Version get version => new Version.parse(pubspec['version']); | 222 Version get version => new Version.parse(pubspec['version']); |
199 | 223 |
200 _ServedPackage(this.pubspec, this.contents); | 224 _ServedPackage(this.pubspec, this.contents); |
201 } | 225 } |
OLD | NEW |