Merge pull request #968 from travis-ci/meat-postgresql-versions

Consolidate postgresql version listing methods

Author: meatballhat

cookbooks/travis_postgresql/libraries/travis_postgresql_methods.rb

@@ -0,0 +1,11 @@
+module TravisPostgresqlMethods
+  def pg_versions(node)
+    values = [node['travis_postgresql']['default_version']]
+    Array(node['travis_postgresql']['alternate_versions']).each do |pg_version|
+      values << pg_version
+    end
+    values
+  end
+
+  module_function :pg_versions
+end

cookbooks/travis_postgresql/recipes/all_packages.rb

@@ -3,13 +3,13 @@
 
 include_recipe 'travis_postgresql::client'
 
-Array(
-  [
-    node['travis_postgresql']['default_version']
-  ] + node['travis_postgresql']['alternate_versions']
-).each do |pg_version|
-  package "postgresql-#{pg_version}"
-  package "postgresql-contrib-#{pg_version}" if node['travis_postgresql']['contrib_modules']
-end
+package(
+  TravisPostgresqlMethods.pg_versions(node).map do |v|
+    %W[
+      postgresql-#{v}
+      #{node['travis_postgresql']['contrib_modules'] ? "postgresql-contrib-#{v}" : ''}
+    ]
+  end.flatten
+)
 
 include_recipe 'travis_postgresql::postgis' if node['travis_postgresql']['postgis_version']

cookbooks/travis_postgresql/recipes/ci_server.rb

@@ -46,11 +46,7 @@
   only_if { node['lsb']['codename'] == 'xenial' }
 end
 
-Array(
-  [
-    node['travis_postgresql']['default_version']
-  ] + node['travis_postgresql']['alternate_versions']
-).each do |pg_version|
+TravisPostgresqlMethods.pg_versions(node).each do |pg_version|
   template "/etc/postgresql/#{pg_version}/main/postgresql.conf" do
     source "#{pg_version}/postgresql.conf.erb"
     owner 'postgres'

cookbooks/travis_postgresql/recipes/postgis.rb

@@ -1,10 +1,7 @@
 ppv = node['travis_postgresql']['postgis_version']
 
 package(
-  (
-    [node['travis_postgresql']['default_version']] +
-    node['travis_postgresql']['alternate_versions']
-  ).map do |v|
+  TravisPostgresqlMethods.pg_versions(node).map do |v|
     %W[
       postgresql-#{v}-postgis-#{ppv}
       postgresql-#{v}-postgis-#{ppv}-scripts