Refactor: make build run all podman commands in one go, then exit

Author: qount25

lib/pgpm/deb/builder.rb

@@ -6,14 +6,14 @@ class Builder
 
       def initialize(spec)
         @spec = spec
-        @container_name = "pgpm-debian12_build-#{Time.now.to_i}_#{rand(10000)}"
+        @container_name = "pgpm-debian_build-#{Time.now.to_i}_#{rand(10000)}"
       end
 
       def build
         prepare
         generate_deb_src_files
-        create_container
-        run_pbuilder
+        pull_image
+        run_build
         copy_build_from_container
         cleanup
       end
@@ -35,25 +35,16 @@ def prepare
         FileUtils.copy_entry @spec.package.source.to_s, "#{@pgpm_dir}/source/"
       end
 
-      def create_container
-        puts "Creating a podman container..."
+      def pull_image
+        puts "Checking if podman image exists..."
         # Check if image exists
         system("podman image exists #{image_name}")
         if $?.to_i > 0 # image doesn't exist -- pull image from a remote repository
-          puts "  Pulling image #{image_name}..."
+          puts "  No. Pulling image #{image_name}..."
           system("podman pull quay.io/qount25/pgpm-debian12")
         else
-          puts "  Image #{image_name} already exists! OK"
+          puts "  Yes, image #{image_name} already exists! OK"
         end
-
-        create_opts = " -v #{@pgpm_dir}:/root/pgpm"
-        create_opts += ":z" if selinux_enabled?
-        create_opts += " --privileged --annotation run.oci.keep_original_groups=1"
-        create_opts += " --name #{@container_name} #{image_name}"
-
-        puts "  Creating and starting container #{@container_name}"
-        puts "    podman run -dti #{create_opts}"
-        system("podman run -dti #{create_opts}")
       end
 
       def generate_deb_src_files
@@ -66,27 +57,33 @@ def generate_deb_src_files
         File.chmod 0740, "#{@pgpm_dir}/source/debian/rules" # rules file must be executable
       end
 
-      def run_pbuilder
-        puts "Building a .deb package with pbuilder..."
-        cmd_pref = "podman exec -w /root/pgpm/source #{@container_name} "
-        system("#{cmd_pref} dpkg-buildpackage --build=source")
-        exit(1) if $?.to_i > 0
+      def run_build
+        # podman run options
+        create_opts = " -v #{@pgpm_dir}:/root/pgpm"
+        create_opts += ":z" if selinux_enabled?
+        create_opts += " --privileged --annotation run.oci.keep_original_groups=1"
+        create_opts += " --name #{@container_name} #{image_name}"
+
         dsc_fn = "#{@spec.package.name}-#{@spec.package.version.to_s}_0-1.dsc"
-        system("#{cmd_pref} fakeroot pbuilder build ../#{dsc_fn}")
+        deb_fn = "#{@spec.full_pkg_name}.deb"
+
+        # commands to run
+        cmds = " /bin/bash -c 'cd /root/pgpm/source"
+        cmds += " && dpkg-buildpackage --build=source"
+        cmds += " && fakeroot pbuilder build ../#{dsc_fn}"
+        cmds += " && mv /var/cache/pbuilder/result/#{deb_fn} /root/pgpm/out/'"
+
+        puts "  Creating and starting container #{@container_name} & running pbuilder"
+        system("podman run -it #{create_opts} #{cmds}")
         exit(1) if $?.to_i > 0
       end
 
       def copy_build_from_container
         puts "Moving .deb file from podman container into current directory..."
-        cmd_pref = "podman exec #{@container_name} "
         deb_fn = "#{@spec.full_pkg_name}.deb"
-        system("#{cmd_pref} mv /var/cache/pbuilder/result/#{deb_fn} /root/pgpm/out/")
         FileUtils.mv("#{@pgpm_dir}/out/#{deb_fn}", Dir.pwd)
       end
 
-      def run_container_command(cmd)
-      end
-
       def cleanup
         puts "Cleaning up..."
 

lib/pgpm/deb/spec.rb

@@ -42,7 +42,7 @@ def build_deps
       end
 
       def postgres_major_version
-        @spec.postgres_distribution.version.split(".")[0]
+        self.postgres_distribution.version.split(".")[0]
       end
 
       def source_version

lib/pgpm/deb/templates/changelog.erb

@@ -1,4 +1,4 @@
-<%= source_name %>-<%= source_version %> (0-1) UNRELEASED; urgency=medium
+<%= self.package.name %>-<%= source_version %> (0-1) UNRELEASED; urgency=medium
 
   * Initial release. (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 

lib/pgpm/package/packaging.rb

@@ -9,7 +9,6 @@ def to_rpm_spec(**opts)
       end
 
       def to_deb_spec(**opts)
-binding.break
         Pgpm::Deb::Spec.new(self, **opts)
       end
 

lib/pgpm/scoped_object.rb

@@ -7,7 +7,6 @@ class ScopedObject < SimpleDelegator
     def initialize(obj, *scopes)
       @scopes = scopes
       super(obj)
-binding.break
     end
 
     def method_missing(method, *args, &block)