Problem: building extensions that require other extensions

This doesn't currently work because we try to install those other extensions in
the last build and they are not available.

Solution: build them together with the package

The implementation is currently very, very hacky – that Proc refinement is just
a massive hack. I've also fixed rebuild chaining but it is extremely brittle as
well.

But at least it works. I think.

Author: yrashk

exe/pgpm

@@ -41,6 +41,22 @@ module Pgpm
         option :path, type: :path, desc: "Override path to the source"
         argument :packages, type: :array, required: true, desc: "Package names"
 
+        module ExtendedProc
+          refine Proc do
+            def and_then(callable)
+              lambda do |*args|
+                res1 = call(*args)
+                res2 = callable.call(*args)
+                return res1 + res2 if res1.is_a?(Array) && res2.is_a?(Array)
+
+                res2
+              end
+            end
+          end
+        end
+
+        using ExtendedProc
+
         # rubocop:disable Metrics/ParameterLists:
         def call(packages:, args: nil, os: nil, arch: nil, pgdist: nil, pgver: nil, pkgdir: nil, path: nil)
           _ = args
@@ -95,6 +111,10 @@ module Pgpm
           os.with_scope do
             arch.with_scope do
               selected_pgdist.with_scope do
+                pkgs = pkgs.flat_map do |pkg|
+                  [pkg, *pkg.requires]
+                end
+
                 b = pkgs.reduce(nil) do |c, p|
                   if p.broken?
                     puts "Can't build a broken package #{p.name}@#{p.version}"

lib/pgpm/rpm/mock/operation.rb

@@ -68,24 +68,19 @@ def call
         def chain(op)
           raise ArgumentError, "can't chain non-rebuild operations" unless op.args.include?("--rebuild") && @args.include?("--rebuild")
 
-          args = @args.clone
-          args.insert(@args.index("--localrepo") - 1, op.args[op.args.index("--localrepo") - 1])
-          self.class.new(*args, cb: lambda {
-            res1 = @cb&.call
-            res2 = op.cb&.call
-            return res1 + res2 if res1.is_a?(Array) && res2.is_a?(Array)
-
-            res2
-          })
+          self.args.insert(self.args.index("--localrepo"), *op.args[op.args.index("--recurse") + 1..op.args.index("--localrepo")-1])
+          self
         end
 
         def and_then(op)
           lambda do
             res1 = call
             res2 = op.call
-            return res1 + res2 if res1.is_a?(Array) && res2.is_a?(Array)
-
-            [res1, res2]
+            if res1.is_a?(Array) && res2.is_a?(Array)
+              res1 + res2
+            else
+              [res1, res2]
+            end
           end
         end
       end