]> git.scottworley.com Git - pinch/blobdiff - pinch.py
Rename config field: url -> channel_url
[pinch] / pinch.py
index 1a97f5377fe4c063fb448f6aba16dc7ac5b3aca4..e3b6882bb9fb1ffb6e08cd32c0363fb9b96251a8 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -1,3 +1,4 @@
+import configparser
 import filecmp
 import functools
 import hashlib
@@ -6,6 +7,7 @@ import os
 import os.path
 import shutil
 import subprocess
+import sys
 import tempfile
 import types
 import urllib.parse
@@ -25,6 +27,7 @@ Digest32 = NewType('Digest32', str)
 
 
 class ChannelTableEntry(types.SimpleNamespace):
+    absolute_url: str
     digest: Digest16
     file: str
     size: int
@@ -33,6 +36,7 @@ class ChannelTableEntry(types.SimpleNamespace):
 
 class Channel(types.SimpleNamespace):
     channel_html: bytes
+    channel_url: str
     forwarded_url: str
     git_cachedir: str
     git_ref: str
@@ -40,7 +44,6 @@ class Channel(types.SimpleNamespace):
     git_revision: str
     release_name: str
     table: Dict[str, ChannelTableEntry]
-    url: str
 
 
 class VerificationError(Exception):
@@ -108,11 +111,11 @@ def compare(a: str, b: str) -> Tuple[List[str], List[str], List[str]]:
 
 def fetch(v: Verification, channel: Channel) -> None:
     v.status('Fetching channel')
-    request = urllib.request.urlopen(channel.url, timeout=10)
+    request = urllib.request.urlopen(channel.channel_url, timeout=10)
     channel.channel_html = request.read()
     channel.forwarded_url = request.geturl()
     v.result(request.status == 200)
-    v.check('Got forwarded', channel.url != channel.forwarded_url)
+    v.check('Got forwarded', channel.channel_url != channel.forwarded_url)
 
 
 def parse_channel(v: Verification, channel: Channel) -> None:
@@ -130,8 +133,8 @@ def parse_channel(v: Verification, channel: Channel) -> None:
 
     v.status('Extracting git commit:')
     git_commit_node = d.getElementsByTagName('tt')[0]
-    channel.git_commit = git_commit_node.firstChild.nodeValue
-    v.status(channel.git_commit)
+    channel.git_revision = git_commit_node.firstChild.nodeValue
+    v.status(channel.git_revision)
     v.ok()
     v.status('Verifying git commit label')
     v.result(git_commit_node.previousSibling.nodeValue == 'Git commit ')
@@ -198,12 +201,14 @@ def fetch_with_nix_prefetch_url(
 def fetch_resources(v: Verification, channel: Channel) -> None:
     for resource in ['git-revision', 'nixexprs.tar.xz']:
         fields = channel.table[resource]
-        url = urllib.parse.urljoin(channel.forwarded_url, fields.url)
-        fields.file = fetch_with_nix_prefetch_url(v, url, fields.digest)
+        fields.absolute_url = urllib.parse.urljoin(
+            channel.forwarded_url, fields.url)
+        fields.file = fetch_with_nix_prefetch_url(
+            v, fields.absolute_url, fields.digest)
     v.status('Verifying git commit on main page matches git commit in table')
     v.result(
         open(
-            channel.table['git-revision'].file).read(999) == channel.git_commit)
+            channel.table['git-revision'].file).read(999) == channel.git_revision)
 
 
 def git_fetch(v: Verification, channel: Channel) -> None:
@@ -217,7 +222,7 @@ def git_fetch(v: Verification, channel: Channel) -> None:
     channel.git_cachedir = os.path.expanduser(
         '~/.cache/nix-pin-channel/git/%s' %
         digest_string(
-            channel.url.encode()))
+            channel.git_repo.encode()))
     if not os.path.exists(channel.git_cachedir):
         v.status("Initializing git repo")
         process = subprocess.run(
@@ -226,7 +231,7 @@ def git_fetch(v: Verification, channel: Channel) -> None:
 
     v.status('Checking if we already have this rev:')
     process = subprocess.run(
-        ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_commit])
+        ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_revision])
     if process.returncode == 0:
         v.status('yes')
     if process.returncode == 1:
@@ -246,7 +251,7 @@ def git_fetch(v: Verification, channel: Channel) -> None:
         v.result(process.returncode == 0)
         v.status('Verifying that fetch retrieved this rev')
         process = subprocess.run(
-            ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_commit])
+            ['git', '-C', channel.git_cachedir, 'cat-file', '-e', channel.git_revision])
         v.result(process.returncode == 0)
 
     v.status('Verifying rev is an ancestor of ref')
@@ -255,7 +260,7 @@ def git_fetch(v: Verification, channel: Channel) -> None:
                               channel.git_cachedir,
                               'merge-base',
                               '--is-ancestor',
-                              channel.git_commit,
+                              channel.git_revision,
                               channel.git_ref])
     v.result(process.returncode == 0)
 
@@ -308,7 +313,7 @@ def git_checkout(v: Verification, channel: Channel, dest: str) -> None:
                             '-C',
                             channel.git_cachedir,
                             'archive',
-                            channel.git_commit],
+                            channel.git_revision],
                            stdout=subprocess.PIPE)
     tar = subprocess.Popen(
         ['tar', 'x', '-C', dest, '-f', '-'], stdin=git.stdout)
@@ -318,11 +323,37 @@ def git_checkout(v: Verification, channel: Channel, dest: str) -> None:
     v.result(git.returncode == 0 and tar.returncode == 0)
 
 
+def check_channel_metadata(
+        v: Verification,
+        channel: Channel,
+        channel_contents: str) -> None:
+    v.status('Verifying git commit in channel tarball')
+    v.result(
+        open(
+            os.path.join(
+                channel_contents,
+                channel.release_name,
+                '.git-revision')).read(999) == channel.git_revision)
+
+    v.status(
+        'Verifying version-suffix is a suffix of release name %s:' %
+        channel.release_name)
+    version_suffix = open(
+        os.path.join(
+            channel_contents,
+            channel.release_name,
+            '.version-suffix')).read(999)
+    v.status(version_suffix)
+    v.result(channel.release_name.endswith(version_suffix))
+
+
 def check_channel_contents(v: Verification, channel: Channel) -> None:
     with tempfile.TemporaryDirectory() as channel_contents, \
             tempfile.TemporaryDirectory() as git_contents:
 
         extract_tarball(v, channel, channel_contents)
+        check_channel_metadata(v, channel, channel_contents)
+
         git_checkout(v, channel, git_contents)
 
         compare_tarball_and_git(v, channel, channel_contents, git_contents)
@@ -331,17 +362,22 @@ def check_channel_contents(v: Verification, channel: Channel) -> None:
     v.ok()
 
 
-def main() -> None:
+def main(argv: List[str]) -> None:
     v = Verification()
-    channel = Channel(url='https://channels.nixos.org/nixos-20.03',
-                      git_repo='https://github.com/NixOS/nixpkgs.git',
-                      git_ref='nixos-20.03')
-    fetch(v, channel)
-    parse_channel(v, channel)
-    fetch_resources(v, channel)
-    git_fetch(v, channel)
-    check_channel_contents(v, channel)
-    print(channel)
-
-
-main()
+    config = configparser.ConfigParser()
+    config.read_file(open(argv[1]), argv[1])
+    for section in config.sections():
+        channel = Channel(**dict(config[section].items()))
+        fetch(v, channel)
+        parse_channel(v, channel)
+        fetch_resources(v, channel)
+        git_fetch(v, channel)
+        check_channel_contents(v, channel)
+        config[section]['git_rev'] = channel.git_revision
+        config[section]['tarball_url'] = channel.table['nixexprs.tar.xz'].absolute_url
+        config[section]['tarball_sha256'] = channel.table['nixexprs.tar.xz'].digest
+    with open(argv[1], 'w') as configfile:
+        config.write(configfile)
+
+
+main(sys.argv)