Allow the Git source to depend on a specific revision.

utils/tests/pub/pub_test.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // 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('pub_tests');
 
 #import('dart:io');
 
 #import('test_pub.dart');
 #import('../../../lib/unittest/unittest.dart');
@@ skipping 99 matching lines @@
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo";')
       ])
     ]).scheduleValidate();
 
     run();
   });
 
   test('checks out a package from Git', () {
-    withGit(() {
-      git('foo.git', [
-        file('foo.dart', 'main() => "foo";')
-      ]).scheduleCreate();
-
-      dir(appPath, [
-        file('pubspec.yaml', '''
-dependencies:
-  foo:
-    git: ../foo.git
-''')
-      ]).scheduleCreate();
-
-      schedulePub(args: ['install'],
-          output: const RegExp(@"Dependencies installed!$"));
-
-      dir(cachePath, [
-        dir('git', [
-          dir('cache', [
-            dir(new RegExp(@'foo-[a-f0-9]+'), [
-              file('foo.dart', 'main() => "foo";')
-            ])
-          ]),
-          dir(new RegExp(@'foo-[a-f0-9]+'), [
-            file('foo.dart', 'main() => "foo";')
-          ])
-        ])
-      ]).scheduleValidate();
-
-      dir(packagesPath, [
-        dir('foo', [
-          file('foo.dart', 'main() => "foo";')
-        ])
-      ]).scheduleValidate();
-
-      run();
-    });
+    ensureGit();
+
+    git('foo.git', [
+      file('foo.dart', 'main() => "foo";')
+    ]).scheduleCreate();
+
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
+
+    schedulePub(args: ['install'],
+        output: const RegExp(@"Dependencies installed!$"));
+
+    dir(cachePath, [
+      dir('git', [
+        dir('cache', [
+          dir(new RegExp(@'foo-[a-f0-9]+'), [
+            file('foo.dart', 'main() => "foo";')
+          ])
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ])
+      ])
+    ]).scheduleValidate();
+
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo";')
+      ])
+    ]).scheduleValidate();
+
+    run();
   });
 
   test('checks out packages transitively from Git', () {
-    withGit(() {
-      git('foo.git', [
-        file('foo.dart', 'main() => "foo";'),
-        file('pubspec.yaml', '''
+    ensureGit();
+
+    git('foo.git', [
+      file('foo.dart', 'main() => "foo";'),
+      file('pubspec.yaml', '''
 dependencies:
   bar:
     git: ../bar.git
 ''')
-      ]).scheduleCreate();
-
-      git('bar.git', [
-        file('bar.dart', 'main() => "bar";')
-      ]).scheduleCreate();
-
-      dir(appPath, [
-        file('pubspec.yaml', '''
-dependencies:
-  foo:
-    git: ../foo.git
-''')
-      ]).scheduleCreate();
-
-      schedulePub(args: ['install'],
-          output: const RegExp("Dependencies installed!\$"));
-
-      dir(cachePath, [
-        dir('git', [
-          dir('cache', [
-            dir(new RegExp(@'foo-[a-f0-9]+'), [
-              file('foo.dart', 'main() => "foo";')
-            ]),
-            dir(new RegExp(@'bar-[a-f0-9]+'), [
-              file('bar.dart', 'main() => "bar";')
-            ])
-          ]),
+    ]).scheduleCreate();
+
+    git('bar.git', [
+      file('bar.dart', 'main() => "bar";')
+    ]).scheduleCreate();
+
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
+
+    schedulePub(args: ['install'],
+        output: const RegExp("Dependencies installed!\$"));
+
+    dir(cachePath, [
+      dir('git', [
+        dir('cache', [
           dir(new RegExp(@'foo-[a-f0-9]+'), [
             file('foo.dart', 'main() => "foo";')
           ]),
           dir(new RegExp(@'bar-[a-f0-9]+'), [
             file('bar.dart', 'main() => "bar";')
           ])
-        ])
-      ]).scheduleValidate();
-
-      dir(packagesPath, [
-        dir('foo', [
-          file('foo.dart', 'main() => "foo";')
-        ]),
-        dir('bar', [
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ]),
+        dir(new RegExp(@'bar-[a-f0-9]+'), [
           file('bar.dart', 'main() => "bar";')
         ])
-      ]).scheduleValidate();
-
-      run();
-    });
+      ])
+    ]).scheduleValidate();
+
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo";')
+      ]),
+      dir('bar', [
+        file('bar.dart', 'main() => "bar";')
+      ])
+    ]).scheduleValidate();
+
+    run();
   });
 
   test('checks out and updates a package from Git', () {
-    withGit(() {
-      git('foo.git', [
-        file('foo.dart', 'main() => "foo";')
-      ]).scheduleCreate();
-
-      dir(appPath, [
-        file('pubspec.yaml', '''
-dependencies:
-  foo:
-    git: ../foo.git
-''')
-      ]).scheduleCreate();
-
-      schedulePub(args: ['install'],
-          output: const RegExp(@"Dependencies installed!$"));
-
-      dir(cachePath, [
-        dir('git', [
-          dir('cache', [
-            dir(new RegExp(@'foo-[a-f0-9]+'), [
-              file('foo.dart', 'main() => "foo";')
-            ])
-          ]),
-          dir(new RegExp(@'foo-[a-f0-9]+'), [
-            file('foo.dart', 'main() => "foo";')
-          ])
-        ])
-      ]).scheduleValidate();
-
-      dir(packagesPath, [
-        dir('foo', [
-          file('foo.dart', 'main() => "foo";')
-        ])
-      ]).scheduleValidate();
-
-      // TODO(nweiz): remove this once we support pub update
-      dir(packagesPath).scheduleDelete();
-
-      git('foo.git', [
+    ensureGit();
+
+    git('foo.git', [
+      file('foo.dart', 'main() => "foo";')
+    ]).scheduleCreate();
+
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
+
+    schedulePub(args: ['install'],
+        output: const RegExp(@"Dependencies installed!$"));
+
+    dir(cachePath, [
+      dir('git', [
+        dir('cache', [
+          dir(new RegExp(@'foo-[a-f0-9]+'), [
+            file('foo.dart', 'main() => "foo";')
+          ])
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ])
+      ])
+    ]).scheduleValidate();
+
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo";')
+      ])
+    ]).scheduleValidate();
+
+    // TODO(nweiz): remove this once we support pub update
+    dir(packagesPath).scheduleDelete();
+
+    git('foo.git', [
+      file('foo.dart', 'main() => "foo 2";')
+    ]).scheduleCommit();
+
+    schedulePub(args: ['install'],
+        output: const RegExp(@"Dependencies installed!$"));
+
+    // When we download a new version of the git package, we should re-use the
+    // git/cache directory but create a new git/ directory.
+    dir(cachePath, [
+      dir('git', [
+        dir('cache', [
+          dir(new RegExp(@'foo-[a-f0-9]+'), [
+            file('foo.dart', 'main() => "foo 2";')
+          ])
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo 2";')
+        ])
+      ])
+    ]).scheduleValidate();
+
+    dir(packagesPath, [
+      dir('foo', [
         file('foo.dart', 'main() => "foo 2";')
-      ]).scheduleCommit();
-
-      schedulePub(args: ['install'],
-          output: const RegExp(@"Dependencies installed!$"));
-
-      // When we download a new version of the git package, we should re-use the
-      // git/cache directory but create a new git/ directory.
-      dir(cachePath, [
-        dir('git', [
-          dir('cache', [
-            dir(new RegExp(@'foo-[a-f0-9]+'), [
-              file('foo.dart', 'main() => "foo 2";')
-            ])
-          ]),
-          dir(new RegExp(@'foo-[a-f0-9]+'), [
-            file('foo.dart', 'main() => "foo";')
-          ]),
-          dir(new RegExp(@'foo-[a-f0-9]+'), [
-            file('foo.dart', 'main() => "foo 2";')
-          ])
-        ])
-      ]).scheduleValidate();
-
-      dir(packagesPath, [
-        dir('foo', [
-          file('foo.dart', 'main() => "foo 2";')
-        ])
-      ]).scheduleValidate();
-
-      run();
-    });
+      ])
+    ]).scheduleValidate();
+
+    run();
   });
 
   test('checks out a package from Git twice', () {
-    withGit(() {
-      git('foo.git', [
-        file('foo.dart', 'main() => "foo";')
-      ]).scheduleCreate();
-
-      dir(appPath, [
-        file('pubspec.yaml', '''
-dependencies:
-  foo:
-    git: ../foo.git
-''')
-      ]).scheduleCreate();
-
-      schedulePub(args: ['install'],
-          output: const RegExp(@"Dependencies installed!$"));
-
-      dir(cachePath, [
-        dir('git', [
-          dir('cache', [
-            dir(new RegExp(@'foo-[a-f0-9]+'), [
-              file('foo.dart', 'main() => "foo";')
-            ])
-          ]),
-          dir(new RegExp(@'foo-[a-f0-9]+'), [
-            file('foo.dart', 'main() => "foo";')
-          ])
-        ])
-      ]).scheduleValidate();
-
-      dir(packagesPath, [
-        dir('foo', [
-          file('foo.dart', 'main() => "foo";')
-        ])
-      ]).scheduleValidate();
-
-      // TODO(nweiz): remove this once we support pub update
-      dir(packagesPath).scheduleDelete();
-
-      // Verify that nothing breaks if we install a Git revision that's already
-      // in the cache.
-      schedulePub(args: ['install'],
-          output: const RegExp(@"Dependencies installed!$"));
-
-      run();
-    });
+    ensureGit();
+
+    git('foo.git', [
+      file('foo.dart', 'main() => "foo";')
+    ]).scheduleCreate();
+
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
+
+    schedulePub(args: ['install'],
+        output: const RegExp(@"Dependencies installed!$"));
+
+    dir(cachePath, [
+      dir('git', [
+        dir('cache', [
+          dir(new RegExp(@'foo-[a-f0-9]+'), [
+            file('foo.dart', 'main() => "foo";')
+          ])
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ])
+      ])
+    ]).scheduleValidate();
+
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo";')
+      ])
+    ]).scheduleValidate();
+
+    // TODO(nweiz): remove this once we support pub update
+    dir(packagesPath).scheduleDelete();
+
+    // Verify that nothing breaks if we install a Git revision that's already
+    // in the cache.
+    schedulePub(args: ['install'],
+        output: const RegExp(@"Dependencies installed!$"));
+
+    run();
+  });
+
+  test('checks out a package at a specific revision from Git', () {
+    ensureGit();
+
+    var repo = git('foo.git', [
+      file('foo.dart', 'main() => "foo 1";')
+    ]);
+    repo.scheduleCreate();
+    var commitFuture = repo.revParse('HEAD');
+
+    git('foo.git', [
+      file('foo.dart', 'main() => "foo 2";')
+    ]).scheduleCommit();
+
+    dir(appPath, [
+      async(commitFuture.transform((commit) {
+        return file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git:
+      url: ../foo.git
+      ref: $commit
+''');
+      }))
+    ]).scheduleCreate();
+
+    schedulePub(args: ['install'],
+        output: const RegExp(@"Dependencies installed!$"));
+
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo 1";')
+      ])
+    ]).scheduleValidate();
+
+    run();
   });
 
   test('checks out a package from a pub server', () {
     servePackages("localhost", 3123, ['{name: foo, version: 1.2.3}']);
 
     dir(appPath, [
       file('pubspec.yaml', '''
 dependencies:
   foo:
     repo:
@@ skipping 196 matching lines @@
     ]).scheduleValidate();
 
     run();
   });
 }
 
 versionCommand() {
   test('displays the current version', () =>
     runPub(args: ['version'], output: VERSION_STRING));
 }