Fixing rubocop issues

Author: qount25

exe/pgpm

@@ -109,7 +109,7 @@ module Pgpm
               arch.with_scope do
                 selected_pgdist.with_scope do
                   spec = nil
-                  b = pkgs.reduce(nil) do |c, p|
+                  pkgs.reduce(nil) do |_c, p|
                     p = Pgpm::ScopedObject.new(p, os, arch)
                     spec = p.to_deb_spec
                   end

lib/pgpm/deb/builder.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
+require "English"
 require "debug"
 
 module Pgpm
   module Deb
     class Builder
-
       def initialize(spec)
         @spec = spec
-        @container_name = "pgpm-debian_build-#{Time.now.to_i}_#{rand(10000)}"
-        @pgpm_dir  = Dir.mktmpdir
+        @container_name = "pgpm-debian_build-#{Time.now.to_i}_#{rand(10_000)}"
+        @pgpm_dir = Dir.mktmpdir
       end
 
       def build
@@ -47,16 +47,16 @@ def prepare_versioned_source
 
         fn = nil
         @spec.sources.map do |src|
-          srcfile = File.join("#{@pgpm_dir}", src.name)
+          srcfile = File.join(@pgpm_dir.to_s, src.name)
           File.write(srcfile, src.read)
           fn = src.name
         end
 
         system("tar -xf #{@pgpm_dir}/#{fn} -C #{@pgpm_dir}/source-versioned/")
         FileUtils.remove("#{@pgpm_dir}/#{fn}")
 
-        untar_dir_entries = Dir.entries("#{@pgpm_dir}/source-versioned/").select do |entry|
-          !([".", ".."].include?(entry))
+        untar_dir_entries = Dir.entries("#{@pgpm_dir}/source-versioned/").reject do |entry|
+          [".", ".."].include?(entry)
         end
 
         if untar_dir_entries.size == 1
@@ -68,11 +68,10 @@ def prepare_versioned_source
           end
         end
 
-        ["prepare_artifacts.sh"].each do |fn|
-          script_fn = File.expand_path("#{__dir__}/scripts/#{fn}")
+        ["prepare_artifacts.sh"].each do |f|
+          script_fn = File.expand_path("#{__dir__}/scripts/#{f}")
           FileUtils.cp script_fn, "#{@pgpm_dir}/source-versioned/"
         end
-
       end
 
       def prepare_default_source
@@ -107,22 +106,22 @@ 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
+        if $CHILD_STATUS.to_i.positive? # image doesn't exist -- pull image from a remote repository
           puts "  No. Pulling image #{image_name}..."
           system("podman pull #{image_name}")
         else
           puts "  Yes, image #{image_name} already exists! OK"
         end
       end
 
-      def generate_deb_src_files(pkg_type=:versioned)
+      def generate_deb_src_files(pkg_type = :versioned)
         puts "Generating debian files..."
         Dir.mkdir "#{@pgpm_dir}/source-#{pkg_type}/debian"
-        [:changelog, :control, :copyright, :files, :rules].each do |f|
+        %i[changelog control copyright files rules].each do |f|
           puts "  -> #{@pgpm_dir}/source-#{pkg_type}/debian/#{f}"
           File.write "#{@pgpm_dir}/source-#{pkg_type}/debian/#{f}", @spec.generate(f, pkg_type)
         end
-        File.chmod 0740, "#{@pgpm_dir}/source-#{pkg_type}/debian/rules" # rules file must be executable
+        File.chmod 0o740, "#{@pgpm_dir}/source-#{pkg_type}/debian/rules" # rules file must be executable
       end
 
       def start_container
@@ -134,9 +133,9 @@ def start_container
 
         puts "  Creating and starting container #{@container_name} & running pbuilder"
         system("podman create -it #{create_opts}")
-        exit(1) if $?.to_i > 0
+        exit(1) if $CHILD_STATUS.to_i.positive?
         system("podman start #{@container_name}")
-        exit(1) if $?.to_i > 0
+        exit(1) if $CHILD_STATUS.to_i.positive?
       end
 
       # Prevents clean-up after pbuilder finishes. There's no option
@@ -154,7 +153,7 @@ def patch_pbuilder
         system("podman exec #{@container_name} /bin/bash -c '#{cmd}'")
       end
 
-      def run_build(pkg_type=:versioned)
+      def run_build(pkg_type = :versioned)
         dsc_fn = "#{@spec.deb_pkg_name(pkg_type)}_0-1.dsc"
         deb_fn = "#{@spec.deb_pkg_name(pkg_type)}_0-1_#{@spec.arch}.deb"
 
@@ -166,11 +165,11 @@ def run_build(pkg_type=:versioned)
         puts "  Building package with pbuilder..."
         cmds.each do |cmd|
           system("podman exec -w /root/pgpm/source-#{pkg_type} #{@container_name} /bin/bash -c '#{cmd}'")
-          exit(1) if $?.to_i > 0
+          exit(1) if $CHILD_STATUS.to_i.positive?
         end
       end
 
-      def copy_build_from_container(pkg_type=:versioned)
+      def copy_build_from_container(pkg_type = :versioned)
         puts "Copying .deb file from podman container into current directory..."
         deb_fn = "#{@spec.deb_pkg_name(pkg_type)}_0-1_#{@spec.arch}.deb"
         deb_copy_fn = "#{@spec.deb_pkg_name(pkg_type)}_#{@spec.arch}.deb"
@@ -203,7 +202,6 @@ def selinux_enabled?
         # This returns true or false by itself
         system("sestatus | grep 'SELinux status' | grep -o 'enabled'")
       end
-
     end
   end
 end

lib/pgpm/deb/spec.rb

@@ -20,9 +20,10 @@ def sources
         @package.sources
       end
 
-      def generate(template_name, pkg_type=:versioned)
+      def generate(template_name, pkg_type = :versioned)
         fn = "#{__dir__}/templates/#{template_name}.erb"
         raise "No such template: #{fn}" unless File.exist?(fn)
+
         erb = ERB.new(File.read(fn))
 
         # Uses pkg_type parameter (which is in scope) to generate
@@ -32,10 +33,10 @@ def generate(template_name, pkg_type=:versioned)
 
       def source_version
         v = @package.version.to_s
-        v.match(/\Z\d+\.\d+\Z/) ?  v + ".0" : v
+        v.match(/\Z\d+\.\d+\Z/) ? "#{v}.0" : v
       end
 
-      def deb_pkg_name(type=:versioned)
+      def deb_pkg_name(type = :versioned)
         if type == :versioned
           "#{@package.name.gsub("_", "-")}+#{source_version}-pg#{@package.postgres_major_version}"
         else
@@ -47,23 +48,20 @@ def arch
         # https://memgraph.com/blog/ship-it-on-arm64-or-is-it-aarch64
         # Debian suffixes are "amd64" and "arm64". Here we translate:
         case Pgpm::Arch.in_scope.name
-          when "amd64", "x86_64"
-            "amd64"
-          when "aarch64", "arm64"
-            "arm64"
+        when "amd64", "x86_64"
+          "amd64"
+        when "aarch64", "arm64"
+          "arm64"
         end
       end
 
       def cmds_if_not_empty(cmds, else_echo)
-        if cmds.nil? || cmds.empty?
-          return "\techo \"#{else_echo}\""
-        else
-          cmds.map! { |c| c.to_s }
-          cmds.map! { |c| c.gsub("$", "$$") }
-          return cmds.join("\t")
-        end
-      end
+        return "\techo \"#{else_echo}\"" if cmds.nil? || cmds.empty?
 
+        cmds.map!(&:to_s)
+        cmds.map! { |c| c.gsub("$", "$$") }
+        cmds.join("\t")
+      end
     end
   end
 end

lib/pgpm/os/debian.rb

@@ -29,7 +29,6 @@ def self.builder
       def mock_config
         "debian-12-#{Pgpm::Arch.in_scope.name}+pgdg"
       end
-
     end
   end
 end

lib/pgpm/package/dependencies.rb

@@ -5,7 +5,6 @@
 module Pgpm
   class Package
     module Dependencies
-
       attr_accessor :postgres_major_version
 
       def build_dependencies
@@ -16,7 +15,7 @@ def build_dependencies
             "postgresql-server-dev-#{postgres_major_version}",
             "postgresql-common"
           ]
-          if self.native?
+          if native?
             deps << "build-essential"
           end
         when "rocky+epel-9", "redhat", "fedora"
@@ -27,7 +26,7 @@ def build_dependencies
       def dependencies
         case Pgpm::OS.in_scope.class.name
         when "debian", "ubuntu"
-          [ "postgresql-#{postgres_major_version}" ]
+          ["postgresql-#{postgres_major_version}"]
         when "rocky+epel-9", "redhat", "fedora"
           []
         end
@@ -71,7 +70,6 @@ def sorted_packages
       def c_files_present?
         Dir.glob("*.c", base: source).any?
       end
-
     end
   end
 end

lib/pgpm/package/make.rb

@@ -3,22 +3,19 @@
 module Pgpm
   class Package
     module Make
-
       def build_steps
         [Pgpm::Commands::Make.new("PG_CONFIG=$PG_CONFIG")] if makefile_present?
       end
 
       def install_steps
-        if makefile_present?
-          [Pgpm::Commands::Make.new("install", "DESTDIR=$PGPM_INSTALL_ROOT", "PG_CONFIG=$PG_CONFIG")]
-        end
+        return unless makefile_present?
+
+        [Pgpm::Commands::Make.new("install", "DESTDIR=$PGPM_INSTALL_ROOT", "PG_CONFIG=$PG_CONFIG")]
       end
 
       def makefile_present?
         !Dir.glob(%w[Makefile GNUmakefile makefile], base: source.to_s).empty?
       end
-
     end
-
   end
 end

lib/pgpm/package/packaging.rb

@@ -3,15 +3,13 @@
 module Pgpm
   class Package
     module Packaging
-
       def to_rpm_spec(**opts)
         Pgpm::RPM::Spec.new(self, **opts)
       end
 
       def to_deb_spec(**opts)
         Pgpm::Deb::Spec.new(self, **opts)
       end
-
     end
   end
 end

lib/pgpm/package/pgxn.rb

@@ -58,8 +58,8 @@ def license
       end
 
       def license_text
-        path = "#{self.source.to_s}"
-        ["license", "lisence", "unlicense", "unlisence", "copying"].each do |fn|
+        path = source.to_s
+        %w[license lisence unlicense unlisence copying].each do |fn|
           [fn, fn.capitalize, fn.upcase].each do |fn2|
             ["", ".txt", ".md"].each do |fn3|
               if File.exist?("#{path}/#{fn2}#{fn3}")
@@ -70,7 +70,6 @@ def license_text
         end
         nil
       end
-
     end
   end
 end

packages/pgsodium.rb

@@ -4,22 +4,22 @@ class Pgsodium < Pgpm::Package
   github "michelp/pgsodium"
 
   def build_dependencies
-      deps = case Pgpm::OS.in_scope.class.name
-      when "debian", "ubuntu"
-        ["libsodium-dev (>= 1.0.18)"]
-      when "rocky+epel-9", "redhat", "fedora"
-        ["libsodium-devel >= 1.0.18"]
-      end
-      super + deps
+    deps = case Pgpm::OS.in_scope.class.name
+           when "debian", "ubuntu"
+             ["libsodium-dev (>= 1.0.18)"]
+           when "rocky+epel-9", "redhat", "fedora"
+             ["libsodium-devel >= 1.0.18"]
+           end
+    super + deps
   end
 
   def dependencies
     deps = case Pgpm::OS.in_scope.class.name
-    when "debian", "ubuntu"
-      ["libsodium (>= 1.0.18)"]
-    when "rocky+epel-9", "redhat", "fedora"
-      ["libsodium >= 1.0.18"]
-    end
+           when "debian", "ubuntu"
+             ["libsodium (>= 1.0.18)"]
+           when "rocky+epel-9", "redhat", "fedora"
+             ["libsodium >= 1.0.18"]
+           end
     super + deps
   end
 

packages/timescale/timescaledb.rb

@@ -12,33 +12,33 @@ def self.package_versions
     end
 
     def description
-      "An open-source time-series SQL database optimized for fast ingest and " +
-      "complex queries"
+      "An open-source time-series SQL database optimized for fast ingest and " \
+        "complex queries"
     end
 
     def summary
-        "TimescaleDB is an open-source database designed to make SQL "        +
-        "scalable for time-series data. It is engineered up from PostgreSQL " +
-        "and packaged as a PostgreSQL extension, providing automatic "        +
-        "partitioning across time and space (partitioning key), as well as "  +
+      "TimescaleDB is an open-source database designed to make SQL "        \
+        "scalable for time-series data. It is engineered up from PostgreSQL " \
+        "and packaged as a PostgreSQL extension, providing automatic "        \
+        "partitioning across time and space (partitioning key), as well as "  \
         "full SQL support."
     end
 
     def dependencies
       deps = case Pgpm::OS.in_scope.class.name
-      when "rocky+epel-9", "redhat", "fedora"
-        ["openssl"]
-      end
+             when "rocky+epel-9", "redhat", "fedora"
+               ["openssl"]
+             end
       super + deps
     end
 
     def build_dependencies
       deps = case Pgpm::OS.in_scope.class.name
-      when "debian", "ubuntu"
-        ["libssl-dev", "cmake"]
-      when "rocky+epel-9", "redhat", "fedora"
-        ["openssl-devel", "cmake"]
-      end
+             when "debian", "ubuntu"
+               %w[libssl-dev cmake]
+             when "rocky+epel-9", "redhat", "fedora"
+               %w[openssl-devel cmake]
+             end
       super + deps
     end
 
@@ -77,6 +77,5 @@ def install_steps
     def bootstrap_flags
       []
     end
-
   end
 end