X-Git-Url: http://git.scottworley.com/pinch/blobdiff_plain/9836141c70e29986f4f2664ad6fb1670eac5f40f..49d58bdf61c8ee7da0de30a3c806e3964f583831:/pinch.py?ds=inline diff --git a/pinch.py b/pinch.py index 3e725e1..46e5af3 100644 --- a/pinch.py +++ b/pinch.py @@ -2,12 +2,15 @@ import argparse import configparser import filecmp import functools +import getpass import hashlib import operator import os import os.path +import shlex import shutil import subprocess +import sys import tempfile import types import urllib.parse @@ -56,7 +59,7 @@ class Verification: self.line_length = 0 def status(self, s: str) -> None: - print(s, end=' ', flush=True) + print(s, end=' ', file=sys.stderr, flush=True) self.line_length += 1 + len(s) # Unicode?? @staticmethod @@ -68,7 +71,7 @@ class Verification: length = len(message) cols = shutil.get_terminal_size().columns pad = (cols - (self.line_length + length)) % cols - print(' ' * pad + self._color(message, color)) + print(' ' * pad + self._color(message, color), file=sys.stderr) self.line_length = 0 if not r: raise VerificationError() @@ -210,9 +213,39 @@ def fetch_resources(v: Verification, channel: Channel) -> None: open( channel.table['git-revision'].file).read(999) == channel.git_revision) + def git_cachedir(git_repo: str) -> str: # TODO: Consider using pyxdg to find this path. - return os.path.expanduser('~/.cache/nix-pin-channel/git/%s' % digest_string(git_repo.encode())) + return os.path.expanduser( + '~/.cache/pinch/git/%s' % + digest_string( + git_repo.encode())) + + +def verify_git_ancestry(v: Verification, channel: Channel) -> None: + cachedir = git_cachedir(channel.git_repo) + v.status('Verifying rev is an ancestor of ref') + process = subprocess.run(['git', + '-C', + cachedir, + 'merge-base', + '--is-ancestor', + channel.git_revision, + channel.git_ref]) + v.result(process.returncode == 0) + + if hasattr(channel, 'old_git_revision'): + v.status( + 'Verifying rev is an ancestor of previous rev %s' % + channel.old_git_revision) + process = subprocess.run(['git', + '-C', + cachedir, + 'merge-base', + '--is-ancestor', + channel.old_git_revision, + channel.git_revision]) + v.result(process.returncode == 0) def git_fetch(v: Verification, channel: Channel) -> None: @@ -229,39 +262,24 @@ def git_fetch(v: Verification, channel: Channel) -> None: ['git', 'init', '--bare', cachedir]) v.result(process.returncode == 0) - have_rev = False + v.status('Fetching ref "%s" from %s' % (channel.git_ref, channel.git_repo)) + # We don't use --force here because we want to abort and freak out if forced + # updates are happening. + process = subprocess.run(['git', + '-C', + cachedir, + 'fetch', + channel.git_repo, + '%s:%s' % (channel.git_ref, + channel.git_ref)]) + v.result(process.returncode == 0) + if hasattr(channel, 'git_revision'): - v.status('Checking if we already have this rev:') + v.status('Verifying that fetch retrieved this rev') process = subprocess.run( ['git', '-C', cachedir, 'cat-file', '-e', channel.git_revision]) - if process.returncode == 0: - v.status('yes') - if process.returncode == 1: - v.status('no') - v.result(process.returncode == 0 or process.returncode == 1) - have_rev = process.returncode == 0 - - if not have_rev: - v.status( - 'Fetching ref "%s" from %s' % - (channel.git_ref, channel.git_repo)) - # We don't use --force here because we want to abort and freak out if forced - # updates are happening. - process = subprocess.run(['git', - '-C', - cachedir, - 'fetch', - channel.git_repo, - '%s:%s' % (channel.git_ref, - channel.git_ref)]) v.result(process.returncode == 0) - if hasattr(channel, 'git_revision'): - v.status('Verifying that fetch retrieved this rev') - process = subprocess.run( - ['git', '-C', cachedir, 'cat-file', '-e', channel.git_revision]) - v.result(process.returncode == 0) - - if not hasattr(channel, 'git_revision'): + else: channel.git_revision = open( os.path.join( cachedir, @@ -269,28 +287,24 @@ def git_fetch(v: Verification, channel: Channel) -> None: 'heads', channel.git_ref)).read(999).strip() - v.status('Verifying rev is an ancestor of ref') - process = subprocess.run(['git', - '-C', - cachedir, - 'merge-base', - '--is-ancestor', - channel.git_revision, - channel.git_ref]) - v.result(process.returncode == 0) + verify_git_ancestry(v, channel) - if hasattr(channel, 'old_git_revision'): - v.status( - 'Verifying rev is an ancestor of previous rev %s' % - channel.old_git_revision) - process = subprocess.run(['git', - '-C', - cachedir, - 'merge-base', - '--is-ancestor', - channel.old_git_revision, - channel.git_revision]) - v.result(process.returncode == 0) + +def ensure_git_rev_available(v: Verification, channel: Channel) -> None: + cachedir = git_cachedir(channel.git_repo) + if os.path.exists(cachedir): + v.status('Checking if we already have this rev:') + process = subprocess.run( + ['git', '-C', cachedir, 'cat-file', '-e', channel.git_revision]) + if process.returncode == 0: + v.status('yes') + if process.returncode == 1: + v.status('no') + v.result(process.returncode == 0 or process.returncode == 1) + if process.returncode == 0: + verify_git_ancestry(v, channel) + return + git_fetch(v, channel) def compare_tarball_and_git( @@ -351,6 +365,33 @@ def git_checkout(v: Verification, channel: Channel, dest: str) -> None: v.result(git.returncode == 0 and tar.returncode == 0) +def git_get_tarball(v: Verification, channel: Channel) -> str: + with tempfile.TemporaryDirectory() as output_dir: + output_filename = os.path.join( + output_dir, channel.release_name + '.tar.xz') + with open(output_filename, 'w') as output_file: + v.status( + 'Generating tarball for git revision %s' % + channel.git_revision) + git = subprocess.Popen(['git', + '-C', + git_cachedir(channel.git_repo), + 'archive', + '--prefix=%s/' % channel.release_name, + channel.git_revision], + stdout=subprocess.PIPE) + xz = subprocess.Popen(['xz'], stdin=git.stdout, stdout=output_file) + xz.wait() + git.wait() + v.result(git.returncode == 0 and xz.returncode == 0) + + v.status('Putting tarball in Nix store') + process = subprocess.run( + ['nix-store', '--add', output_filename], capture_output=True) + v.result(process.returncode == 0) + return process.stdout.decode().strip() + + def check_channel_metadata( v: Verification, channel: Channel, @@ -394,7 +435,7 @@ def pin_channel(v: Verification, channel: Channel) -> None: fetch(v, channel) parse_channel(v, channel) fetch_resources(v, channel) - git_fetch(v, channel) + ensure_git_rev_available(v, channel) check_channel_contents(v, channel) @@ -414,40 +455,79 @@ def git_revision_name(v: Verification, channel: Channel) -> str: process.stdout.decode().strip()) -def make_channel(conf: configparser.SectionProxy) -> Channel: - channel = Channel(**dict(conf.items())) - if hasattr(channel, 'git_revision'): - channel.old_git_revision = channel.git_revision - del channel.git_revision - return channel - - def pin(args: argparse.Namespace) -> None: v = Verification() config = configparser.ConfigParser() config.read_file(open(args.channels_file), args.channels_file) for section in config.sections(): - channel = make_channel(config[section]) + if args.channels and section not in args.channels: + continue + + channel = Channel(**dict(config[section].items())) + if hasattr(channel, 'git_revision'): + channel.old_git_revision = channel.git_revision + del channel.git_revision + if 'channel_url' in config[section]: pin_channel(v, channel) - config[section]['name'] = channel.release_name + config[section]['release_name'] = channel.release_name config[section]['tarball_url'] = channel.table['nixexprs.tar.xz'].absolute_url config[section]['tarball_sha256'] = channel.table['nixexprs.tar.xz'].digest else: git_fetch(v, channel) - config[section]['name'] = git_revision_name(v, channel) + config[section]['release_name'] = git_revision_name(v, channel) config[section]['git_revision'] = channel.git_revision with open(args.channels_file, 'w') as configfile: config.write(configfile) +def update(args: argparse.Namespace) -> None: + v = Verification() + config = configparser.ConfigParser() + config.read_file(open(args.channels_file), args.channels_file) + exprs = [] + for section in config.sections(): + if 'channel_url' in config[section]: + tarball = fetch_with_nix_prefetch_url( + v, config[section]['tarball_url'], Digest16( + config[section]['tarball_sha256'])) + else: + channel = Channel(**dict(config[section].items())) + ensure_git_rev_available(v, channel) + tarball = git_get_tarball(v, channel) + exprs.append( + 'f: f { name = "%s"; channelName = "%s"; src = builtins.storePath "%s"; }' % + (config[section]['release_name'], section, tarball)) + command = [ + 'nix-env', + '--profile', + '/nix/var/nix/profiles/per-user/%s/channels' % + getpass.getuser(), + '--show-trace', + '--file', + '', + '--install', + '--from-expression'] + exprs + if args.dry_run: + print(' '.join(map(shlex.quote, command))) + else: + v.status('Installing channels with nix-env') + process = subprocess.run(command) + v.result(process.returncode == 0) + + def main() -> None: parser = argparse.ArgumentParser(prog='pinch') subparsers = parser.add_subparsers(dest='mode', required=True) parser_pin = subparsers.add_parser('pin') parser_pin.add_argument('channels_file', type=str) + parser_pin.add_argument('channels', type=str, nargs='*') parser_pin.set_defaults(func=pin) + parser_update = subparsers.add_parser('update') + parser_update.add_argument('--dry-run', action='store_true') + parser_update.add_argument('channels_file', type=str) + parser_update.set_defaults(func=update) args = parser.parse_args() args.func(args)