11466551182

Committed 22 Oct 2024 06:45PM UTC coverage: 82.831% (+0.2%) from 82.674%

Build # 11466551182

Build Type

Pull #79

github

Committed by

web-flow

Commit Message

Merge 68d1b6cca into 5ae6c80d0

Pull Request Pull Request #79: Use deno^2

Run Details

553 of 736 branches covered (75.14%)

Branch coverage included in aggregate %.

46 of 59 new or added lines in 8 files covered. (77.97%)

3 existing lines in 3 files now uncovered.

2443 of 2881 relevant lines covered (84.8%)

2693.71 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

63.54

/src/hooks/useSync.ts

import { flock } from "../utils/flock.ts"
import useDownload from "./useDownload.ts"
import usePantry from "./usePantry.ts"
import useConfig from "./useConfig.ts"
import Path from "../utils/Path.ts"
import useSyncCache from "./useSyncCache.ts";

//FIXME tar is fetched from PATH :/ we want control
//FIXME run in general is not controllable since it delegates to the shell

interface Logger {
  syncing(path: Path): void
  caching(path: Path): void
  syncd(path: Path): void
}

export default async function(logger?: Logger) {
  const pantry_dir = usePantry().prefix.parent()

  logger?.syncing(pantry_dir)

  const unflock = await flock(pantry_dir.mkdir('p'))

  try {
    await _internals.sync(pantry_dir)
    try {
      logger?.caching(pantry_dir)
      await _internals.cache()
    } catch (err) {
      console.warn("failed to cache pantry")
      console.error(err)
    }
  } finally {
    await unflock()
  }

  logger?.syncd(pantry_dir)
}

export const _internals = {
  sync, cache: useSyncCache
}

async function sync(pantry_dir: Path) {
  try {
    //TODO if there was already a lock, just wait on it, don’t do the following stuff

    const git_dir = pantry_dir.parent().join("pantries/pkgxdev/pantry")

    if (git_dir.join("HEAD").isFile()) {
      await git("-C", git_dir, "fetch", "--quiet", "origin", "--force", "main:main")
    } else {
      await git("clone", "--quiet", "--bare", "--depth=1", "https://github.com/pkgxdev/pantry", git_dir)
    }

    await git("--git-dir", git_dir, "--work-tree", pantry_dir, "checkout", "--quiet", "--force")

  } catch {
    // git failure or no git installed
    // ∴ download the latest tarball and uncompress over the top
    //FIXME deleted packages will not be removed with this method
    const src = new URL(`https://github.com/pkgxdev/pantry/archive/refs/heads/main.tar.gz`)
    const proc = new Deno.Command("tar", {
      args: ["xzf", "-", "--strip-components=1"],
      cwd: pantry_dir.string,
      stdin: "piped",
    }).spawn()
    const writer = proc.stdin.getWriter()
    await useDownload().download({ src }, blob => writer.write(blob))
    writer.close()

    if (!(await proc.status).success) {
      throw new Error("untar failed")
    }
  }
}

//////////////////////// utils

async function git(...args: (string | Path)[]) {
  const { git } = useConfig()
  if (!git) throw new Error("no-git")  // caught above to trigger http download instead
  await run({cmd: [git, ...args]})
}

export interface RunOptions {
  cmd: (string | Path)[]
}

async function run(opts: RunOptions) {
  const cmd = opts.cmd.map(x => `${x}`);
  const env = (({ HTTP_PROXY, HTTPS_PROXY }) => ({ HTTP_PROXY, HTTPS_PROXY }))(Deno.env.toObject());

  const proc = new Deno.Command(cmd[0], {
    args: cmd.slice(1),
    stdout: 'null',
    clearEnv: true,
    env,
    ...opts,
  });

  const child = proc.spawn();

  try {
    const status = await child.status;
    if (!status.success) {
      throw new Error(`run.exit(${status.code})`);
    }
  } catch (err) {
    if (err instanceof Error) {
      err.cause = child;
    }
    throw err;
  }
}

1	import { flock } from "../utils/flock.ts"	34✔
2	import useDownload from "./useDownload.ts"	34✔
3	import usePantry from "./usePantry.ts"	34✔
4	import useConfig from "./useConfig.ts"	34✔
5	import Path from "../utils/Path.ts"
6	import useSyncCache from "./useSyncCache.ts";	34✔
7
8	//FIXME tar is fetched from PATH :/ we want control
9	//FIXME run in general is not controllable since it delegates to the shell
10
11	interface Logger {
12	syncing(path: Path): void
13	caching(path: Path): void
14	syncd(path: Path): void
15	}
16
17	export default async function(logger?: Logger) {	34✔
18	const pantry_dir = usePantry().prefix.parent()	40✔
19
20	logger?.syncing(pantry_dir)	×
21
22	const unflock = await flock(pantry_dir.mkdir('p'))	40✔
23
24	try {	40✔
25	await _internals.sync(pantry_dir)	40✔
26	try {	40✔
27	logger?.caching(pantry_dir)	×
28	await _internals.cache()	40✔
29	} catch (err) {	×
30	console.warn("failed to cache pantry")	×
31	console.error(err)	×
32	}	×
33	} finally {	40✔
34	await unflock()	40✔
35	}	40✔
36
37	logger?.syncd(pantry_dir)	×
38	}	40✔
39
40	export const _internals = {	34✔
41	sync, cache: useSyncCache	68✔
42	}	34✔
43
44	async function sync(pantry_dir: Path) {	42✔
45	try {	42✔
46	//TODO if there was already a lock, just wait on it, don’t do the following stuff	42✔
47
48	const git_dir = pantry_dir.parent().join("pantries/pkgxdev/pantry")	42✔
49
50	if (git_dir.join("HEAD").isFile()) {	×
51	await git("-C", git_dir, "fetch", "--quiet", "origin", "--force", "main:main")	×
52	} else {	×
53	await git("clone", "--quiet", "--bare", "--depth=1", "https://github.com/pkgxdev/pantry", git_dir)	42!
54	}	×
55
56	await git("--git-dir", git_dir, "--work-tree", pantry_dir, "checkout", "--quiet", "--force")	×
57
58	} catch {	×
59	// git failure or no git installed	42✔
60	// ∴ download the latest tarball and uncompress over the top	42✔
61	//FIXME deleted packages will not be removed with this method	42✔
62	const src = new URL(`https://github.com/pkgxdev/pantry/archive/refs/heads/main.tar.gz`)	42✔
63	const proc = new Deno.Command("tar", {	42✔
64	args: ["xzf", "-", "--strip-components=1"],	210✔
65	cwd: pantry_dir.string,	42✔
66	stdin: "piped",	42✔
67	}).spawn()	42✔
68	const writer = proc.stdin.getWriter()	42✔
69	await useDownload().download({ src }, blob => writer.write(blob))	126✔
70	writer.close()	42✔
71
NEW 72	if (!(await proc.status).success) {	×
73	throw new Error("untar failed")	×
74	}	×
75	}	42✔
76	}	42✔
77
78	//////////////////////// utils	2✔
79
80	async function git(...args: (string \| Path)[]) {	42✔
81	const { git } = useConfig()	42✔
82	if (!git) throw new Error("no-git") // caught above to trigger http download instead	42✔
83	await run({cmd: [git, ...args]})	312!
84	}	42✔
85
86	export interface RunOptions {
87	cmd: (string \| Path)[]
88	}
89
90	async function run(opts: RunOptions) {	38✔
91	const cmd = opts.cmd.map(x => `${x}`);	38✔
92	const env = (({ HTTP_PROXY, HTTPS_PROXY }) => ({ HTTP_PROXY, HTTPS_PROXY }))(Deno.env.toObject());	160✔
93
94	const proc = new Deno.Command(cmd[0], {	38✔
95	args: cmd.slice(1),	38✔
96	stdout: 'null',	38✔
97	clearEnv: true,	38✔
98	env,	38✔
99	...opts,	38✔
100	});	38✔
101
102	const child = proc.spawn();	38✔
103
104	try {	38✔
105	const status = await child.status;	38!
NEW 106	if (!status.success) {	×
NEW 107	throw new Error(`run.exit(${status.code})`);	×
NEW 108	}	×
109	} catch (err) {	×
NEW 110	if (err instanceof Error) {	×
NEW 111	err.cause = child;	×
NEW 112	}	×
NEW 113	throw err;	×
UNCOV 114	}	×
115	}	38✔

pkgxdev / libpkgx / 11466551182

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous