Refactor: replace most hardcoded values for Pgpm::Deb::Spec with values from @Package

Author: qount25

lib/pgpm/deb/builder.rb

@@ -6,12 +6,10 @@ class Builder
 
       def initialize(spec)
         @spec = spec
-        @image_name = "quay.io/qount25/pgpm-debian12"
         @container_name = "pgpm-debian12_build-#{Time.now.to_i}_#{rand(10000)}"
       end
 
       def build
-        puts "build()"
         prepare
         generate_deb_src_files
         create_container
@@ -22,6 +20,11 @@ def build
 
       private
 
+      # Depends on postgres version and arch
+      def image_name
+        "quay.io/qount25/pgpm-debian-pg#{@spec.postgres_major_version}-#{@spec.arch}"
+      end
+
       def prepare
         puts "Preparing build..."
         puts "  Creating container dir structure..."
@@ -35,18 +38,18 @@ def prepare
       def create_container
         puts "Creating a podman container..."
         # Check if image exists
-        system("podman image exists #{@image_name}")
+        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 "  Pulling image #{image_name}..."
           system("podman pull quay.io/qount25/pgpm-debian12")
         else
-          puts "  Image #{@image_name} already exists! OK"
+          puts "  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}"
+        create_opts += " --name #{@container_name} #{image_name}"
 
         puts "  Creating and starting container #{@container_name}"
         puts "    podman run -dti #{create_opts}"
@@ -76,7 +79,6 @@ def run_pbuilder
       def copy_build_from_container
         puts "Moving .deb file from podman container into current directory..."
         cmd_pref = "podman exec #{@container_name} "
-        arch = "amd64"
         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)

lib/pgpm/deb/spec.rb

@@ -28,47 +28,35 @@ def generate(template_name)
       end
 
       def deps
-        ["postgresql-#{postgres_version}"]
+        ["postgresql-#{postgres_major_version}"]
       end
 
       def build_deps
         [
-          "postgresql-#{postgres_version}",
+          "postgresql-#{postgres_major_version}",
           "build-essential",
-          "postgresql-#{postgres_version}",
-          "postgresql-server-dev-#{postgres_version}",
+          "postgresql-#{postgres_major_version}",
+          "postgresql-server-dev-#{postgres_major_version}",
           "postgresql-common"
         ]
       end
 
-      def postgres_version
-        17
+      def postgres_major_version
+        @spec.postgres_distribution.version.split(".")[0]
       end
 
       def source_version
         @package.version.to_s
       end
 
-      def source_name
-        @package.name
-      end
-
       def full_pkg_name
         "#{@package.name}-#{@package.version.to_s}_0-1_#{arch}"
       end
 
-      def deb_version
-        "0.1.0"
-      end
-
       def arch
         "amd64"
       end
 
-      def description
-        @package.description
-      end
-
       # Whatever is returned from this method gets added to the "rules" file.
       def rules_amendments
         "#"

lib/pgpm/deb/templates/control.erb

@@ -1,13 +1,13 @@
-Source: <%= source_name %>-<%= source_version %>
+Source: <%= self.package.name %>-<%= source_version %>
 Section: libs
 Priority: optional
 Maintainer: PGPM Debian maintainer <debian[email protected]>
 Rules-Requires-Root: no
 Build-Depends: debhelper-compat (= 13), <%= build_deps.join(", ") %>
 Standards-Version: 4.6.2
 
-Package: <%= source_name %>-<%= source_version %>
+Package: <%= self.package.name %>-<%= source_version %>
 Depends: <%= deps.join(", ") %>
 Section: libdevel
 Architecture: <%= arch %>
-Description: <%= description %>
+Description: <%= self.package.description %>

lib/pgpm/deb/templates/copyright.erb

@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: <url://example.com>
-Upstream-Name: <%= source_name %>-<%= source_version %>
+Upstream-Name: <%= self.package.name %>-<%= self.package.name %>
 Upstream-Contact: <preferred name and address to reach the upstream project>
 
 Files:

lib/pgpm/deb/templates/files.erb

@@ -1 +1 @@
-<%= source_name %>-<%= source_version %>_0-1_source.buildinfo libs optional
+<%= self.package.name %>-<%= source_version %>_0-1_source.buildinfo libs optional

lib/pgpm/package/packaging.rb

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