potluck-postgres 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667d6b357e4b021bba60a415b90f8623d9b72683ed3b5869ce87f2e43e033325
-  data.tar.gz: 656fd69e5541b414c9e67f750daabaf072c94fbf1237042424a3a5848cfedfa8
+  metadata.gz: 6484b446d1c719baef9d5aec6fc545d305107581c62335c33e9b30098f050ff7
+  data.tar.gz: a9b09e742ea51367296b898ca20c331830203eace33489e28e7820d3fe914cab
 SHA512:
-  metadata.gz: 03b852e0ce06ed33d0c7010779eb5bd6d1804e0151df4814a3ad218a50ffcaa27daebf47e7b7288ac7755c75ef4c11b003a82516f6a383e724dbbcdc4269759c
-  data.tar.gz: c3cfc79e9c846ca36e2da1015871cac23928bca1291bb7ee7c05ec8b459c71c4918bf057f70516da5dec9a6ab6942a4fc9d1428af970ab79bbfb20936039f5d9
+  metadata.gz: 9f1433d0ac8702cb655ce8e7dcdea53c1a196e27e6cce9619b7f79405028e6693565bcfda69d6ade2940950661fbc6b84fdb293aeb25a9462b8ae905550e122f
+  data.tar.gz: 4e7f3c780602ba4c62021b0611d9adf44b0dadb049c3ee448c20280141e78588ceff79b2876034af53c584a97349a902ab79df30f0b41fd1b1102c923b00d136

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Nate Pickens
+Copyright 2021-2022 Nate Pickens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the Software without restriction, including without

data/VERSION

@@ -0,0 +1 @@
+0.0.7

data/lib/potluck/postgres/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Potluck
+  class Postgres < Service
+    VERSION = '0.0.7'
+  end
+end

data/lib/potluck/postgres.rb

@@ -2,6 +2,7 @@
 
 require('potluck')
 require('sequel')
+require_relative('postgres/version')
 
 module Potluck
   ##
@@ -64,34 +65,45 @@ module Potluck
     # Connects to the configured Postgres database.
     #
     def connect
-      (tries ||= 0) && (tries += 1)
-      @database = Sequel.connect(@config, logger: @logger)
-    rescue Sequel::DatabaseConnectionError => e
-      if (dud = Sequel::DATABASES.last)
-        dud.disconnect
-        Sequel.synchronize { Sequel::DATABASES.delete(dud) }
-      end
+      role_created = false
+      database_created = false
+
+      begin
+        (tries ||= 0) && (tries += 1)
+        @database = Sequel.connect(@config, logger: @logger)
+      rescue Sequel::DatabaseConnectionError => e
+        if (dud = Sequel::DATABASES.last)
+          dud.disconnect
+          Sequel.synchronize { Sequel::DATABASES.delete(dud) }
+        end
 
-      message = e.message.downcase
-
-      if message =~ ROLE_NOT_FOUND_REGEX && tries == 1
-        create_database_role
-        create_database
-        retry
-      elsif message =~ DATABASE_NOT_FOUND_REGEX && tries == 1
-        create_database
-        retry
-      elsif message.include?(STARTING_UP_STRING) && tries < STARTING_UP_TIMEOUT
-        sleep(1)
-        retry
-      elsif message.include?(CONNECTION_REFUSED_STRING) && tries < CONNECTION_REFUSED_TIMEOUT && manage?
-        sleep(1)
-        retry
-      elsif message.include?(CONNECTION_REFUSED_STRING)
-        raise(PostgresError.new(e.message.strip, e))
-      else
-        raise
+        message = e.message.downcase
+
+        if message =~ ROLE_NOT_FOUND_REGEX && !role_created && manage?
+          role_created = true
+          create_role
+          retry
+        elsif message =~ DATABASE_NOT_FOUND_REGEX && !database_created && manage?
+          database_created = true
+          create_database
+          retry
+        elsif message.include?(STARTING_UP_STRING) && tries < STARTING_UP_TIMEOUT
+          sleep(1)
+          retry
+        elsif message.include?(CONNECTION_REFUSED_STRING) && tries < CONNECTION_REFUSED_TIMEOUT
+          sleep(1)
+          retry
+        elsif message.include?(CONNECTION_REFUSED_STRING)
+          raise(PostgresError.new(e.message.strip, e))
+        else
+          raise
+        end
       end
+
+      # Only grant permissions if the database already existed but the role did not. Automatic database
+      # creation (via #create_database) is performed as the configured role, which means explicit permission
+      # granting is not necessary.
+      grant_permissions if role_created && !database_created
     end
 
     ##
@@ -118,7 +130,7 @@ module Potluck
       original_level = @logger.level
       @logger.level = Logger::WARN if @logger.level == Logger::INFO
 
-      args = [Sequel::Model.db, dir, {allow_missing_migration_files: true}]
+      args = [@database, dir, {allow_missing_migration_files: true}]
       migrator = Sequel::TimestampMigrator.new(*args)
 
       return if migrator.files.empty?
@@ -130,7 +142,7 @@ module Potluck
 
         return if applied.empty? && steps <= 0
 
-        index = [[0, (all.index(current) || -1) + steps].max, all.size].min
+        index = [[0, (all.index(current) || -1) + steps].max, all.size - 1].min
         file = all[index]
 
         args.last[:target] = migrator.send(:migration_version_from_file, file)
@@ -143,26 +155,60 @@ module Potluck
       @logger.level = original_level if original_level
     end
 
+    ##
+    # Content of the launchctl plist file.
+    #
+    def self.plist
+      versions = Dir["#{HOMEBREW_PREFIX}/opt/postgresql@*"].sort_by { |path| path.split('@').last.to_f }
+      version =
+        if versions.empty?
+          raise(PostgresError, "No Postgres installation found (try running `brew install postgresql@X`)")
+        else
+          File.basename(versions.last)
+        end
+
+      super(
+        <<~EOS
+          <key>EnvironmentVariables</key>
+          <dict>
+            <key>LC_ALL</key>
+            <string>C</string>
+          </dict>
+          <key>ProgramArguments</key>
+          <array>
+            <string>#{HOMEBREW_PREFIX}/opt/#{version}/bin/postgres</string>
+            <string>-D</string>
+            <string>#{HOMEBREW_PREFIX}/var/#{version}</string>
+          </array>
+          <key>WorkingDirectory</key>
+          <string>#{HOMEBREW_PREFIX}</string>
+          <key>StandardOutPath</key>
+          <string>#{HOMEBREW_PREFIX}/var/log/#{version}.log</string>
+          <key>StandardErrorPath</key>
+          <string>#{HOMEBREW_PREFIX}/var/log/#{version}.log</string>
+        EOS
+      )
+    end
+
     private
 
     ##
     # Attempts to connect to the 'postgres' database as the system user with no password and create the
     # configured role. Useful in development.
     #
-    def create_database_role
-      tmp_config = @config.dup
+    def create_role
+      tmp_config = admin_database_config
       tmp_config[:database] = 'postgres'
-      tmp_config[:username] = ENV['USER']
-      tmp_config[:password] = nil
 
       begin
         Sequel.connect(tmp_config, logger: @logger) do |database|
-          database.execute("CREATE ROLE #{@config[:username]} WITH LOGIN CREATEDB REPLICATION PASSWORD "\
-            "'#{@config[:password]}'")
+          database.execute("CREATE ROLE \"#{@config[:username]}\" WITH LOGIN CREATEDB REPLICATION"\
+            "#{" PASSWORD '#{@config[:password]}'" if @config[:password]}")
         end
       rescue => e
-        raise(PostgresError.new("Database role #{@config[:username].inspect} could not be created using "\
-          "system user #{tmp_config[:username].inspect}. Please create the role manually.", e))
+        raise(PostgresError.new("Failed to create database role #{@config[:username].inspect} by "\
+          "connecting to database #{tmp_config[:database].inspect} as role "\
+          "#{tmp_config[:username].inspect}. Please create the role manually.", e))
       end
     end
 
@@ -176,35 +222,45 @@ module Potluck
 
       begin
         Sequel.connect(tmp_config, logger: @logger) do |database|
-          database.execute("CREATE DATABASE #{@config[:database]}")
+          database.execute("CREATE DATABASE \"#{@config[:database]}\"")
         end
       rescue => e
-        raise(PostgresError.new("Database #{@config[:database].inspect} could not be created by "\
-          "connecting to system database #{tmp_config[:database].inspect}. Please create the database "\
-          'manually.', e))
+        raise(PostgresError.new("Failed to create database #{@config[:database].inspect} by connecting to "\
+          "database #{tmp_config[:database].inspect} as role #{tmp_config[:username].inspect}. "\
+          'Please create the database manually.', e))
       end
     end
 
     ##
-    # Content of the launchctl plist file.
+    # Grants appropriate permissions for the configured database role.
     #
-    def self.plist
-      super(
-        <<~EOS
-          <key>ProgramArguments</key>
-          <array>
-            <string>/usr/local/opt/postgresql/bin/postgres</string>
-            <string>-D</string>
-            <string>/usr/local/var/postgres</string>
-          </array>
-          <key>WorkingDirectory</key>
-          <string>/usr/local</string>
-          <key>StandardOutPath</key>
-          <string>/usr/local/var/log/postgres.log</string>
-          <key>StandardErrorPath</key>
-          <string>/usr/local/var/log/postgres.log</string>
-        EOS
-      )
+    def grant_permissions
+      tmp_config = admin_database_config
+
+      begin
+        Sequel.connect(tmp_config, logger: @logger) do |db|
+          db.execute("GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO \"#{@config[:username]}\"")
+          db.execute("GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO \"#{@config[:username]}\"")
+          db.execute("ALTER DEFAULT PRIVILEGES FOR ROLE \"#{@config[:username]}\" IN SCHEMA public GRANT "\
+            "ALL PRIVILEGES ON TABLES TO \"#{@config[:username]}\"")
+        end
+      rescue => e
+        raise(PostgresError.new("Failed to grant database permissions for role "\
+          "#{@config[:username].inspect} by connecting as role #{tmp_config[:username].inspect}. Please "\
+          'grant appropriate permissions manually.', e))
+      end
+    end
+
+    ##
+    # Returns a configuration hash for connecting to Postgres to perform administrative tasks (i.e. role and
+    # database creation). Uses the system user as the username and no password.
+    #
+    def admin_database_config
+      config = @config.dup
+      config[:username] = ENV['USER']
+      config[:password] = nil
+
+      config
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potluck-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Nate Pickens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-31 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: potluck
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,9 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- VERSION
 - lib/potluck/postgres.rb
+- lib/potluck/postgres/version.rb
 homepage: https://github.com/npickens/potluck/tree/master/potluck-postgres
 licenses:
 - MIT
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A Ruby manager for Postgres.