pxcloud/pkg-fetch
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use tag instead of version for localPlace

Browse Source
This commit is contained in:
igorklopov 2016-09-04 08:20:31 +00:00
parent 672b6b7583
commit e1b07b28e2
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/places.js
View File

@ -1,25 +1,24 @@
import { lte, major, minor } from 'semver';
import { major, minor } from 'semver';
import expandTemplate from 'expand-template';
import os from 'os';
import path from 'path';
import placesJson from '../places.json';
const expand = expandTemplate();
export function localPlace (opts) {
const p = placesJson.localPlace;
const atHome = p.replace('~', os.homedir());
return expand(path.resolve(atHome), opts);
}
function tagFromVersion (version) {
if (lte(version, '0.0.4')) {
return `v${version}`;
}
const mj = major(version);
const mn = minor(version);
return `v${mj}.${mn}.0`;
}
export function localPlace (opts) {
const p = placesJson.localPlace;
const atHome = p.replace('~', os.homedir());
const { version } = opts;
Object.assign(opts, { tag: tagFromVersion(version) });
return expand(path.resolve(atHome), opts);
}
export function remotePlace (opts) {
const p = placesJson.remotePlace;
return { name: expand(p, opts),

2
places.json
View File

@ -1,4 +1,4 @@
{
"localPlace": "~/.pkg-cache/{version}/{from}-{nodeVersion}-{platform}-{arch}",
"localPlace": "~/.pkg-cache/{tag}/{from}-{nodeVersion}-{platform}-{arch}",
"remotePlace": "uploaded-{nodeVersion}-{platform}-{arch}"
}

12
test/upload.test.js
View File

@ -114,7 +114,7 @@ test(async () => {
'> Compiling Node.js from sources...',
'./configure --dest-cpu x64 {"cwd":"../temp/node"}',
'make {"cwd":"../temp/node"}',
'copyFile ../temp/node/out/Release/node 1337.2.3/built-v0.12.15-linux-x64',
'copyFile ../temp/node/out/Release/node v1337.2.0/built-v0.12.15-linux-x64',
'> Uploading built-v0.12.15-linux-x64...',
'getRelease v1337.2.0',
'getReleaseDraft v1337.2.0',
@ -144,7 +144,7 @@ test(async () => {
'> Compiling Node.js from sources...',
'./configure --dest-cpu ia32 {"cwd":"../temp/node"}',
'make {"cwd":"../temp/node"}',
'copyFile ../temp/node/out/Release/node 1337.2.3/built-v0.12.15-linux-x86',
'copyFile ../temp/node/out/Release/node v1337.2.0/built-v0.12.15-linux-x86',
'> Uploading built-v0.12.15-linux-x86...',
'getRelease v1337.2.0',
'getReleaseDraft v1337.2.0',
@ -161,7 +161,7 @@ test(async () => {
'> Compiling Node.js from sources...',
'./configure --dest-cpu x64 {"cwd":"../temp/node"}',
'make {"cwd":"../temp/node"}',
'copyFile ../temp/node/out/Release/node 1337.2.3/built-v4.4.7-linux-x64',
'copyFile ../temp/node/out/Release/node v1337.2.0/built-v4.4.7-linux-x64',
'> Uploading built-v4.4.7-linux-x64...',
'getRelease v1337.2.0',
'getReleaseDraft v1337.2.0',
@ -178,7 +178,7 @@ test(async () => {
'> Compiling Node.js from sources...',
'./configure --dest-cpu ia32 {"cwd":"../temp/node"}',
'make {"cwd":"../temp/node"}',
'copyFile ../temp/node/out/Release/node 1337.2.3/built-v4.4.7-linux-x86',
'copyFile ../temp/node/out/Release/node v1337.2.0/built-v4.4.7-linux-x86',
'> Uploading built-v4.4.7-linux-x86...',
'getRelease v1337.2.0',
'getReleaseDraft v1337.2.0',
@ -194,7 +194,7 @@ test(async () => {
'> Compiling Node.js from sources...',
'./configure --dest-cpu x64 {"cwd":"../temp/node"}',
'make {"cwd":"../temp/node"}',
'copyFile ../temp/node/out/Release/node 1337.2.3/built-v6.3.1-linux-x64',
'copyFile ../temp/node/out/Release/node v1337.2.0/built-v6.3.1-linux-x64',
'> Uploading built-v6.3.1-linux-x64...',
'getRelease v1337.2.0',
'getReleaseDraft v1337.2.0',
@ -210,7 +210,7 @@ test(async () => {
'> Compiling Node.js from sources...',
'./configure --dest-cpu ia32 {"cwd":"../temp/node"}',
'make {"cwd":"../temp/node"}',
'copyFile ../temp/node/out/Release/node 1337.2.3/built-v6.3.1-linux-x86',
'copyFile ../temp/node/out/Release/node v1337.2.0/built-v6.3.1-linux-x86',
'> Uploading built-v6.3.1-linux-x86...',
'getRelease v1337.2.0',
'getReleaseDraft v1337.2.0',