prodder 1.7.2 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7018f84da517a86834a557666183b7a8fd81d9b3
-  data.tar.gz: 33a7fe098859ec975862a8413f29a38cf3a4a8e1
+SHA256:
+  metadata.gz: 837adeb9529887b429bbe128bbb9162f29d0ca5001fbd94b28aba2aa105caacb
+  data.tar.gz: e3b410b12794de3b1a04d55adad8ac789c83658526c4a749b8494878381c7e0a
 SHA512:
-  metadata.gz: c05ab47457496eeabdbcbe792dacd9069b5c1ef8d1f3c21ddc5bf81e460e9648994f6c2e5aa0352aac7ce1faba642acb0a7794844a7465f6c9670020e6eb4f27
-  data.tar.gz: 9258441141b1ec6f90052bf898c99735ad2cb9e2e7be3d334baa5ef1e9b4406b648554275196fd192736f91218184d0c26d064dccc9bfd4435e3b0a89fdb99b3
+  metadata.gz: d5982600241c08dc3c623c8c1e6153cfbd10bd6c20f3fa3074f4cf45335f6fd091c58e31e2e26da624c956b6624458ce21ce117568b933ec72aab8f2f30d295d
+  data.tar.gz: 697799d716ab1bd9a7fbc19b3a346681621ffd8cf3b732ee2eed41acb86b7626fb0eb16f239a307c62c797f890a1cfc9c8e2d6db367fb1542ed174ca14512aee

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 *.gem
 *.rbc
 .bundle

data/.travis.yml

@@ -2,24 +2,20 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3.0
-  - 2.2.4
-  - 2.1.8
+  - 2.5.8
+  - 2.7.2
 
 env:
   matrix:
-    - PG_VERSION=9.3
-    - PG_VERSION=9.4
-    - PG_VERSION=9.5
+    - PG_VERSION=11
 
 before_install:
   - git config --global user.name "Prodder In Travis-CI"
   - git config --global user.email "prodder@example.com"
-  # install postgresql v9.5
-  - if [[ "$PG_VERSION" = "9.5" ]]; then echo "installing pg9.5"; sudo /etc/init.d/postgresql stop; sudo apt-get -y autoremove; sudo apt-key adv --keyserver keys.gnupg.net --recv-keys 7FCC7D46ACCC4CF8; sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main 9.5" >> /etc/apt/sources.list.d/postgresql.list'; sudo apt-get update; sudo apt-get -y install postgresql-9.5; sudo cp /etc/postgresql/9.4/main/pg_hba.conf /etc/postgresql/9.5/main/pg_hba.conf; sudo sed -i 's/5433/5432/' /etc/postgresql/9.5/main/postgresql.conf; sudo /etc/init.d/postgresql restart; else echo "not installing pg9.5"; fi
-  # setup travis user
-  - if [[ "$PG_VERSION" = "9.5" ]]; then echo "setting up users for pg9.5"; PGUSER=postgres createuser --superuser travis || true; fi
+  # install postgres
+  - sudo apt-get install postgresql-client-$PG_VERSION postgresql-server-dev-$PG_VERSION
   # setup pg_dump
+  - ls -al /usr/lib/postgresql/
   - sudo ln -sfn /usr/lib/postgresql/$PG_VERSION/bin/pg_dump /usr/bin/pg_dump
   # start up the specific version of PG
   - sudo -E sh -c 'service postgresql stop'
@@ -28,17 +24,10 @@ before_install:
   - psql -U postgres -d postgres -c 'select setting from pg_settings where name = $m$server_version$m$;'
 
 script:
-  - echo "===================================================="
-  - echo "PG_VERSION|$PG_VERSION|"
-  - echo "===================================================="
   - psql --version
-  - echo "===================================================="
   - pg_lsclusters
-  - echo "===================================================="
   - psql -U postgres -d postgres -c 'select 1;'
-  - echo "===================================================="
   - ls -al `which pg_dump`
-  - echo "===================================================="
   - bundle exec rake spec
   - bundle exec rake cucumber
 

data/Gemfile

@@ -10,7 +10,7 @@ group :development, :test do
   gem 'pry'
   gem 'pry-remote'
   gem 'rspec'
-  gem 'cucumber'
-  gem 'aruba'
+  gem 'cucumber', '< 3' # FIXME
+  gem 'aruba', '~> 0.5.0'
   gem 'pg'
 end

data/README.md

@@ -2,9 +2,9 @@
 prodder [![Build Status](https://travis-ci.org/enova/prodder.svg?branch=master)](https://travis-ci.org/enova/prodder)
 =======
 
-A tool to maintain and load your Rails application's database structure and seed
-table contents, based on its migration history and the current in production
-databases.
+A tool to maintain and load your Rails application's database structure, seed
+table contents, permissions and database settings based on its migration history
+and the current state in production databases.
 
 In short: `db:reset db:migrate`
 

data/features/commit.feature

@@ -29,7 +29,7 @@ Feature: Commiting updated dumps to a project's repository
     And  I run `prodder dump -c prodder.yml`
     And  I run `prodder commit -c prodder.yml`
     And  2 commits by "prodder auto-commit" should be in the "blog" repository
-    And  the latest commit should have changed "db/structure.sql" to contain "CREATE TABLE linkbacks"
+    And  the latest commit should have changed "db/structure.sql" to contain "CREATE TABLE public.linkbacks"
     And  the latest commit should not have changed "db/seeds.sql"
     And  the latest commit should not have changed "db/quality_checks.sql"
 
@@ -52,7 +52,7 @@ Feature: Commiting updated dumps to a project's repository
     And  I run `prodder dump -c prodder.yml`
     And  I run `prodder commit -c prodder.yml`
     Then 2 commits by "prodder auto-commit" should be in the "blog" repository
-    And  the latest commit should have changed "db/structure.sql" to contain "CREATE TABLE captchas"
+    And  the latest commit should have changed "db/structure.sql" to contain "CREATE TABLE public.captchas"
     And  the latest commit should have changed "db/seeds.sql" to contain "Bob McBobbington"
     And  the latest commit should not have changed "db/quality_checks.sql"
 
@@ -64,6 +64,6 @@ Feature: Commiting updated dumps to a project's repository
     And  I run `prodder dump -c prodder.yml`
     And  I run `prodder commit -c prodder.yml`
     And  2 commits by "prodder auto-commit" should be in the "blog" repository
-    And  the latest commit should have changed "db/permissions.sql" to contain "GRANT ALL ON TABLE gotchas TO prodder"
+    And  the latest commit should have changed "db/permissions.sql" to contain "GRANT ALL ON TABLE public.gotchas TO prodder"
     And  the latest commit should not have changed "db/seeds.sql"
     And  the latest commit should not have changed "db/quality_checks.sql"

data/features/dump.feature

@@ -6,11 +6,10 @@ Feature: prodder dump
   Scenario: Happy path: dump structure.sql, listed seed tables, quality_checks.sql, permissions.sql and settings.sql
     When I run `prodder dump -c prodder.yml`
     Then the exit status should be 0
-    And  the workspace file "blog/db/structure.sql" should match /CREATE TABLE posts/
-    And  the workspace file "blog/db/structure.sql" should match /CREATE TABLE authors/
-    And  the workspace file "blog/db/seeds.sql" should match /COPY posts/
-    And  the workspace file "blog/db/seeds.sql" should match /COPY authors/
-    And  the workspace file "blog/db/quality_checks.sql" should match /SET search_path/
+    And  the workspace file "blog/db/structure.sql" should match /CREATE TABLE public.posts/
+    And  the workspace file "blog/db/structure.sql" should match /CREATE TABLE public.authors/
+    And  the workspace file "blog/db/seeds.sql" should match /COPY public.posts/
+    And  the workspace file "blog/db/seeds.sql" should match /COPY public.authors/
     And  the workspace file "blog/db/quality_checks.sql" should match /CREATE TRIGGER /
     And  the workspace file "blog/db/permissions.sql" should match /GRANT /
     And  the workspace file "blog/db/settings.sql" should match /ALTER DATABASE /
@@ -123,6 +122,7 @@ Feature: prodder dump
     Given I add a custom parameter "c.p" with value "v" in the "blog" project's database
     When  I run `prodder dump -c prodder.yml`
     Then the workspace file "blog/db/settings.sql" should match /ALTER DATABASE :DBNAME SET c.p=v;/
+    And the workspace file "blog/db/settings.sql" should match /ALTER DATABASE :DBNAME SET search_path=foo,bar,public;/
 
   Scenario: Verify empty db setting is quoted
     Given I add a custom parameter "empty.setting" with value "" in the "blog" project's database
@@ -184,8 +184,8 @@ Feature: prodder dump
       """
     When I run `prodder dump -c prodder.yml`
     Then the exit status should be 0
-    And  the workspace file "blog/db/seeds.sql" should match /COPY posts/
-    But  the workspace file "blog/db/seeds.sql" should not match /COPY authors/
+    And  the workspace file "blog/db/seeds.sql" should match /COPY public.posts/
+    But  the workspace file "blog/db/seeds.sql" should not match /COPY public.authors/
 
   Scenario: YAML file listing seed tables does not exist
     Given the prodder config in "prodder.yml" says to read the "blog" seed tables from "db/seeds.yml"

data/features/prodder.feature

@@ -2,7 +2,7 @@ Feature: Basic CLI usage
 
   Scenario: prodder help
     When I run `prodder help`
-    Then the output should contain "Tasks:"
+    Then the output should contain "Commands:"
 
   Scenario: No config file supplied
     When I run `prodder`

data/features/push.feature

@@ -16,7 +16,7 @@ Feature: prodder push
     Given the "blog" git repository does not allow pushing to it
     When I run `prodder push -c prodder.yml`
     Then the exit status should be 1
-    And the output should contain "insufficient permission"
+    And the output should contain "remote rejected"
 
   Scenario: Push fails due to non-fast-forward
     Given a new commit is already in the "blog" git repository

data/features/step_definitions/git_steps.rb

@@ -5,8 +5,10 @@ Given 'a "$project" git repository' do |project|
   end
 
   run_simple "mkdir -p repos"
-  run_simple "chmod -R a+w repos/#{project}.git" if File.exist? File.join(current_dir, "repos", "#{project}.git")
-  remove_dir "repos/#{project}.git"
+  if File.exist? File.join(current_dir, "repos", "#{project}.git")
+    run_simple "chmod -R a+w repos/#{project}.git"
+    run_simple "rm -rf repos/#{project}.git"
+  end
   run_simple "cp -pR #{fixture_repo} repos/#{project}.git"
 end
 
@@ -29,37 +31,37 @@ end
 Then(/^(\d+) commits? by "([^"]+)" should be in the "([^"]+)" repository$/) do |n, author, project|
   in_workspace(project) do
     authors = `git log --pretty='format:%an'`.split("\n")
-    authors.grep(/#{author}/).size.should == Integer(n)
+    expect(authors.grep(/#{author}/).size).to eq Integer(n)
   end
 end
 
 Then 'the file "$filename" should now be tracked' do |filename|
   in_current_dir do
     git = Prodder::Git.new(File.expand_path("prodder-workspace/blog"), nil)
-    git.should be_tracked(filename)
+    expect(git).to be_tracked(filename)
   end
 end
 
 Then 'the latest commit should have changed "$file" to contain "$content"' do |filename, content|
   in_workspace('blog') do
     changed = `git show --name-only HEAD | grep #{filename}`.split("\n")
-    changed.should_not be_empty
+    expect(changed).to_not be_empty
 
     diff = `git show HEAD | grep '#{content}'`.split("\n")
-    diff.should_not be_empty
+    expect(diff).to_not be_empty
   end
 end
 
 Then 'the latest commit should not have changed "$filename"' do |filename|
   in_workspace('blog') do
     changed = `git show --name-only HEAD | grep #{filename}`.split("\n")
-    changed.should be_empty
+    expect(changed).to be_empty
   end
 end
 
 Then 'the new commit should be in the remote repository' do
   in_current_dir do
     latest = `git --git-dir="./repos/blog.git" log | grep prodder`.split("\n")
-    latest.should_not be_empty
+    expect(latest).to_not be_empty
   end
 end

data/features/support/prodder__blog_prod.sql

@@ -1,4 +1,5 @@
 ALTER DATABASE prodder__blog_prod SET custom.parameter = 1;
+ALTER DATABASE prodder__blog_prod SET search_path TO foo, bar, public;
 
 CREATE TABLE authors (
   author_id serial primary key,

data/lib/prodder/pg.rb

@@ -42,8 +42,8 @@ module Prodder
     end
 
     def dump_settings(db_name, filename)
-      sql = <<-SQL
-        select unnest(setconfig)
+      db_settings = pg_conn(db_name) { |conn| conn.exec(<<-SQL).map { |setting| setting['config'] } }
+        select unnest(setconfig) as config
         from pg_catalog.pg_db_role_setting
         join pg_database on pg_database.oid = setdatabase
         -- 0 = default, for all users
@@ -51,24 +51,19 @@ module Prodder
         and datname = '#{db_name}'
       SQL
 
-      arguments = [
-        '--host', credentials['host'],
-        '--username', credentials['user'],
-        '-t',
-        '-c', sql
-      ]
-
-      run ['psql', *arguments.push(db_name)] do |out, err, success|
-        raise PGDumpError.new(err) if !success
-        File.open(filename, 'w') do |f|
-          out.each_line do |setting|
-            setting.gsub!(/\s+/, '')
-            unless setting.empty?
-              setting.chomp!
-              setting += "''" if setting.match(/=$/)
-              # using the magic of psql variables through :DBNAME
-              f.puts "ALTER DATABASE :DBNAME SET #{setting};"
-            end
+      File.open(filename, 'w') do |f|
+        db_settings.each do |setting|
+          # wipe out all spaces
+          setting.gsub!(/\s+/, '')
+
+          # if the setting is empty, ignore it
+          unless setting.empty?
+            # else, drop carriage returns/new lines
+            setting.chomp!
+            # and append an empty string if the setting was being assigned a value of nothing
+            setting += "''" if setting.match(/=$/)
+            # using the magic of psql variables through :DBNAME
+            f.puts "ALTER DATABASE :DBNAME SET #{setting};"
           end
         end
       end
@@ -130,7 +125,6 @@ module Prodder
     ACL_REVOKE = /^REVOKE /
     DEFAULT_PRIVILEGES = /^ALTER DEFAULT PRIVILEGES /
     SET_OBJECT_OWNERSHIP = /.* OWNER TO /
-    SEARCH_PATH = /SET search_path = .*/
 
     def dump_db_access_control(db_name, user_list, options)
       perm_out_sql = ""
@@ -158,8 +152,7 @@ module Prodder
           if line.match(ACL_GRANT)           ||
              line.match(ACL_REVOKE)          ||
              line.match(DEFAULT_PRIVILEGES)  ||
-             line.match(SET_OBJECT_OWNERSHIP)||
-             line.match(SEARCH_PATH)
+             line.match(SET_OBJECT_OWNERSHIP)
 
             unless irrelevant_login_roles.include?(line.match(/ (\S*);$/)[1])
               perm_out_sql << line

data/lib/prodder/prodder.rake

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Prodder
   # The list of default rake tasks which prodder will be removing or replacing.
   # @see databases.rake (currently at lib/active_record/railties/databases.rake)
@@ -96,7 +98,7 @@ namespace :db do
       begin
         puts ActiveRecord::Tasks::DatabaseTasks.collation_current
       rescue NoMethodError
-        $stderr.puts 'Sorry, your database adapter is not supported yet. Feel free to submit a patch.'
+        $stderr.puts 'error: Sorry, your database adapter is not supported yet. Feel free to submit a patch.'
       end
     end
   end
@@ -169,6 +171,7 @@ namespace :db do
       ActiveRecord::Tasks::DatabaseTasks.create_current
       ActiveRecord::Base.configurations.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'])}`
         end
       end
@@ -181,6 +184,7 @@ namespace :db do
         ActiveRecord::Tasks::DatabaseTasks.create_all
         ActiveRecord::Base.configurations.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'])}`
           end
         end
@@ -199,24 +203,26 @@ namespace :db do
   namespace :structure do
     desc "Load db/structure.sql into the current environment's database"
     task :load => dependencies do
-      config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
-      config["username"] = config["superuser"] if config["superuser"] && File.exist?('db/permissions.sql')
-      set_psql_env config
-      puts "Loading db/structure.sql into database '#{config['database']}'"
-      `psql --no-psqlrc -f db/structure.sql #{Shellwords.escape(config['database'])}`
-      raise 'Error loading db/structure.sql' if $?.exitstatus != 0
+      as("superuser", in: ENV['RAILS_ENV'] || Rails.env) do
+        config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
+        set_psql_env config
+        puts "Loading db/structure.sql into database '#{config['database']}'"
+        `psql --no-psqlrc -f db/structure.sql #{Shellwords.escape(config['database'])}`
+        raise 'Error loading db/structure.sql' if $?.exitstatus != 0
+      end
     end
   end
 
   desc "Load initial seeds from db/seeds.sql"
   task :seed => dependencies do
     if File.exist?('db/seeds.sql')
-      config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
-      config["username"] = config["superuser"] if config["superuser"] && File.exist?('db/permissions.sql')
-      set_psql_env config
-      puts "Loading db/seeds.sql into database '#{config['database']}'"
-      `psql --no-psqlrc -f db/seeds.sql #{Shellwords.escape(config['database'])}`
-      raise 'Error loading db/seeds.sql' if $?.exitstatus != 0
+      as("superuser", in: ENV['RAILS_ENV'] || Rails.env) do
+        config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
+        set_psql_env config
+        puts "Loading db/seeds.sql into database '#{config['database']}'"
+        `psql --no-psqlrc -f db/seeds.sql #{Shellwords.escape(config['database'])}`
+        raise 'Error loading db/seeds.sql' if $?.exitstatus != 0
+      end
     else
       puts 'db/seeds.sql not found: no seeds to load.'
     end
@@ -225,12 +231,13 @@ namespace :db do
   desc "Load quality_checks (indexes, triggers, foreign keys) from db/quality_checks.sql"
   task :quality_check => dependencies do
     if File.exist?('db/quality_checks.sql')
-      config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
-      config["username"] = config["superuser"] if config["superuser"] && File.exist?('db/permissions.sql')
-      set_psql_env config
-      puts "Loading db/quality_checks.sql into database '#{config['database']}'"
-      `psql --no-psqlrc -f db/quality_checks.sql #{Shellwords.escape(config['database'])}`
-      raise 'Error loading db/quality_checks.sql' if $?.exitstatus != 0
+      as("superuser", in: ENV['RAILS_ENV'] || Rails.env) do
+        config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
+        set_psql_env config
+        puts "Loading db/quality_checks.sql into database '#{config['database']}'"
+        `psql --no-psqlrc -f db/quality_checks.sql #{Shellwords.escape(config['database'])}`
+        raise 'Error loading db/quality_checks.sql' if $?.exitstatus != 0
+      end
     else
       puts 'db/quality_checks.sql not found: no quality_checks to load.'
     end
@@ -239,21 +246,19 @@ namespace :db do
   desc "Load permissions (DB object level access control, group role memberships) from db/permissions.sql"
   task :permission => dependencies do
     if File.exist?('db/permissions.sql')
-      config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
-      config["username"] = config["superuser"] if config["superuser"]
-      set_psql_env config
-      puts "Loading db/permissions.sql into database '#{config['database']}'"
-      disconnect
-      ActiveRecord::Base.establish_connection((ENV['RAILS_ENV'] || Rails.env).intern)
-      is_super = ActiveRecord::Base.connection.execute(<<-SQL).first['is_super']
-        select 1 as is_super from pg_roles where rolname = '#{config['username']}' and rolsuper
-      SQL
-      unless is_super
-        puts "Restoring permissions as config/database.yml non-superuser: #{config['username']}, expect errors, or rerun after granting superuser"
+      as("superuser", in: ENV['RAILS_ENV'] || Rails.env) do
+        config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
+        set_psql_env config
+        puts "Loading db/permissions.sql into database '#{config['database']}'"
+        result = ActiveRecord::Base.connection.execute(<<-SQL).first
+          select 1 as is_super from pg_roles where rolname = '#{config['username']}' and rolsuper
+        SQL
+        unless result && result['is_super']
+          puts "warning: Restoring permissions as config/database.yml non-superuser: '#{config['username']}', expect errors, or rerun after granting superuser"
+        end
+        `psql --no-psqlrc -f db/permissions.sql #{Shellwords.escape(config['database'])}`
+        raise 'Error loading db/permissions.sql' if $?.exitstatus != 0
       end
-      `psql --no-psqlrc -f db/permissions.sql #{Shellwords.escape(config['database'])}`
-
-      raise 'Error loading db/permissions.sql' if $?.exitstatus != 0
     else
       puts 'db/permissions.sql not found: no permissions to load.'
     end
@@ -261,21 +266,23 @@ namespace :db do
 
   desc "Load database settings"
   task :settings => dependencies do
-    config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
-    config["username"] = config["superuser"] if config["superuser"] && File.exist?('db/permissions.sql')
-    set_psql_env config
-    puts "Loading db/settings.sql into database '#{config['database']}'"
-    disconnect
-    ActiveRecord::Base.establish_connection((ENV['RAILS_ENV'] || Rails.env).intern)
-    is_super = ActiveRecord::Base.connection.execute(<<-SQL).first['is_super']
-      select 1 as is_super from pg_roles where rolname = '#{config['username']}' and rolsuper
-    SQL
-    unless is_super
-      puts "Restoring settings as config/database.yml non-superuser: #{config['username']}, expect errors, or rerun after granting superuser"
+    if File.exist?('db/settings.sql')
+      as("superuser", in: ENV['RAILS_ENV'] || Rails.env) do
+        config = ActiveRecord::Base.configurations[ENV['RAILS_ENV'] || Rails.env]
+        set_psql_env config
+        puts "Loading db/settings.sql into database '#{config['database']}'"
+        result = ActiveRecord::Base.connection.execute(<<-SQL).first
+        select 1 as is_super from pg_roles where rolname = '#{config['username']}' and rolsuper
+        SQL
+        unless result && result['is_super']
+          puts "warning: Restoring settings as config/database.yml non-superuser: '#{config['username']}', expect errors, or rerun after granting superuser"
+        end
+        `psql --no-psqlrc -f db/settings.sql #{Shellwords.escape(config['database'])}`
+        raise 'Error loading db/settings.sql' if $?.exitstatus != 0
+      end
+    else
+      puts 'db/settings.sql not found: no settings to load.'
     end
-    `psql --no-psqlrc -f db/settings.sql #{Shellwords.escape(config['database'])}`
-
-    raise 'Error loading db/settings.sql' if $?.exitstatus != 0
   end
 
   # Empty this, we don't want db:migrate writing structure.sql any more.
@@ -355,7 +362,8 @@ namespace :db do
 
   def as(user, opts = {}, &block)
     if File.exist?('db/permissions.sql')
-      config, config_was = ActiveRecord::Base.configurations.deep_dup, ActiveRecord::Base.configurations.deep_dup
+      # `ActiveRecord::Base.configurations` in Rails 6 now returns an object instead of a hash
+      config, config_was = ActiveRecord::Base.configurations.deep_dup.to_h, 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

data/lib/prodder/project.rb

@@ -45,9 +45,8 @@ module Prodder
         contents = File.readlines(structure_file_name)
         rgx = /^\-\- .* Type: INDEX; |^\-\- .* Type: TRIGGER; |^\-\- .* Type: FK CONSTRAINT; /
         structure, *quality = contents.slice_before(rgx).to_a
-        quality_checks = structure.grep(/SET search_path/).last + quality.join
 
-        File.open(quality_check_file_name, 'w') { |f| f.write(quality_checks) }
+        File.open(quality_check_file_name, 'w') { |f| f.write(quality.join) }
         File.open(structure_file_name, 'w') { |f| f.write(structure.join) }
       end
 

data/lib/prodder/version.rb

@@ -1,3 +1,3 @@
 module Prodder
-  VERSION = "1.7.2"
+  VERSION = "1.7.7"
 end

data/spec/config_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Prodder::Config, 'linting' do
+RSpec.describe Prodder::Config, 'linting' do
   let(:valid_config) { YAML.load Prodder::Config.example_contents }
 
   def config_without(path)
@@ -21,7 +21,6 @@ describe Prodder::Config, 'linting' do
   end
 
   context 'missing required key:' do
-
     %w[structure_file
        seed_file
 
@@ -35,15 +34,14 @@ describe Prodder::Config, 'linting' do
        git/author
     ].each do |path|
       specify path do
-        errors_for(config_without "blog/#{path}").should ==
-          ["Missing required configuration key: blog/#{path}"]
+        expect(errors_for(config_without "blog/#{path}")).to eq ["Missing required configuration key: blog/#{path}"]
       end
     end
   end
 
   context 'optional keys:' do
     specify 'db/password' do
-      errors_for(config_without 'blog/db/password').should be_empty
+      expect(errors_for(config_without 'blog/db/password')).to be_empty
     end
   end
 
@@ -53,12 +51,12 @@ describe Prodder::Config, 'linting' do
       expect {
         config.lint!
       }.to raise_error(Prodder::Config::LintError) { |ex|
-        ex.errors.should == ['Missing required configuration key: blog/db/name']
+        expect(ex.errors).to eq ['Missing required configuration key: blog/db/name']
       }
     end
 
     it 'returns an empty collection if there are no errors' do
-      Prodder::Config.new(valid_config).lint!.should == []
+      expect(Prodder::Config.new(valid_config).lint!).to eq []
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
 require 'rspec'
 require 'pry'
 require 'prodder'
+
+RSpec.configure do |config|
+  config.disable_monkey_patching!
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prodder
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.7
 platform: ruby
 authors:
 - Kyle Hargraves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deject
@@ -35,7 +35,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -82,8 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Maintain your Rails apps' structure, seed and quality_checks files using

data/Gemfile.lock

@@ -1,64 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    benzo (2.0.0)
-      cocaine (~> 0.4.2)
-    builder (3.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cocaine (0.4.2)
-    coderay (1.0.8)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    deject (0.2.3)
-    diff-lcs (1.1.3)
-    ffi (1.2.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    json (1.8.3)
-    method_source (0.8.1)
-    pg (0.18.2)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    pry-remote (0.1.6)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    slop (3.3.3)
-    thor (0.16.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  benzo
-  cocaine
-  cucumber
-  deject
-  pg
-  pry
-  pry-remote
-  rake
-  rspec
-  thor
-
-BUNDLED WITH
-   1.11.2