chore: change printWidth from 80 to 100 (#365)
This commit is contained in:
parent
be3787356a
commit
8bff475612
9 changed files with 28 additions and 72 deletions
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"printWidth": 80,
|
||||
"printWidth": 100,
|
||||
"tabWidth": 2,
|
||||
"useTabs": false,
|
||||
"semi": true,
|
||||
|
@ -8,4 +8,4 @@
|
|||
"bracketSpacing": false,
|
||||
"arrowParens": "avoid",
|
||||
"parser": "typescript"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,15 +27,9 @@ describe('getURL()', () => {
|
|||
|
||||
describe('getLatestVersion()', () => {
|
||||
test('return latest version via brew', async () => {
|
||||
nock('https://formulae.brew.sh')
|
||||
.get(`/api/formula/${Tool.Repo}.json`)
|
||||
.reply(200, jsonTestBrew);
|
||||
nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(200, jsonTestBrew);
|
||||
|
||||
const versionLatest: string = await getLatestVersion(
|
||||
Tool.Org,
|
||||
Tool.Repo,
|
||||
'brew'
|
||||
);
|
||||
const versionLatest: string = await getLatestVersion(Tool.Org, Tool.Repo, 'brew');
|
||||
expect(versionLatest).toMatch(Tool.TestVersionLatest);
|
||||
});
|
||||
|
||||
|
@ -44,21 +38,13 @@ describe('getLatestVersion()', () => {
|
|||
.get(`/repos/${Tool.Org}/${Tool.Repo}/releases/latest`)
|
||||
.reply(200, jsonTestGithub);
|
||||
|
||||
const versionLatest: string = await getLatestVersion(
|
||||
Tool.Org,
|
||||
Tool.Repo,
|
||||
'github'
|
||||
);
|
||||
const versionLatest: string = await getLatestVersion(Tool.Org, Tool.Repo, 'github');
|
||||
expect(versionLatest).toMatch(Tool.TestVersionLatest);
|
||||
});
|
||||
|
||||
test('return exception 404', async () => {
|
||||
nock('https://formulae.brew.sh')
|
||||
.get(`/api/formula/${Tool.Repo}.json`)
|
||||
.reply(404);
|
||||
nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(404);
|
||||
|
||||
await expect(
|
||||
getLatestVersion(Tool.Org, Tool.Repo, 'brew')
|
||||
).rejects.toThrowError(FetchError);
|
||||
await expect(getLatestVersion(Tool.Org, Tool.Repo, 'brew')).rejects.toThrowError(FetchError);
|
||||
});
|
||||
});
|
||||
|
|
|
@ -2,8 +2,7 @@ import getURL from '../src/get-url';
|
|||
|
||||
describe('getURL()', () => {
|
||||
test('test', () => {
|
||||
const baseURL =
|
||||
'https://github.com/gohugoio/hugo/releases/download/v0.58.2';
|
||||
const baseURL = 'https://github.com/gohugoio/hugo/releases/download/v0.58.2';
|
||||
const urlLinux = `${baseURL}/hugo_0.58.2_Linux-64bit.tar.gz`;
|
||||
const urlLinuxExtended = `${baseURL}/hugo_extended_0.58.2_Linux-64bit.tar.gz`;
|
||||
const urlMacOS = `${baseURL}/hugo_0.58.2_macOS-64bit.tar.gz`;
|
||||
|
|
|
@ -43,36 +43,26 @@ describe('Integration testing run()', () => {
|
|||
test('succeed in installing the latest version', async () => {
|
||||
const testVersion = 'latest';
|
||||
process.env['INPUT_HUGO-VERSION'] = testVersion;
|
||||
nock('https://formulae.brew.sh')
|
||||
.get(`/api/formula/${Tool.Repo}.json`)
|
||||
.reply(200, jsonTestBrew);
|
||||
nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(200, jsonTestBrew);
|
||||
const result: main.ActionResult = await main.run();
|
||||
expect(result.exitcode).toBe(0);
|
||||
expect(result.output).toMatch(
|
||||
`Hugo Static Site Generator v${Tool.TestVersionLatest}`
|
||||
);
|
||||
expect(result.output).toMatch(`Hugo Static Site Generator v${Tool.TestVersionLatest}`);
|
||||
});
|
||||
|
||||
test('succeed in installing the latest extended version', async () => {
|
||||
const testVersion = 'latest';
|
||||
process.env['INPUT_HUGO-VERSION'] = testVersion;
|
||||
process.env['INPUT_EXTENDED'] = 'true';
|
||||
nock('https://formulae.brew.sh')
|
||||
.get(`/api/formula/${Tool.Repo}.json`)
|
||||
.reply(200, jsonTestBrew);
|
||||
nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(200, jsonTestBrew);
|
||||
const result: main.ActionResult = await main.run();
|
||||
expect(result.exitcode).toBe(0);
|
||||
expect(result.output).toMatch(
|
||||
`Hugo Static Site Generator v${Tool.TestVersionLatest}`
|
||||
);
|
||||
expect(result.output).toMatch(`Hugo Static Site Generator v${Tool.TestVersionLatest}`);
|
||||
expect(result.output).toMatch(`extended`);
|
||||
});
|
||||
|
||||
test('fail to install the latest version due to 404 of brew', async () => {
|
||||
process.env['INPUT_HUGO-VERSION'] = 'latest';
|
||||
nock('https://formulae.brew.sh')
|
||||
.get(`/api/formula/${Tool.Repo}.json`)
|
||||
.reply(404);
|
||||
nock('https://formulae.brew.sh').get(`/api/formula/${Tool.Repo}.json`).reply(404);
|
||||
|
||||
await expect(main.run()).rejects.toThrowError(FetchError);
|
||||
});
|
||||
|
@ -91,8 +81,6 @@ describe('showVersion()', () => {
|
|||
});
|
||||
|
||||
test('return not found', async () => {
|
||||
await expect(
|
||||
main.showVersion('gitgit', ['--version'])
|
||||
).rejects.toThrowError(Error);
|
||||
await expect(main.showVersion('gitgit', ['--version'])).rejects.toThrowError(Error);
|
||||
});
|
||||
});
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
}
|
||||
},
|
||||
"lint-staged": {
|
||||
"src/**/*.ts": [
|
||||
"{src,__tests__}/**/*.ts": [
|
||||
"prettier --check",
|
||||
"eslint"
|
||||
],
|
||||
|
|
|
@ -12,11 +12,7 @@ export function getURL(org: string, repo: string, api: string): string {
|
|||
return url;
|
||||
}
|
||||
|
||||
export async function getLatestVersion(
|
||||
org: string,
|
||||
repo: string,
|
||||
api: string
|
||||
): Promise<string> {
|
||||
export async function getLatestVersion(org: string, repo: string, api: string): Promise<string> {
|
||||
const url = getURL(org, repo, api);
|
||||
const response = await fetch(url);
|
||||
const json = await response.json();
|
||||
|
|
|
@ -1,8 +1,4 @@
|
|||
export default function getURL(
|
||||
os: string,
|
||||
extended: string,
|
||||
version: string
|
||||
): string {
|
||||
export default function getURL(os: string, extended: string, version: string): string {
|
||||
const extendedStr = (extended: string): string => {
|
||||
if (extended === 'true') {
|
||||
return 'extended_';
|
||||
|
|
|
@ -59,16 +59,10 @@ export async function installer(version: string): Promise<void> {
|
|||
const toolAssets: string = await tc.downloadTool(toolURL);
|
||||
let toolBin = '';
|
||||
if (process.platform === 'win32') {
|
||||
const toolExtractedFolder: string = await tc.extractZip(
|
||||
toolAssets,
|
||||
tempDir
|
||||
);
|
||||
const toolExtractedFolder: string = await tc.extractZip(toolAssets, tempDir);
|
||||
toolBin = `${toolExtractedFolder}/${Tool.CmdName}.exe`;
|
||||
} else {
|
||||
const toolExtractedFolder: string = await tc.extractTar(
|
||||
toolAssets,
|
||||
tempDir
|
||||
);
|
||||
const toolExtractedFolder: string = await tc.extractTar(toolAssets, tempDir);
|
||||
toolBin = `${toolExtractedFolder}/${Tool.CmdName}`;
|
||||
}
|
||||
await io.mv(toolBin, binDir);
|
||||
|
|
|
@ -9,10 +9,7 @@ export interface ActionResult {
|
|||
output: string;
|
||||
}
|
||||
|
||||
export async function showVersion(
|
||||
cmd: string,
|
||||
args: string[]
|
||||
): Promise<ActionResult> {
|
||||
export async function showVersion(cmd: string, args: string[]): Promise<ActionResult> {
|
||||
const result: ActionResult = {
|
||||
exitcode: 0,
|
||||
output: ''
|
||||
|
|
Loading…
Reference in a new issue