prodder 1.8.2 → 1.9.0

data/features/support/env.rb

@@ -1,9 +1,16 @@
 require 'cucumber'
 require 'aruba/cucumber'
 
-$LOAD_PATH.unshift File.expand_path('../../lib', File.dirname(__FILE__))
+$LOAD_PATH.unshift File.expand_path('../../lib', __dir__)
 require 'prodder'
 
+# Configure Aruba to find the prodder executable
+Aruba.configure do |config|
+  config.command_search_paths << File.expand_path('../../bin', __dir__)
+  config.exit_timeout = 10
+  config.io_wait_timeout = 10
+end
+
 module ProdderHelpers
   def strip_leading(string)
     leading = string.scan(/^\s*/).min_by &:length
@@ -11,21 +18,21 @@ module ProdderHelpers
   end
 
   def in_workspace(name, &block)
-    in_current_dir { Dir.chdir("prodder-workspace/#{name}", &block) }
+    in_current_directory { Dir.chdir("prodder-workspace/#{name}", &block) }
   end
 
   def commit_to_remote(project)
     @dirs = ['tmp', 'aruba']
-    run_simple "git clone repos/#{project}.git tmp-extra-commit-#{project}"
+    run_command_and_stop "git clone repos/#{project}.git tmp-extra-commit-#{project}"
     cd "tmp-extra-commit-#{project}"
 
     append_to_file "README", 'Also read this!'
-    run_simple 'git add README'
-    run_simple 'git commit -m "Second commit"'
-    run_simple "git push origin master"
+    run_command_and_stop 'git add README'
+    run_command_and_stop 'git -c user.email="test@example.com" -c user.name="Test User" commit -m "Second commit"'
+    run_command_and_stop "git push origin master"
 
     cd '..'
-    run_simple "rm -rf tmp-extra-commit-#{project}"
+    run_command_and_stop "rm -rf tmp-extra-commit-#{project}"
   end
 
   def update_config(filename, &block)
@@ -90,7 +97,7 @@ module ProdderHelpers
   end
 
   def self.fixture_dbs
-    @fixture_dbs ||= Dir[File.join(File.dirname(__FILE__), '*.sql')].map do |sql|
+    @fixture_dbs ||= Dir[File.join(__dir__, '*.sql')].map do |sql|
       db = File.basename(sql).sub('.sql', '')
       [db, File.read(sql)]
     end
@@ -100,10 +107,15 @@ end
 World ProdderHelpers
 
 Before do
-  @prodder_root = File.expand_path('../..', File.dirname(__FILE__))
+  @prodder_root = File.expand_path('../..', __dir__)
   @aruba_root   = File.join(@prodder_root, 'tmp', 'aruba')
-  @aruba_timeout_seconds = 10
   Dir.chdir @prodder_root
+  
+  # Configure git for tests that create commits
+  set_environment_variable 'GIT_AUTHOR_NAME', 'Test User'
+  set_environment_variable 'GIT_AUTHOR_EMAIL', 'test@example.com'
+  set_environment_variable 'GIT_COMMITTER_NAME', 'Test User'
+  set_environment_variable 'GIT_COMMITTER_EMAIL', 'test@example.com'
 end
 
 After('@restore-perms') do

data/lib/prodder/cli.rb

@@ -2,8 +2,6 @@ require 'prodder'
 require 'thor'
 require 'yaml'
 
-require 'pp' # TODO rm
-
 class Prodder::CLI < Thor
   include Thor::Actions
 

data/lib/prodder/pg.rb

@@ -70,11 +70,12 @@ module Prodder
       end
     end
 
-    def dump_structure(db_name, filename, options = {})
+    def dump_structure(db_name, filename, **options)
       arguments = [
         '--schema-only',
         '--no-privileges',
         '--no-owner',
+        '--restrict-key', 'prodder',
         '--host', credentials['host'],
         '--username', credentials['user']
       ]
@@ -96,6 +97,7 @@ module Prodder
         '--no-privileges',
         '--no-owner',
         '--disable-triggers',
+        '--restrict-key', 'prodder',
         '--host',     credentials['host'],
         '--username', credentials['user'],
         *tables.map { |table| ['--table', table] }.flatten,
@@ -103,12 +105,12 @@ module Prodder
       ]
     end
 
-    def dump_permissions(db_name, filename, options = {})
+    def dump_permissions(db_name, filename, **options)
       perm_out_sql = ""
       user_list = []
 
-      perm_out_sql << dump_db_access_control(db_name, user_list, options)
-      perm_out_sql.prepend pg_dumpall db_name, user_list, options
+      perm_out_sql << dump_db_access_control(db_name, user_list, **options)
+      perm_out_sql.prepend pg_dumpall(db_name, user_list, **options)
 
       perm_out_sql.prepend(alter_role_function)
       perm_out_sql.prepend(create_role_function)
@@ -127,7 +129,7 @@ module Prodder
     DEFAULT_PRIVILEGES = /^ALTER DEFAULT PRIVILEGES /
     SET_OBJECT_OWNERSHIP = /.* OWNER TO /
 
-    def dump_db_access_control(db_name, user_list, options)
+    def dump_db_access_control(db_name, user_list, **options)
       perm_out_sql = ""
       arguments = [
         '--schema-only',
@@ -218,7 +220,7 @@ module Prodder
       end
     end
 
-    def pg_dumpall(db_name, user_list, options)
+    def pg_dumpall(db_name, user_list, **options)
       white_list = options[:included_users] || []
       irrelevant_login_roles = irrelevant_login_roles(db_name, white_list).map { |user| user['oid'] }
 

data/lib/prodder/prodder.rake

@@ -169,7 +169,7 @@ namespace :db do
     end
     as("superuser", in: environments) do
       ActiveRecord::Tasks::DatabaseTasks.create_current
-      ActiveRecord::Base.configurations.to_h.each do |env, config|
+      Rails.configuration.database_configuration.each do |env, config|
         if environments.include?(env) && config["migration_user"] && config['database']
           set_psql_env config
           `psql --no-psqlrc --command "ALTER DATABASE #{config['database']} OWNER TO #{config['migration_user']}" #{Shellwords.escape(config['database'])}`
@@ -182,7 +182,7 @@ namespace :db do
     task :all => dependencies do
       as("superuser") do
         ActiveRecord::Tasks::DatabaseTasks.create_all
-        ActiveRecord::Base.configurations.to_h.each do |env, config|
+        Rails.configuration.database_configuration.each do |env, config|
           if config["migration_user"] && config['database']
             set_psql_env config
             `psql --no-psqlrc --command "ALTER DATABASE #{config['database']} OWNER TO #{config['migration_user']}" #{Shellwords.escape(config['database'])}`
@@ -362,19 +362,19 @@ namespace :db do
 
   def as(user, opts = {}, &block)
     if File.exist?('db/permissions.sql')
-      original_config = ActiveRecord::Base.configurations.deep_dup
-      in_env = Array(opts[:in]) || ActiveRecord::Base.configurations.deep_dup.to_h.keys
-      disconnect
-      in_env.each do |env|
-        config = ActiveRecord::Base.configurations.find_db_config(env)
-        config["username"] = config[user]
+      config, config_was = Rails.configuration.database_configuration, ActiveRecord::Base.configurations.deep_dup
+      in_env = Array(opts[:in]) || config.keys
+      if config.all? { |env, config_hash| in_env.include?(env) ? config_hash[user] : true }
+        disconnect
+        config.each { |env, config_hash| config_hash["username"] = config_hash[user] if in_env.include?(env) }
+        ActiveRecord::Base.configurations = config
       end
     else
       puts "No permissions file (db/permissions.sql) found, running everything in context of user"
     end
     yield
   ensure
-    ActiveRecord::Base.configurations = original_config if original_config
+    ActiveRecord::Base.configurations = config_was if config_was
     in_env.each { |env| ActiveRecord::Base.establish_connection(env.intern) } if in_env
   end
 

data/lib/prodder/version.rb

@@ -1,3 +1,3 @@
 module Prodder
-  VERSION = "1.8.2"
+  VERSION = "1.9.0"
 end

data/prodder.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(File.expand_path("lib", __dir__))
 require "prodder/version"
 
 Gem::Specification.new do |s|
@@ -12,11 +12,13 @@ Gem::Specification.new do |s|
   s.summary     = "Maintain your Rails apps' structure, seed and quality_checks files using production dumps"
   s.description = "Migrations suck long-term. Now you can kill them routinely."
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = Dir.glob("{lib,bin,features}/**/*") + Dir.glob("*").reject { |f| File.directory?(f) }
+  s.test_files    = Dir.glob("{test,spec,features}/**/*")
+  s.executables   = Dir.glob("bin/*").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = ">= 2.7.0"
+
   # These dependencies do not match the Gemfile's for a reason.
   # These are the only dependencies necessary to satisfy inclusion of this
   # gem in a Rails application; any dependencies necessary to run prodder

data/rspec_test.log

@@ -0,0 +1,5 @@
+.............
+
+Finished in 0.01093 seconds (files took 0.16398 seconds to load)
+13 examples, 0 failures
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prodder
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Kyle Hargraves
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2025-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deject
@@ -32,17 +32,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".dockerignore"
-- ".github/workflows/ci.yml"
-- ".gitignore"
 - Dockerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/prodder
 - compose.yml
-- entrypoints/entry.sh
+- cucumber.yml
 - features/commit.feature
 - features/dump.feature
 - features/init.feature
@@ -52,6 +50,24 @@ files:
 - features/step_definitions/git_steps.rb
 - features/step_definitions/prodder_steps.rb
 - features/support/blog.git.tgz
+- features/support/blog.git/HEAD
+- features/support/blog.git/config
+- features/support/blog.git/description
+- features/support/blog.git/hooks/applypatch-msg.sample
+- features/support/blog.git/hooks/commit-msg.sample
+- features/support/blog.git/hooks/post-commit.sample
+- features/support/blog.git/hooks/post-receive.sample
+- features/support/blog.git/hooks/post-update.sample
+- features/support/blog.git/hooks/pre-applypatch.sample
+- features/support/blog.git/hooks/pre-commit.sample
+- features/support/blog.git/hooks/pre-rebase.sample
+- features/support/blog.git/hooks/prepare-commit-msg.sample
+- features/support/blog.git/hooks/update.sample
+- features/support/blog.git/info/exclude
+- features/support/blog.git/objects/2c/0dfde112cb834fc1bd166454bf0e23f35aec0b
+- features/support/blog.git/objects/5f/344dad802e30fce4f8b84e094a52a0a3c1ef9a
+- features/support/blog.git/objects/c0/7cd3c46c7a18b6b2c44f4efea77554d0840056
+- features/support/blog.git/packed-refs
 - features/support/env.rb
 - features/support/prodder__blog_prod.sql
 - lib/prodder.rb
@@ -64,6 +80,7 @@ files:
 - lib/prodder/railtie.rb
 - lib/prodder/version.rb
 - prodder.gemspec
+- rspec_test.log
 - spec/config_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/enova/prodder
@@ -78,19 +95,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Maintain your Rails apps' structure, seed and quality_checks files using
   production dumps
 test_files:
+- spec/config_spec.rb
+- spec/spec_helper.rb
 - features/commit.feature
 - features/dump.feature
 - features/init.feature
@@ -99,8 +118,24 @@ test_files:
 - features/push.feature
 - features/step_definitions/git_steps.rb
 - features/step_definitions/prodder_steps.rb
+- features/support/blog.git/HEAD
+- features/support/blog.git/config
+- features/support/blog.git/description
+- features/support/blog.git/hooks/applypatch-msg.sample
+- features/support/blog.git/hooks/commit-msg.sample
+- features/support/blog.git/hooks/post-commit.sample
+- features/support/blog.git/hooks/post-receive.sample
+- features/support/blog.git/hooks/post-update.sample
+- features/support/blog.git/hooks/pre-applypatch.sample
+- features/support/blog.git/hooks/pre-commit.sample
+- features/support/blog.git/hooks/pre-rebase.sample
+- features/support/blog.git/hooks/prepare-commit-msg.sample
+- features/support/blog.git/hooks/update.sample
+- features/support/blog.git/info/exclude
+- features/support/blog.git/objects/2c/0dfde112cb834fc1bd166454bf0e23f35aec0b
+- features/support/blog.git/objects/5f/344dad802e30fce4f8b84e094a52a0a3c1ef9a
+- features/support/blog.git/objects/c0/7cd3c46c7a18b6b2c44f4efea77554d0840056
+- features/support/blog.git/packed-refs
 - features/support/blog.git.tgz
 - features/support/env.rb
 - features/support/prodder__blog_prod.sql
-- spec/config_spec.rb
-- spec/spec_helper.rb

data/.dockerignore

@@ -1,2 +0,0 @@
-Gemfile.lock
-tmp

data/.github/workflows/ci.yml

@@ -1,69 +0,0 @@
-name: CI
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-  pull_request_target:
-    branches:
-      - main
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby-version: [2.6, 2.7, 3.0]
-    services:
-      postgres:
-        image: postgres:13-alpine
-        ports:
-          - 5432:5432
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-      - name: Checkout Project
-        uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-      - name: Install Library Dependencies
-        run: sudo apt update && sudo apt install -y postgresql-client
-      - name: Setup Database
-        run: |
-          mkdir -p config
-          cat <<EOF > config/database.yml
-          test:
-            adapter: postgresql
-            encoding: unicode
-            pool: 20
-            database: prodder_test
-          EOF
-      - name: Test with RSpec
-        env:
-          PGHOST: localhost
-          PGPORT: 5432
-          PGUSER: postgres
-          PGPASSWORD: postgres
-        run: bundle exec rspec
-      - name: Test with Cucumber
-        env:
-          PGHOST: localhost
-          PGPORT: 5432
-          PGUSER: postgres
-          PGPASSWORD: postgres
-        run: bundle exec cucumber

data/.gitignore

@@ -1,2 +0,0 @@
-Gemfile.lock
-tmp

data/entrypoints/entry.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-cmd=("$@")
-
-mkdir -p config
-cat <<EOF > config/database.yml
-test:
-  adapter: postgresql
-  encoding: unicode
-  pool: 20
-  database: prodder_test
-EOF
-
-exec "${cmd[@]}"