Fix detection of munin clients

[chef.git] / cookbooks / postgresql / libraries / postgresql.rb

diff --git a/cookbooks/postgresql/libraries/postgresql.rb b/cookbooks/postgresql/libraries/postgresql.rb
index c12174753b14ecbb8fb867b2e27b47cd3ffcb985..6960ec9890b9db2c6d69855b52b0c9235f4466bb 100644 (file)
--- 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
 
 class Chef
   class PostgreSQL


@@ -63,7 +63,7 @@ class Chef
     end
 
     def users
     end
 
     def users

-      @users ||= query("SELECT * FROM pg_user").each_with_oject({}) do |users, user|
+      @users ||= query("SELECT * FROM pg_user").each_with_object({}) do |user, users|

         users[user[:usename]] = {
           :superuser => user[:usesuper] == "t",
           :createdb => user[:usercreatedb] == "t",
         users[user[:usename]] = {
           :superuser => user[:usesuper] == "t",
           :createdb => user[:usercreatedb] == "t",


@@ -74,7 +74,7 @@ class Chef
     end
 
     def databases
     end
 
     def databases

-      @databases ||= query("SELECT d.datname, u.usename, d.encoding, d.datcollate, d.datctype FROM pg_database AS d INNER JOIN pg_user AS u ON d.datdba = u.usesysid").each_with_object({}) do |databases, database|
+      @databases ||= query("SELECT d.datname, u.usename, d.encoding, d.datcollate, d.datctype FROM pg_database AS d INNER JOIN pg_user AS u ON d.datdba = u.usesysid").each_with_object({}) do |database, databases|

         databases[database[:datname]] = {
           :owner => database[:usename],
           :encoding => database[:encoding],
         databases[database[:datname]] = {
           :owner => database[:usename],
           :encoding => database[:encoding],


@@ -86,7 +86,7 @@ class Chef
 
     def extensions(database)
       @extensions ||= {}
 
     def extensions(database)
       @extensions ||= {}

-      @extensions[database] ||= query("SELECT extname, extversion FROM pg_extension", :database => database).each_with_object({}) do |extensions, extension|
+      @extensions[database] ||= query("SELECT extname, extversion FROM pg_extension", :database => database).each_with_object({}) do |extension, extensions|

         extensions[extension[:extname]] = {
           :version => extension[:extversion]
         }
         extensions[extension[:extname]] = {
           :version => extension[:extversion]
         }


@@ -95,7 +95,7 @@ class Chef
 
     def tables(database)
       @tables ||= {}
 
     def tables(database)
       @tables ||= {}

-      @tables[database] ||= query("SELECT n.nspname, c.relname, u.usename, c.relacl FROM pg_class AS c INNER JOIN pg_user AS u ON c.relowner = u.usesysid INNER JOIN pg_namespace AS n ON c.relnamespace = n.oid", :database => database).each_with_object({}) do |tables, table|
+      @tables[database] ||= query("SELECT n.nspname, c.relname, u.usename, c.relacl FROM pg_class AS c INNER JOIN pg_user AS u ON c.relowner = u.usesysid INNER JOIN pg_namespace AS n ON c.relnamespace = n.oid", :database => database).each_with_object({}) do |table, tables|

         name = "#{table[:nspname]}.#{table[:relname]}"
 
         tables[name] = {
         name = "#{table[:nspname]}.#{table[:relname]}"
 
         tables[name] = {


@@ -105,11 +105,11 @@ class Chef
       end
     end
 
       end
     end
 

-  private
+    private

 
     def parse_acl(acl)
 
     def parse_acl(acl)

-      acl.sub(/^\{(.*)\}$/, "\\1").split(",").each_with_object({}) do |permissions, entry|
-        entry = entry.sub(/^"(.*)"$/) { Regexp.last_match[1].gsub(/\\"/, '"') }.sub(/\/.*$/, "")
+      acl.sub(/^\{(.*)\}$/, "\\1").split(",").each_with_object({}) do |entry, permissions|
+        entry = entry.sub(/^"(.*)"$/) { Regexp.last_match[1].gsub(/\\"/, '"') }.sub(%r{/.*$}, "")

         user, privileges = entry.split("=")
 
         user = user.sub(/^"(.*)"$/, "\\1")
         user, privileges = entry.split("=")
 
         user = user.sub(/^"(.*)"$/, "\\1")