prodder 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e8921f51e1bb936a99eaccc98d04bcd34ff72acbe20cb5547f6e680f8e4106a
-  data.tar.gz: 0e47795334cfcd4944d877dd5c24ab72e4fa5b082d66400b5c0a318228ba0f5d
+  metadata.gz: e3ab994663f2c4c9e24475f197d4aa5c2cc29fb98f2ee14841fb4f9df4dc680e
+  data.tar.gz: 59000cbb6bade96b5ae1e9143897fdf4706c149fa55ead7bc975832587dcebe8
 SHA512:
-  metadata.gz: 12817961230a0fd95776ff3bdf4a95b62fb8b961bbf2db9d93413f8cf93c32a9f11c4e036ffd89b0e4e5c0807ef40cf5d342706b0cd7a1f214c1f9c3a840547b
-  data.tar.gz: 34c918bd1587a1c055ffd76866028a5cd7e7c371c42cec0381e01294af4f308b5478d59f2406a8d5dea73755e5c16cb0d33b2b206e8a450448cceca6b5a2b748
+  metadata.gz: c7914656c214ae8f87f23fe15de87a67bc9b471c65454408496639c4632364dccda94cbd8551b101b2989bd5d649fa6f3ff68a49da07fc476921af802f52d982
+  data.tar.gz: 2d3485303746abae32e25e57fbad7793a07878a1cdf2be230b6c94d250efaf7de3023b053bfb795539f205421fa386289332816783be4fdb1376cde320ddc732

data/.dockerignore

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

data/.github/workflows/ci.yml

@@ -5,7 +5,9 @@ on:
   push:
     branches:
       - main
-  pull_request:
+  pull_request_target:
+    branches:
+      - main
 
 permissions:
   contents: read
@@ -14,42 +16,54 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby-version: [2.6, 2.7, 3.0]
     services:
       postgres:
-        image: postgres:12.1-alpine
+        image: postgres:13-alpine
         ports:
           - 5432:5432
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+          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@v3
-
+        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-get install libpq-dev
-
+        run: sudo apt update && sudo apt install -y postgresql-client
       - name: Setup Database
         run: |
-          cp config/database.yml.github-actions config/database.yml
-        env:
-          RAILS_ENV: test
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-
+          mkdir -p config
+          cat <<EOF > config/database.yml
+          test:
+            adapter: postgresql
+            encoding: unicode
+            pool: 20
+            database: prodder_test
+          EOF
       - name: Test with RSpec
         env:
-          RAILS_ENV: "test"
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        run: |
-          bundle exec rspec
+          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,23 +1,2 @@
 Gemfile.lock
-*.gem
-*.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
 tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-
-nc.yml
-prodder-workspace/
-features/support/blog.git

data/Dockerfile

@@ -0,0 +1,23 @@
+ARG RUBY_VERSION=3.0
+
+FROM ruby:${RUBY_VERSION}
+
+WORKDIR /app
+
+RUN apt update && \
+  apt install -y git postgresql-client && \
+  apt clean && \
+  rm -rf /var/lib/apt/lists/*
+
+ENV BUNDLER_VERSION 2.4.22
+
+RUN gem install bundler -v $BUNDLER_VERSION
+
+COPY Gemfile ./
+
+RUN bundle install -j $(nproc)
+
+COPY . .
+
+ENTRYPOINT ["entrypoints/entry.sh"]
+CMD ["bin/prodder"]

data/README.md

@@ -82,7 +82,7 @@ Things that really matter:
    created. Those initial seeds should have included your production app's `schema_migrations`
    table contents. This means only those migrations that have not yet run in production
    will need to be run locally.
-3. If you configred to have 3 users in your `#config/database.yml` file and have a `permissions.sql` file present,
+3. If you configured to have 3 users in your `#config/database.yml` file and have a `permissions.sql` file present,
    all your `db:*` commands will be run in the context of the user it makes the most sense to run as, mimicking
    our production environment. For instance(s), to reset the database (god forbid we do this in production), it will
    run as `superuser`, to run a migration, as the `migration_user` and your application will connect to the database

data/compose.yml

@@ -0,0 +1,54 @@
+services:
+  postgres:
+    image: postgres:13-alpine
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_HOST_AUTH_METHOD: trust
+    healthcheck:
+      test: ["CMD", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: on-failure:5
+
+  prodder:
+    platform: linux/arm64
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        RUBY_VERSION: 3.0
+    volumes:
+      - .:/app
+      - /app/config
+    depends_on:
+      postgres:
+        condition: service_healthy
+    environment:
+      PGHOST: localhost
+      PGPORT: "5432"
+      PGUSER: postgres
+      PGPASSWORD: postgres
+    network_mode: host
+
+  rspec:
+    profiles:
+      - test
+    extends:
+      service: prodder
+    command: bundle exec rspec
+
+  cucumber:
+    profiles:
+      - test
+    extends:
+      service: prodder
+    command: bundle exec cucumber
+
+volumes:
+  postgres_data:

data/entrypoints/entry.sh

@@ -0,0 +1,15 @@
+#!/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[@]}"

data/lib/prodder/pg.rb

@@ -1,5 +1,6 @@
 require 'open3'
 require 'pg'
+require 'set'
 
 module Prodder
   class PG

data/lib/prodder/prodder.rake

@@ -169,7 +169,7 @@ namespace :db do
     end
     as("superuser", in: environments) do
       ActiveRecord::Tasks::DatabaseTasks.create_current
-      Rails.configuration.database_configuration.each do |env, config|
+      ActiveRecord::Base.configurations.to_h.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
-        Rails.configuration.database_configuration.each do |env, config|
+        ActiveRecord::Base.configurations.to_h.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')
-      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
+      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]
       end
     else
       puts "No permissions file (db/permissions.sql) found, running everything in context of user"
     end
     yield
   ensure
-    ActiveRecord::Base.configurations = config_was if config_was
+    ActiveRecord::Base.configurations = original_config if original_config
     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.1"
+  VERSION = "1.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prodder
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Kyle Hargraves
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deject
@@ -32,14 +32,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/prodder
-- config/database.yml.github-actions
+- compose.yml
+- entrypoints/entry.sh
 - features/commit.feature
 - features/dump.feature
 - features/init.feature
@@ -67,7 +70,7 @@ homepage: https://github.com/enova/prodder
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,8 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Maintain your Rails apps' structure, seed and quality_checks files using
   production dumps

data/config/database.yml.github-actions

@@ -1,8 +0,0 @@
-test:
-  adapter: postgresql
-  host: localhost
-  encoding: unicode
-  database: github-actions
-  pool: 20
-  username: <%= ENV["POSTGRES_USER"] %>
-  password: <%= ENV["POSTGRES_PASSWORD"] %>