fix bugs with hash cache folder names

yarnpkg · Nov 4, 2016 · ba5a203 · ba5a203
1 parent 5efc97a
commit ba5a203
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 27 deletions.
diff --git a/__tests__/commands/_install.js b/__tests__/commands/_install.js
@@ -90,17 +90,19 @@ export async function run(
   const lockfile = await createLockfile(cwd);
 
   // create directories
-  await fs.mkdirp(path.join(cwd, '.yarn'));
+  await fs.mkdirp(path.join(cwd, '.yarn-global'));
+  await fs.mkdirp(path.join(cwd, '.yarn-link'));
+  await fs.mkdirp(path.join(cwd, '.yarn-cache'));
   await fs.mkdirp(path.join(cwd, 'node_modules'));
 
   try {
     const config = new Config(reporter);
     await config.init({
       binLinks: !!flags.binLinks,
       cwd,
-      globalFolder: path.join(cwd, '.yarn/.global'),
-      cacheFolder: path.join(cwd, '.yarn'),
-      linkFolder: path.join(cwd, '.yarn/.link'),
+      globalFolder: path.join(cwd, '.yarn-global'),
+      cacheFolder: path.join(cwd, '.yarn-cache'),
+      linkFolder: path.join(cwd, '.yarn-link'),
     });
 
     const install = factory(config, reporter, lockfile);
@@ -115,7 +117,7 @@ export async function run(
     } finally {
       // clean up
       if (cleanupAfterInstall) {
-        await fs.unlink(cwd);
+        //await fs.unlink(cwd);
       }
     }
   } catch (err) {

diff --git a/__tests__/fetchers.js b/__tests__/fetchers.js
@@ -26,6 +26,7 @@ test('BaseFetcher.fetch', async () => {
     type: 'base',
     registry: 'npm',
     reference: '',
+    hash: null,
   }, await createConfig());
   let error;
 
@@ -47,6 +48,7 @@ test('CopyFetcher.fetch', async () => {
     type: 'copy',
     reference: a,
     registry: 'npm',
+    hash: null,
   }, await createConfig());
   await fetcher.fetch();
   const content = await fs.readFile(path.join(b, 'package.json'));

diff --git a/__tests__/fixtures/install/scripts-order-with-one-package-missing-install-script/yarn.lock b/__tests__/fixtures/install/scripts-order-with-one-package-missing-install-script/yarn.lock
@@ -2,22 +2,22 @@
 # yarn lockfile v1
 dep-a@1.0.0:
   version "1.0.0"
-  resolved dep-a-1.0.0.tgz
+  resolved dep-a-1.0.0.tgz#32681745236788ceacdd1e693a434c17a523c74f
   dependencies:
     dep-b "1.0.0"
 
 dep-b@1.0.0:
   version "1.0.0"
-  resolved dep-b-1.0.0.tgz
+  resolved dep-b-1.0.0.tgz#cd5e0c0e50dea8b27fe0ce3b5cc738b9c1c3d128
   dependencies:
     dep-c "1.0.0"
 
 dep-c@1.0.0:
   version "1.0.0"
-  resolved dep-c-1.0.0.tgz
+  resolved dep-c-1.0.0.tgz#968769f835949a29dbb6a45884b5bdcee3ab9b20
   dependencies:
     dep-d "1.0.0"
 
 dep-d@1.0.0:
   version "1.0.0"
-  resolved dep-d-1.0.0.tgz
+  resolved dep-d-1.0.0.tgz#0fcc8130f5ab82792e98f2efa8981a882882748c
diff --git a/__tests__/fixtures/install/scripts-order/yarn.lock b/__tests__/fixtures/install/scripts-order/yarn.lock
@@ -2,14 +2,14 @@
 # yarn lockfile v1
 dep-a@1.0.0:
   version "1.0.0"
-  resolved dep-a-1.0.0.tgz
+  resolved dep-a-1.0.0.tgz#63970c7301ec8a5d37dac4e454fff354f31c31b4
   dependencies:
     dep-b "1.0.0"
 dep-b@1.0.0:
   version "1.0.0"
-  resolved dep-b-1.0.0.tgz
+  resolved dep-b-1.0.0.tgz#569c27a4e30b1679eaa7e2299e741f30a7f70926
   dependencies:
     dep-c "1.0.0"
 dep-c@1.0.0:
   version "1.0.0"
-  resolved dep-c-1.0.0.tgz
+  resolved dep-c-1.0.0.tgz#100eef2bf00fc31b596542fb9af18186e37716cc
diff --git a/__tests__/fixtures/request-cache/GET/localhost/.bin b/__tests__/fixtures/request-cache/GET/localhost/.bin
@@ -1,5 +1,5 @@
 HTTP/1.1 200 OK
-Date: Wed, 26 Oct 2016 22:01:42 GMT
+Date: Fri, 04 Nov 2016 14:55:49 GMT
 Connection: close
 Content-Length: 2
 

diff --git a/src/config.js b/src/config.js
@@ -258,11 +258,9 @@ export default class Config {
       uid = pkg.version || uid;
     }
 
-    if (pkg.remote) {
-      const {hash} = pkg.remote;
-      if (hash) {
-        uid += `-${hash}`;
-      }
+    const {hash} = pkg.remote;
+    if (hash) {
+      uid += `-${hash}`;
     }
 
     return path.join(this.cacheFolder, `${name}-${uid}`);

diff --git a/src/fetchers/git-fetcher.js b/src/fetchers/git-fetcher.js
@@ -63,10 +63,10 @@ export default class GitFetcher extends BaseFetcher {
   }
 
   async fetchFromExternal(): Promise<FetchedOverride> {
-    const hash = this.hash;
-    invariant(hash, 'Commit hash required');
+    const commit = this.hash;
+    invariant(commit, 'Commit hash required');
 
-    const git = new Git(this.config, this.reference, hash);
+    const git = new Git(this.config, this.reference, commit);
     await git.init();
     await git.clone(this.dest);
 
@@ -83,20 +83,18 @@ export default class GitFetcher extends BaseFetcher {
 
     const mirrorRootPath = this.config.getOfflineMirrorPath();
     if (tarballInMirrorPath && this.hash && mirrorRootPath) {
-      tarballInMirrorPath = `${tarballInMirrorPath}-${this.hash}`;
+      tarballInMirrorPath = `${tarballInMirrorPath}-${commit}`;
       const hash = await git.archive(tarballInMirrorPath);
       const relativeMirrorPath = path.relative(mirrorRootPath, tarballInMirrorPath);
       return {
-        hash,
+        hash: commit,
         resolved: relativeMirrorPath ? `${relativeMirrorPath}#${hash}` : null,
       };
     }
 
     return {
-      hash,
+      hash: commit,
       resolved: null,
     };
   }
-
-
 }
diff --git a/src/resolvers/exotics/file-resolver.js b/src/resolvers/exotics/file-resolver.js
@@ -36,6 +36,7 @@ export default class FileResolver extends ExoticResolver {
     manifest._remote = {
       type: 'copy',
       registry,
+      hash: null,
       reference: loc,
     };
 

diff --git a/src/types.js b/src/types.js
@@ -43,7 +43,7 @@ export type PackageRemote = {
   registry: RegistryNames,
   reference: string,
   resolved?: ?string,
-  hash?: ?string,
+  hash: ?string,
 };
 
 // `dependencies` field in package info