Use pub_server package

R=sgjesse@google.com

Review URL: https://codereview.chromium.org/917793002

Dockerfile

@@ -4,8 +4,8 @@ WORKDIR /project/app
 
 ADD app.yaml /project/
 ADD app/pubspec.* /project/app/
-ADD pkg/pubserver/pubspec.* /project/pkg/pubserver/
 ADD pkg/mustache/pubspec.* /project/pkg/mustache/
+ADD pkg/pub_server/pubspec.* /project/pkg/pub_server/
 ADD key.json /project/key.json
 
 RUN pub get

app/bin/server_common.dart

@@ -18,7 +18,7 @@ import 'package:logging/logging.dart';
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf/shelf_io.dart' as shelf_io;
 
-import 'package:pubserver/shelf_pubserver.dart';
+import 'package:pub_server/shelf_pubserver.dart';
 
 import 'package:pub_dartlang_org/appengine_repository.dart';
 import 'package:pub_dartlang_org/handlers.dart';

app/lib/appengine_repository.dart

@@ -10,7 +10,7 @@ import 'dart:io';
 import 'package:gcloud/db.dart';
 import 'package:gcloud/storage.dart';
 import 'package:gcloud/service_scope.dart' as ss;
-import 'package:pubserver/repository.dart';
+import 'package:pub_server/repository.dart';
 import 'package:logging/logging.dart';
 import 'package:uuid/uuid.dart';
 

app/lib/upload_signer_service.dart

@@ -14,7 +14,7 @@ import 'package:googleapis_auth/src/crypto/rsa.dart' as rsa;
 
 import 'package:gcloud/db.dart';
 import 'package:gcloud/service_scope.dart' as ss;
-import 'package:pubserver/repository.dart';
+import 'package:pub_server/repository.dart';
 
 import 'models.dart';
 

app/pubspec.lock

@@ -12,7 +12,7 @@ packages:
   args:
     description: args
     source: hosted
-    version: "0.12.2+2"
+    version: "0.12.2+3"
   collection:
     description: collection
     source: hosted
@@ -24,15 +24,15 @@ packages:
   fixnum:
     description: fixnum
     source: hosted
-    version: "0.9.1"
+    version: "0.9.1+2"
   gcloud:
     description: gcloud
     source: hosted
     version: "0.1.3+1"
   googleapis:
     description: googleapis
     source: hosted
-    version: "0.5.4"
+    version: "0.5.5"
   googleapis_auth:
     description: googleapis_auth
     source: hosted
@@ -68,7 +68,7 @@ packages:
   matcher:
     description: matcher
     source: hosted
-    version: "0.11.4"
+    version: "0.11.4+1"
   memcache:
     description: memcache
     source: hosted
@@ -86,22 +86,22 @@ packages:
   path:
     description: path
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   petitparser:
     description: petitparser
     source: hosted
-    version: "1.3.3"
+    version: "1.3.6"
   protobuf:
     description: protobuf
     source: hosted
-    version: "0.3.4"
+    version: "0.3.5+2"
   pub_semver:
     description: pub_semver
     source: hosted
     version: "1.1.0"
-  pubserver:
+  pub_server:
     description:
-      path: "../pkg/pubserver"
+      path: "../pkg/pub_server"
       relative: true
     source: path
     version: "0.1.0"
@@ -112,27 +112,27 @@ packages:
   source_span:
     description: source_span
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   stack_trace:
     description: stack_trace
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   string_scanner:
     description: string_scanner
     source: hosted
     version: "0.1.3"
   unittest:
     description: unittest
     source: hosted
-    version: "0.11.5"
+    version: "0.11.5+2"
   uuid:
     description: uuid
     source: hosted
     version: "0.5.0"
   watcher:
     description: watcher
     source: hosted
-    version: "0.9.3"
+    version: "0.9.4"
   yaml:
     description: yaml
     source: hosted

app/pubspec.yaml

@@ -12,14 +12,15 @@ dependencies:
   logging: '>=0.9.3 <1.0.0'
   markdown: '>=0.7.0 <0.8.0'
   mustache: '>=0.1.8 <0.2.0'
+  pub_server: ">=0.1.0 <0.2.0"
   shelf: '>=0.5.6 <0.6.0'
   uuid: ">=0.5.0 <0.5.1"
 
 dev_dependencies:
   unittest: any
 
 dependency_overrides:
-  pubserver:
-    path: ../pkg/pubserver
   mustache:
     path: ../pkg/mustache
+  pub_server:
+    path: ../pkg/pub_server

codereview.settings

@@ -1,3 +1,3 @@
-CODE_REVIEW_SERVER: https://chromereviews.googleplex.com
+CODE_REVIEW_SERVER: https://codereview.chromium.org
 VIEW_VC: https://github.com/dart-lang/pub-dartlang-dart/commit/
-#CC_LIST: reviews@dartlang.org
+CC_LIST: reviews@dartlang.org

pkg/pub_server/AUTHORS

@@ -0,0 +1,6 @@
+# Below is a list of people and organizations that have contributed
+# to the Dart project. Names should be added to the list like so:
+#
+#   Name/Organization <email address>
+
+Google Inc.

pkg/pub_server/LICENSE

@@ -0,0 +1,24 @@
+Copyright 2014, the Dart project authors. All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

pkg/pub_server/PATENTS

@@ -0,0 +1,23 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Dart Project.
+
+Google hereby grants to you a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this
+section) patent license to make, have made, use, offer to sell, sell,
+import, transfer, and otherwise run, modify and propagate the contents
+of this implementation of Dart, where such license applies only to
+those patent claims, both currently owned by Google and acquired in
+the future, licensable by Google that are necessarily infringed by
+this implementation of Dart. This grant does not include claims that
+would be infringed only as a consequence of further modification of
+this implementation. If you or your agent or exclusive licensee
+institute or order or agree to the institution of patent litigation
+against any entity (including a cross-claim or counterclaim in a
+lawsuit) alleging that this implementation of Dart or any code
+incorporated within this implementation of Dart constitutes direct or
+contributory patent infringement, or inducement of patent
+infringement, then any patent rights granted to you under this License
+for this implementation of Dart shall terminate as of the date such
+litigation is filed.

pkg/pub_server/codereview.settings

@@ -0,0 +1,3 @@
+CODE_REVIEW_SERVER: https://chromereviews.googleplex.com
+VIEW_VC: https://github.com/dart-lang/pub_server/commit/
+CC_LIST: reviews@dartlang.org

pkg/pubserver/lib/repository.dart → pkg/pub_server/lib/repository.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library pubserver.repository;
+library pub_server.repository;
 
 import 'dart:async';
 

pkg/pubserver/lib/shelf_pubserver.dart → pkg/pub_server/lib/shelf_pubserver.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library pubserver.shelf_pubserver;
+library pub_server.shelf_pubserver;
 
 import 'dart:async';
 import 'dart:convert';

pkg/pubserver/pubspec.yaml → pkg/pub_server/pubspec.yaml

@@ -1,7 +1,7 @@
-name: pubserver
+name: pub_server
 version: 0.1.0
 author: Dart Team <misc@dartlang.org>
-description: A package containing interfaces and code for talking to a pub package repository and making a pub package server.
+description: A Dart package containing re-usable components for making a pub package server.
 homepage: https://www.dartlang.org
 
 environment:

pkg/pubserver/test/shelf_pubserver_test.dart → pkg/pub_server/test/shelf_pubserver_test.dart

@@ -2,14 +2,14 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library pubserver.shelf_pubserver_test;
+library pub_server.shelf_pubserver_test;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:shelf/shelf.dart' as shelf;
-import 'package:pubserver/repository.dart';
-import 'package:pubserver/shelf_pubserver.dart';
+import 'package:pub_server/repository.dart';
+import 'package:pub_server/shelf_pubserver.dart';
 import 'package:unittest/unittest.dart';
 
 class RepositoryMock implements PackageRepository {