Move package logic into function

libraries/helpers.rb

@@ -23,13 +23,17 @@ module Cookbook
     module Helpers
       include Utils
 
-      def installed_postgresql_major_version
+      def installed_postgresql_package_logic
         pgsql_package = node['packages'].filter { |p| p.match?(/^postgresql-?(\d+)?$/) }
-        pgsql_package = pgsql_package.sort_by { |key, _values| key[1].to_i }.to_h
+        pgsql_package = pgsql_package.sort_by { |key, _values| key }.to_h
 
         raise 'Unable to determine installed PostgreSQL version' if nil_or_empty?(pgsql_package)
 
-        pgsql_package = pgsql_package.values.first
+        pgsql_package.values.first
+      end
+
+      def installed_postgresql_major_version
+        pgsql_package = installed_postgresql_package_logic
         pgsql_package_version = pgsql_package.fetch('version').to_i
         pgsql_package_source = if pgsql_package.key?('release')
                                  pgsql_package.fetch('release').match?('PGDG') ? :repo : :os
@@ -43,12 +47,7 @@ def installed_postgresql_major_version
       end
 
       def installed_postgresql_package_source
-        pgsql_package = node['packages'].filter { |p| p.match?(/^postgresql-?(\d+)?$/) }
-        pgsql_package = pgsql_package.sort_by { |key, _values| key[1].to_i }.to_h
-
-        raise 'Unable to determine installed PostgreSQL version' if nil_or_empty?(pgsql_package)
-
-        pgsql_package = pgsql_package.values.first
+        pgsql_package = installed_postgresql_package_logic
         pgsql_package_version = pgsql_package.fetch('version').to_i
         pgsql_package_source = if pgsql_package.key?('release')
                                  pgsql_package.fetch('release').match?('PGDG') ? :repo : :os