[gnome-ostree] qa: Drain more code into LibQA

[Colin Walters <walters src gnome org>]

commit 3bc84dd411550d167a4c905d4c19a9aa2dc43cfd
Author: Colin Walters <walters verbum org>
Date:   Thu Jan 17 19:03:32 2013 -0500

    qa: Drain more code into LibQA
    
    This is where it should be.

 src/ostbuild/js/builtins/qa_pull_deploy.js |  114 +--------------------------
 src/ostbuild/js/libqa.js                   |  109 ++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 109 deletions(-)
---
diff --git a/src/ostbuild/js/builtins/qa_pull_deploy.js b/src/ostbuild/js/builtins/qa_pull_deploy.js
index 183dc12..b87a016 100644
--- a/src/ostbuild/js/builtins/qa_pull_deploy.js
+++ b/src/ostbuild/js/builtins/qa_pull_deploy.js
@@ -33,109 +33,6 @@ const loop = GLib.MainLoop.new(null, true);
 const QaPullDeploy = new Lang.Class({
     Name: 'QaPullDeploy',
 
-    _findCurrentKernel: function(mntdir, osname, cancellable) {
-        let deployBootdir = mntdir.resolve_relative_path('ostree/deploy/' + osname + '/current/boot');
-        let d = deployBootdir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS, cancellable);
-	      let finfo;
-        try {
-	          while ((finfo = d.next_file(cancellable)) != null) {
-	              let child = deployBootdir.get_child(finfo.get_name());
-	              if (child.get_basename().indexOf('vmlinuz-') == 0) {
-                    return child;
-                }
-            }
-            throw new Error("Couldn't find vmlinuz- in " + deployBootdir.get_path());
-        } finally {
-            d.close(null);
-        }
-    },
-
-    _parseKernelRelease: function(kernelPath) {
-        let name = kernelPath.get_basename();
-        let idx = name.indexOf('-');
-        if (idx == -1) throw new Error("Invalid kernel name " + kernelPath.get_path());
-        let kernelRelease = name.substr(idx + 1);
-        return kernelRelease;
-    },
-
-    _getInitramfsPath: function(mntdir, kernelRelease) {
-        let bootdir = mntdir.get_child('boot');
-        let initramfsName = 'initramfs-' + kernelRelease + '.img';
-        let path = bootdir.resolve_relative_path('ostree/' + initramfsName);
-        if (!path.query_exists(null))
-            throw new Error("Couldn't find initramfs " + path.get_path());
-        return path;
-    },
-
-    _doPullDeloy: function(args, cancellable) {
-        let mntdir = this._mntdir;
-        let bootdir = mntdir.get_child('boot');
-        let ostreedir = mntdir.get_child('ostree');
-        let ostree_osdir = ostreedir.resolve_relative_path('deploy/' + args.osname);
-
-        let adminCmd = ['ostree', 'admin', '--ostree-dir=' + ostreedir.get_path(),
-                        '--boot-dir=' + mntdir.get_child('boot').get_path()];
-        let adminEnv = GLib.get_environ();
-        adminEnv.push('LIBGSYSTEM_ENABLE_GUESTFS_FUSE_WORKAROUND=1');
-        let procdir = mntdir.get_child('proc');
-        if (!procdir.query_exists(cancellable)) {
-            ProcUtil.runSync(adminCmd.concat(['init-fs', mntdir.get_path()]), cancellable,
-                             {logInitiation: true, env: adminEnv});
-        }
-
-        // *** NOTE ***
-        // Here we blow away any current deployment.  This is pretty lame, but it
-        // avoids us triggering a variety of guestfs/FUSE bugs =(
-        // See: https://bugzilla.redhat.com/show_bug.cgi?id=892834
-        //
-        // But regardless, it's probably useful if every
-        // deployment starts clean, and callers can use libguestfs
-        // to crack the FS open afterwards and modify config files
-        // or the like.
-        GSystem.shutil_rm_rf(ostree_osdir, cancellable);
-
-        ProcUtil.runSync(adminCmd.concat(['os-init', args.osname]), cancellable,
-                         {logInitiation: true, env: adminEnv});
-        ProcUtil.runSync(['ostree', '--repo=' + ostreedir.get_child('repo').get_path(),
-                          'pull-local', args.srcrepo, args.target], cancellable,
-                         {logInitiation: true, env: adminEnv});
-
-        ProcUtil.runSync(adminCmd.concat(['deploy', '--no-kernel', args.osname, args.target]), cancellable,
-                         {logInitiation: true, env: adminEnv});
-        ProcUtil.runSync(adminCmd.concat(['update-kernel', '--no-bootloader', args.osname]), cancellable,
-                         {logInitiation: true, env: adminEnv});
-        ProcUtil.runSync(adminCmd.concat(['prune', args.osname]), cancellable,
-                         {logInitiation: true, env: adminEnv});
-
-        let deployKernelPath = this._findCurrentKernel(mntdir, args.osname, cancellable);
-        let bootKernelPath = bootdir.resolve_relative_path('ostree/' + deployKernelPath.get_basename());
-        if (!bootKernelPath.query_exists(cancellable))
-            throw new Error("" + bootKernelPath.get_path() + " doesn't exist");
-        let kernelRelease = this._parseKernelRelease(deployKernelPath);
-        let initramfsPath = this._getInitramfsPath(mntdir, kernelRelease);
-
-        let defaultFstab = 'LABEL=gnostree-root / ext4 defaults 1 1\n\
-LABEL=gnostree-boot /boot ext4 defaults 1 2\n\
-LABEL=gnostree-swap swap swap defaults 0 0\n';
-        let fstabPath = ostreedir.resolve_relative_path('deploy/gnome-ostree/current-etc/fstab'); 
-        fstabPath.replace_contents(defaultFstab, null, false, Gio.FileCreateFlags.REPLACE_DESTINATION, cancellable);
-        
-        let grubDir = mntdir.resolve_relative_path('boot/grub');
-        GSystem.file_ensure_directory(grubDir, false, cancellable);
-        let bootRelativeKernelPath = bootdir.get_relative_path(bootKernelPath);
-        if (bootRelativeKernelPath == null)
-            throw new Error("" + bootKernelPath.get_path() + " is not relative to " + bootdir.get_path());
-        let bootRelativeInitramfsPath = bootdir.get_relative_path(initramfsPath);
-        let grubConfPath = grubDir.get_child('grub.conf');
-        let grubConf = Format.vprintf('default=0\n\
-timeout=5\n\
-title %s\n\
-root (hd0,0)\n\
-kernel /%s root=LABEL=gnostree-root ostree=%s/current\n\
-initrd /%s\n', [args.osname, bootRelativeKernelPath, args.osname, bootRelativeInitramfsPath]);
-        grubConfPath.replace_contents(grubConf, null, false, Gio.FileCreateFlags.REPLACE_DESTINATION, cancellable);
-    },
-
     execute: function(argv) {
         let cancellable = null;
         let parser = new ArgParse.ArgumentParser("Generate a disk image");
@@ -152,18 +49,17 @@ initrd /%s\n', [args.osname, bootRelativeKernelPath, args.osname, bootRelativeIn
         this._mntdir = this._workdir.get_child('mnt');
         GSystem.file_ensure_directory(this._mntdir, true, cancellable);
 
-        let gfmnt = new GuestFish.GuestMount(diskpath, {partitionOpts: LibQA.DEFAULT_GF_PARTITION_OPTS,
-                                                        readWrite: true});
+        let gfmnt = new GuestFish.GuestMount(diskpath, { partitionOpts: LibQA.DEFAULT_GF_PARTITION_OPTS,
+                                                         readWrite: true });
         gfmnt.mount(this._mntdir, cancellable);
         try {
-            this._doPullDeloy(args, cancellable);
+            LibQA.pullDeploy(this._mntdir, Gio.File.new_for_path(args.srcrepo),
+                             args.osname, args.target, cancellable);
         } finally {
             gfmnt.umount(cancellable);
         }
 
-        let gf = new GuestFish.GuestFish(diskpath, {partitionOpts: ['-m', '/dev/sda3', '-m', '/dev/sda1:/boot'],
-                                                    readWrite: true});
-        gf.run('grub-install / /dev/vda\n', cancellable);
+        LibQA.grubInstall(diskpath, cancellable);
         print("Complete!");
     }
 });
diff --git a/src/ostbuild/js/libqa.js b/src/ostbuild/js/libqa.js
index 1b45378..6d2b5d2 100644
--- a/src/ostbuild/js/libqa.js
+++ b/src/ostbuild/js/libqa.js
@@ -32,6 +32,7 @@ const DEFAULT_QEMU_OPTS = ['-vga', 'std', '-m', '768M',
 
 function newReadWriteMount(diskpath, cancellable) {
     let mntdir = Gio.File.new_for_path('mnt');
+    GSystem.file_ensure_directory(mntdir, true, cancellable);
     let gfmnt = new GuestFish.GuestMount(diskpath, {partitionOpts: DEFAULT_GF_PARTITION_OPTS,
                                                     readWrite: true});
     gfmnt.mount(mntdir, cancellable);
@@ -89,3 +90,111 @@ function modifyBootloaderAppendKernelArgs(mntdir, kernelArgs, cancellable) {
     grubConfPath.replace_contents(modifiedGrubConf, null, false, Gio.FileCreateFlags.NONE,
 				  cancellable);
 }
+
+function _findCurrentKernel(mntdir, osname, cancellable) {
+    let deployBootdir = mntdir.resolve_relative_path('ostree/deploy/' + osname + '/current/boot');
+    let d = deployBootdir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS, cancellable);
+    let finfo;
+    try {
+	while ((finfo = d.next_file(cancellable)) != null) {
+	    let child = deployBootdir.get_child(finfo.get_name());
+	    if (child.get_basename().indexOf('vmlinuz-') == 0) {
+                return child;
+            }
+        }
+        throw new Error("Couldn't find vmlinuz- in " + deployBootdir.get_path());
+    } finally {
+        d.close(null);
+    }
+};
+
+function _parseKernelRelease(kernelPath) {
+    let name = kernelPath.get_basename();
+    let idx = name.indexOf('-');
+    if (idx == -1) throw new Error("Invalid kernel name " + kernelPath.get_path());
+    let kernelRelease = name.substr(idx + 1);
+    return kernelRelease;
+};
+
+function _getInitramfsPath(mntdir, kernelRelease) {
+    let bootdir = mntdir.get_child('boot');
+    let initramfsName = 'initramfs-' + kernelRelease + '.img';
+    let path = bootdir.resolve_relative_path('ostree/' + initramfsName);
+    if (!path.query_exists(null))
+        throw new Error("Couldn't find initramfs " + path.get_path());
+    return path;
+};
+
+function pullDeploy(mntdir, srcrepo, osname, target, cancellable) {
+    let bootdir = mntdir.get_child('boot');
+    let ostreedir = mntdir.get_child('ostree');
+    let ostree_osdir = ostreedir.resolve_relative_path('deploy/' + osname);
+
+    let adminCmd = ['ostree', 'admin', '--ostree-dir=' + ostreedir.get_path(),
+                    '--boot-dir=' + mntdir.get_child('boot').get_path()];
+    let adminEnv = GLib.get_environ();
+    adminEnv.push('LIBGSYSTEM_ENABLE_GUESTFS_FUSE_WORKAROUND=1');
+    let procdir = mntdir.get_child('proc');
+    if (!procdir.query_exists(cancellable)) {
+        ProcUtil.runSync(adminCmd.concat(['init-fs', mntdir.get_path()]), cancellable,
+                         {logInitiation: true, env: adminEnv});
+    }
+
+    // *** NOTE ***
+    // Here we blow away any current deployment.  This is pretty lame, but it
+    // avoids us triggering a variety of guestfs/FUSE bugs =(
+    // See: https://bugzilla.redhat.com/show_bug.cgi?id=892834
+    //
+    // But regardless, it's probably useful if every
+    // deployment starts clean, and callers can use libguestfs
+    // to crack the FS open afterwards and modify config files
+    // or the like.
+    GSystem.shutil_rm_rf(ostree_osdir, cancellable);
+
+    ProcUtil.runSync(adminCmd.concat(['os-init', osname]), cancellable,
+                     {logInitiation: true, env: adminEnv});
+    ProcUtil.runSync(['ostree', '--repo=' + ostreedir.get_child('repo').get_path(),
+                      'pull-local', srcrepo.get_path(), target], cancellable,
+                     {logInitiation: true, env: adminEnv});
+
+    ProcUtil.runSync(adminCmd.concat(['deploy', '--no-kernel', osname, target]), cancellable,
+                     {logInitiation: true, env: adminEnv});
+    ProcUtil.runSync(adminCmd.concat(['update-kernel', '--no-bootloader', osname]), cancellable,
+                     {logInitiation: true, env: adminEnv});
+    ProcUtil.runSync(adminCmd.concat(['prune', osname]), cancellable,
+                     {logInitiation: true, env: adminEnv});
+
+    let deployKernelPath = this._findCurrentKernel(mntdir, osname, cancellable);
+    let bootKernelPath = bootdir.resolve_relative_path('ostree/' + deployKernelPath.get_basename());
+    if (!bootKernelPath.query_exists(cancellable))
+        throw new Error("" + bootKernelPath.get_path() + " doesn't exist");
+    let kernelRelease = this._parseKernelRelease(deployKernelPath);
+    let initramfsPath = this._getInitramfsPath(mntdir, kernelRelease);
+
+    let defaultFstab = 'LABEL=gnostree-root / ext4 defaults 1 1\n\
+LABEL=gnostree-boot /boot ext4 defaults 1 2\n\
+LABEL=gnostree-swap swap swap defaults 0 0\n';
+    let fstabPath = ostreedir.resolve_relative_path('deploy/gnome-ostree/current-etc/fstab'); 
+    fstabPath.replace_contents(defaultFstab, null, false, Gio.FileCreateFlags.REPLACE_DESTINATION, cancellable);
+    
+    let grubDir = mntdir.resolve_relative_path('boot/grub');
+    GSystem.file_ensure_directory(grubDir, false, cancellable);
+    let bootRelativeKernelPath = bootdir.get_relative_path(bootKernelPath);
+    if (bootRelativeKernelPath == null)
+        throw new Error("" + bootKernelPath.get_path() + " is not relative to " + bootdir.get_path());
+    let bootRelativeInitramfsPath = bootdir.get_relative_path(initramfsPath);
+    let grubConfPath = grubDir.get_child('grub.conf');
+    let grubConf = Format.vprintf('default=0\n\
+timeout=3\n\
+title %s\n\
+root (hd0,0)\n\
+kernel /%s root=LABEL=gnostree-root ostree=%s/current\n\
+initrd /%s\n', [osname, bootRelativeKernelPath, osname, bootRelativeInitramfsPath]);
+    grubConfPath.replace_contents(grubConf, null, false, Gio.FileCreateFlags.REPLACE_DESTINATION, cancellable);
+};
+
+function grubInstall(diskpath, cancellable) {
+    let gf = new GuestFish.GuestFish(diskpath, {partitionOpts: ['-m', '/dev/sda3', '-m', '/dev/sda1:/boot'],
+                                                readWrite: true});
+    gf.run('grub-install / /dev/vda\n', cancellable);
+}