Tests use a private /nix/store

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index 18272814951a1b2c5ce70374835766331522d8d2..5d93c262cf192d5ee04e3755da3e50f76b15a997 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -25,7 +25,17 @@ from typing import (
     Tuple,
 )
 
     Tuple,
 )
 

-import xdg
+# Use xdg module when it's less painful to have as a dependency
+
+
+class XDG(types.SimpleNamespace):
+    XDG_CACHE_HOME: str
+
+
+xdg = XDG(
+    XDG_CACHE_HOME=os.getenv(
+        'XDG_CACHE_HOME',
+        os.path.expanduser('~/.cache')))

 
 
 Digest16 = NewType('Digest16', str)
 
 
 Digest16 = NewType('Digest16', str)


@@ -73,7 +83,7 @@ class Verification:
     def result(self, r: bool) -> None:
         message, color = {True: ('OK ', 92), False: ('FAIL', 91)}[r]
         length = len(message)
     def result(self, r: bool) -> None:
         message, color = {True: ('OK ', 92), False: ('FAIL', 91)}[r]
         length = len(message)

-        cols = shutil.get_terminal_size().columns
+        cols = shutil.get_terminal_size().columns or 80

         pad = (cols - (self.line_length + length)) % cols
         print(' ' * pad + self._color(message, color), file=sys.stderr)
         self.line_length = 0
         pad = (cols - (self.line_length + length)) % cols
         print(' ' * pad + self._color(message, color), file=sys.stderr)
         self.line_length = 0


@@ -222,8 +232,17 @@ def git_cachedir(git_repo: str) -> str:
     return os.path.join(
         xdg.XDG_CACHE_HOME,
         'pinch/git',
     return os.path.join(
         xdg.XDG_CACHE_HOME,
         'pinch/git',

-        digest_string(
-            git_repo.encode()))
+        digest_string(git_repo.encode()))
+
+
+def tarball_cache_file(channel: Channel) -> str:
+    return os.path.join(
+        xdg.XDG_CACHE_HOME,
+        'pinch/git-tarball',
+        '%s-%s-%s' %
+        (digest_string(channel.git_repo.encode()),
+         channel.git_revision,
+         channel.release_name))

 
 
 def verify_git_ancestry(v: Verification, channel: Channel) -> None:
 
 
 def verify_git_ancestry(v: Verification, channel: Channel) -> None:


@@ -371,6 +390,12 @@ def git_checkout(v: Verification, channel: Channel, dest: str) -> None:
 
 
 def git_get_tarball(v: Verification, channel: Channel) -> str:
 
 
 def git_get_tarball(v: Verification, channel: Channel) -> str:

+    cache_file = tarball_cache_file(channel)
+    if os.path.exists(cache_file):
+        cached_tarball = open(cache_file).read(9999)
+        if os.path.exists(cached_tarball):
+            return cached_tarball
+

     with tempfile.TemporaryDirectory() as output_dir:
         output_filename = os.path.join(
             output_dir, channel.release_name + '.tar.xz')
     with tempfile.TemporaryDirectory() as output_dir:
         output_filename = os.path.join(
             output_dir, channel.release_name + '.tar.xz')


@@ -394,7 +419,11 @@ def git_get_tarball(v: Verification, channel: Channel) -> str:
         process = subprocess.run(
             ['nix-store', '--add', output_filename], capture_output=True)
         v.result(process.returncode == 0)
         process = subprocess.run(
             ['nix-store', '--add', output_filename], capture_output=True)
         v.result(process.returncode == 0)

-        return process.stdout.decode().strip()
+        store_tarball = process.stdout.decode().strip()
+
+        os.makedirs(os.path.dirname(cache_file), exist_ok=True)
+        open(cache_file, 'w').write(store_tarball)
+        return store_tarball

 
 
 def check_channel_metadata(
 
 
 def check_channel_metadata(


@@ -449,7 +478,7 @@ def git_revision_name(v: Verification, channel: Channel) -> str:
     process = subprocess.run(['git',
                               '-C',
                               git_cachedir(channel.git_repo),
     process = subprocess.run(['git',
                               '-C',
                               git_cachedir(channel.git_repo),

-                              'lo',
+                              'log',

                               '-n1',
                               '--format=%ct-%h',
                               '--abbrev=11',
                               '-n1',
                               '--format=%ct-%h',
                               '--abbrev=11',


@@ -497,6 +526,25 @@ def pin(args: argparse.Namespace) -> None:
         config.write(configfile)
 
 
         config.write(configfile)
 
 

+def fetch_channel(
+        v: Verification,
+        section: str,
+        conf: configparser.SectionProxy) -> str:
+    if 'git_repo' not in conf or 'release_name' not in conf:
+        raise Exception(
+            'Cannot update unpinned channel "%s" (Run "pin" before "update")' %
+            section)
+
+    if 'channel_url' in conf:
+        return fetch_with_nix_prefetch_url(
+            v, conf['tarball_url'], Digest16(
+                conf['tarball_sha256']))
+
+    channel = Channel(**dict(conf.items()))
+    ensure_git_rev_available(v, channel)
+    return git_get_tarball(v, channel)
+
+

 def update(args: argparse.Namespace) -> None:
     v = Verification()
     config = configparser.ConfigParser()
 def update(args: argparse.Namespace) -> None:
     v = Verification()
     config = configparser.ConfigParser()


@@ -504,20 +552,10 @@ def update(args: argparse.Namespace) -> None:
     configs = [read_config(filename) for filename in args.channels_file]
     for config in configs:
         for section in config.sections():
     configs = [read_config(filename) for filename in args.channels_file]
     for config in configs:
         for section in config.sections():

-

             if 'alias_of' in config[section]:
                 assert 'git_repo' not in config[section]
                 continue
             if 'alias_of' in config[section]:
                 assert 'git_repo' not in config[section]
                 continue

-
-            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)
-
+            tarball = fetch_channel(v, section, config[section])

             if section in exprs:
                 raise Exception('Duplicate channel "%s"' % section)
             exprs[section] = (
             if section in exprs:
                 raise Exception('Duplicate channel "%s"' % section)
             exprs[section] = (