X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/57997055a817d2104f605a56141ae26515aabbd2..cc6b107e2e4aa6d7b882d4fb626a1a80a41104c8:/cookbooks/postgresql/libraries/postgresql.rb?ds=sidebyside diff --git a/cookbooks/postgresql/libraries/postgresql.rb b/cookbooks/postgresql/libraries/postgresql.rb index 05bf158f2..266a7b833 100644 --- a/cookbooks/postgresql/libraries/postgresql.rb +++ b/cookbooks/postgresql/libraries/postgresql.rb @@ -1,4 +1,4 @@ -require 'chef/mixin/command' +require "chef/mixin/command" class Chef class PostgreSQL @@ -6,7 +6,7 @@ class Chef TABLE_PRIVILEGES = [ :select, :insert, :update, :delete, :truncate, :references, :trigger - ] + ].freeze def initialize(cluster) @cluster = cluster @@ -105,11 +105,11 @@ class Chef end end - private + private def parse_acl(acl) acl.sub(/^\{(.*)\}$/, "\\1").split(",").each_with_object({}) do |entry, permissions| - entry = entry.sub(/^"(.*)"$/) { Regexp.last_match[1].gsub(/\\"/, '"') }.sub(/\/.*$/, "") + entry = entry.sub(/^"(.*)"$/) { Regexp.last_match[1].gsub(/\\"/, '"') }.sub(%r{/.*$}, "") user, privileges = entry.split("=") user = user.sub(/^"(.*)"$/, "\\1") @@ -118,7 +118,7 @@ class Chef permissions[user] = { "a" => :insert, "r" => :select, "w" => :update, "d" => :delete, "D" => :truncate, "x" => :references, "t" => :trigger - }.values_at(*(privileges.chars)).compact + }.values_at(*privileges.chars).compact end end end