Remove redundant PubSummary.lockedVersion (dart-lang#28)

Remove redundant PubSummary.lockedVersion
But keep the logic around to validate the pub output parsing

Author: kevmoo

lib/pana.dart

@@ -79,8 +79,18 @@ class PackageAnalyzer {
 
     PubSummary summary;
     if (upgrade.exitCode == 0) {
-      summary = PubSummary.create(upgrade.stdout, path: pkgDir);
-      log.info("Package version: ${summary.pkgVersion}");
+      try {
+        summary = PubSummary.create(upgrade.stdout, path: pkgDir);
+      } catch (e, stack) {
+        log.severe("Problem summarizing package", e, stack);
+        //(TODO)kevmoo - should add a helper that handles logging exceptions
+        //  and writing to issues in one go.
+        issues.add(new AnalyzerIssue(
+            AnalyzerScopes.pubspec, "Problem summarizing package: $e"));
+      }
+      if (summary != null) {
+        log.info("Package version: ${summary.pkgVersion}");
+      }
     } else {
       String message;
       if (upgrade.exitCode > 0) {

lib/src/pub_summary.dart

@@ -13,15 +13,13 @@ import 'utils.dart';
 
 class PubSummary {
   static final _solvePkgLine = new RegExp(
-      r"(?:[><\+ ]) (\w+) (\S+)(?: \((\S+) available\))?(?: from .+)?");
+      r"(?:[><\+\! ]) (\w+) (\S+)(?: \((\S+) available\))?(?: from .+)?");
 
   final Map<String, Version> packageVersions;
   final Map<String, Version> availableVersions;
-  final Map<String, Version> lockedVersions;
   final Map<String, Object> pubspec;
 
-  PubSummary._(this.packageVersions, this.availableVersions,
-      this.lockedVersions, this.pubspec);
+  PubSummary._(this.packageVersions, this.availableVersions, this.pubspec);
 
   static PubSummary create(String procStdout, {String path}) {
     var pkgVersions = <String, Version>{};
@@ -53,7 +51,6 @@ class PubSummary {
       // it's empty – which is fine for a package with no dependencies
     }
 
-    Map<String, Version> lockedVersions;
     Map<String, Object> pubspecContent;
 
     if (path != null) {
@@ -66,26 +63,42 @@ class PubSummary {
           Map lockMap = yamlToJson(lockFileContent);
           Map pkgs = lockMap['packages'];
           if (pkgs != null) {
-            lockedVersions = {};
+            var expectedPackages = pkgVersions.keys.toSet();
+
             pkgs.forEach((String key, Map m) {
-              lockedVersions[key] = new Version.parse(m['version']);
+              if (!expectedPackages.remove(key)) {
+                throw new StateError(
+                    "Did not parse package `$key` from pub output, "
+                    "but it was found in `pubspec.lock`.");
+              }
+
+              var lockedVersion = new Version.parse(m['version']);
+              if (pkgVersions[key] != lockedVersion) {
+                throw new StateError(
+                    "For $key, the parsed version ${pkgVersions[key]} did not "
+                    "match the locked version $lockedVersion.");
+              }
             });
+
+            if (expectedPackages.isNotEmpty) {
+              throw new StateError(
+                  "We parsed more packaged than were found in the lock file: "
+                  "${expectedPackages.join(', ')}");
+            }
           }
         }
       }
     }
 
-    return new PubSummary._(
-        pkgVersions, availVersions, lockedVersions, pubspecContent);
+    return new PubSummary._(pkgVersions, availVersions, pubspecContent);
   }
 
   factory PubSummary.fromJson(Map<String, dynamic> json) {
     var packageVersions = _jsonMapToVersion(json['packages']);
     var availableVersions = _jsonMapToVersion(json['availablePackages']);
-    var lockedVersions = _jsonMapToVersion(json['lockedVersions']);
 
-    return new PubSummary._(packageVersions, availableVersions, lockedVersions,
-        json['pubspecContent']);
+    return new PubSummary._(
+        packageVersions, availableVersions, json['pubspecContent']);
   }
 
   Map<String, int> getStats() {
@@ -190,7 +203,6 @@ class PubSummary {
   Map<String, dynamic> toJson() => <String, dynamic>{
         'pubspecContent': pubspec,
         'packages': _versionMapToJson(packageVersions),
-        'lockedVersions': _versionMapToJson(lockedVersions),
         'availablePackages': _versionMapToJson(availableVersions),
       };
 

test/end2end/http_data.dart

@@ -37,18 +37,6 @@ final data = {
       "typed_data": "1.1.3",
       "unittest": "0.11.7"
     },
-    "lockedVersions": {
-      "async": "1.13.3",
-      "charcode": "1.1.1",
-      "collection": "1.14.1",
-      "http_parser": "3.1.1",
-      "path": startsWith("1.4."),
-      "source_span": "1.4.0",
-      "stack_trace": "1.7.3",
-      "string_scanner": "1.0.2",
-      "typed_data": "1.1.3",
-      "unittest": "0.11.7"
-    },
     "availablePackages": {"unittest": "0.12.4+1"}
   },
   "dartFiles": {

test/end2end/pub_server_data.dart

@@ -59,55 +59,6 @@ final data = {
       "yaml": "2.1.12"
     },
     "availablePackages": {},
-    "lockedVersions": {
-      "analyzer": "0.30.0+2",
-      "archive": "1.0.29",
-      "args": "0.13.7",
-      "async": "1.13.3",
-      "barback": "0.15.2+11",
-      "boolean_selector": "1.0.2",
-      "charcode": "1.1.1",
-      "cli_util": "0.1.1",
-      "collection": "1.14.1",
-      "convert": "2.0.1",
-      "crypto": "2.0.1",
-      "csslib": "0.14.0",
-      "front_end": "0.1.0-alpha.4",
-      "glob": "1.1.3",
-      "html": "0.13.2",
-      "http": "0.11.3+13",
-      "http_multi_server": "2.0.3",
-      "http_parser": "3.1.1",
-      "isolate": "1.0.0",
-      "kernel": "0.3.0-alpha.1",
-      "logging": "0.11.3+1",
-      "matcher": "0.12.1+1",
-      "meta": "1.0.5",
-      "mime": "0.9.3",
-      "package_config": "1.0.1",
-      "package_resolver": "1.0.2",
-      "path": startsWith("1.4."),
-      "plugin": "0.2.0",
-      "pool": "1.3.1",
-      "pub_semver": "1.3.2",
-      "shelf": "0.6.7+2",
-      "shelf_packages_handler": "1.0.0",
-      "shelf_static": "0.2.4",
-      "shelf_web_socket": "0.2.1",
-      "source_map_stack_trace": "1.1.4",
-      "source_maps": "0.10.4",
-      "source_span": "1.4.0",
-      "stack_trace": "1.7.3",
-      "stream_channel": "1.6.1",
-      "string_scanner": "1.0.2",
-      "term_glyph": "1.0.0",
-      "test": startsWith("0.12."),
-      "typed_data": "1.1.3",
-      "utf": "0.9.0+3",
-      "watcher": "0.9.7+3",
-      "web_socket_channel": "1.0.4",
-      "yaml": "2.1.12"
-    },
     "pubspecContent": {
       "author": "Dart Team <[email protected]>",
       "dependencies": {