Properly handle Git URLs with trailing slashes.

BUG=3493

Review URL: https://chromiumcodereview.appspot.com//10875056

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@11343 260f80e4-7a28-3924-810f-c04153c831b5

Author: nex3

utils/pub/git_source.dart

@@ -64,8 +64,10 @@ class GitSource extends Source {
    * The package name of a Git repo is the name of the directory into which
    * it'll be cloned.
    */
-  String packageName(description) =>
-    basename(_getUrl(description)).replaceFirst(const RegExp("\.git\$"), "");
+  String packageName(description) {
+    return basename(_getUrl(description)
+        .replaceFirst(const RegExp(@"(\.git)?/?$"), ""));
+  }
 
   /**
    * Ensures [description] is a Git URL.

utils/pub/pubspec.dart

@@ -110,6 +110,13 @@ class Pubspec {
 
         source.validateDescription(description, fromLockFile: false);
 
+        var nameFromSource = source.packageName(description);
+        if (nameFromSource != name) {
+          throw new FormatException('The name you specified for your '
+              'dependency, "$name", doesn\'t match the name "$nameFromSource" '
+              '(from "$description").');
+        }
+
         dependencies.add(new PackageRef(
             source, versionConstraint, description));
       });

utils/tests/pub/pub_install_git_test.dart

@@ -78,6 +78,32 @@ main() {
     run();
   });
 
+  test('requires the repository name to match the name in the pubspec', () {
+    ensureGit();
+
+    git('foo.git', [
+      file('foo.dart', 'main() => "foo";')
+    ]).scheduleCreate();
+
+    dir(appPath, [
+      pubspec({
+        "name": "myapp",
+        "dependencies": {
+          "weird-name": {"git": "../foo.git"}
+        }
+      })
+    ]).scheduleCreate();
+
+    // TODO(nweiz): clean up this RegExp when either issue 4706 or 4707 is
+    // fixed.
+    schedulePub(args: ['install'],
+        error: const RegExp(@'^FormatException: The name you specified for '
+            @'your dependency, "weird-name", doesn' @"'" @'t match the name '
+            @'"foo" \(from "\.\./foo\.git"\)\.'));
+
+    run();
+  });
+
   test('checks out and updates a package from Git', () {
     ensureGit();
 
@@ -310,4 +336,34 @@ main() {
 
     run();
   });
+
+  group("(regression)", () {
+    test('checks out a package from Git with a trailing slash', () {
+      ensureGit();
+
+      git('foo.git', [
+        file('foo.dart', 'main() => "foo";')
+      ]).scheduleCreate();
+
+      appDir([{"git": "../foo.git/"}]).scheduleCreate();
+
+      schedulePub(args: ['install'],
+          output: const RegExp(@"Dependencies installed!$"));
+
+      dir(cachePath, [
+        dir('git', [
+          dir('cache', [gitPackageCacheDir('foo')]),
+          gitPackageCacheDir('foo')
+        ])
+      ]).scheduleValidate();
+
+      dir(packagesPath, [
+        dir('foo', [
+          file('foo.dart', 'main() => "foo";')
+        ])
+      ]).scheduleValidate();
+
+      run();
+    });
+  });
 }