prodder 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26e389eb90419a1ac54845075f953e58fd3b1035214854773ead1528c338707a
-  data.tar.gz: b57a008eca5e26de21fbbc47f25e7ffd582b6f5a0d5228e913154dbb502cfe5b
+  metadata.gz: bffad577e74259c3700295becff4baeafd8fa42038529e104e46edf6cbd59ca2
+  data.tar.gz: 0283df1e58d3b49ea8c51bf7b715230bffbf9b51e031ae5450c5c9d83dcb6c36
 SHA512:
-  metadata.gz: e856705e7bcdd77de90de067aa20093ada1e6da740bdb3643134de9b9c6a5e164776d7aa7c5f3f02b3bcf0f93bac526a56cda7ce0662d2beadb6410a896025ce
-  data.tar.gz: b36befbd98f1e3df3c7674f30fbc82f9ddd2766805c597e2f6340a3e0068dc6b72c54be7fc795f168bc3b3b67b9e4ae5742ed13c6f11a25d9a307084f21e9808
+  metadata.gz: 0cd59679ebdf492e96a0f1858217660dca26f68b910d38df60cd9877de773a4998e90280900cc539ad4eb286ae4ce995e33aebfb3f8f8a76ee4925dc95da9203
+  data.tar.gz: 6e144e41880ed23e55f11ab6688b5bfdcba6fdf46faa451cb096c42c38a1e8778f98e558adbfee27f40981f0b56f1b3a095b325c29af0da4656f09c39d773d0e

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/lib/prodder/prodder.rake

@@ -203,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
@@ -229,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
@@ -243,20 +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)
-      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"
+      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
@@ -265,20 +267,19 @@ namespace :db do
   desc "Load database settings"
   task :settings => dependencies do
     if File.exist?('db/settings.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/settings.sql into database '#{config['database']}'"
-      disconnect
-      ActiveRecord::Base.establish_connection((ENV['RAILS_ENV'] || Rails.env).intern)
-      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"
+      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
-      `psql --no-psqlrc -f db/settings.sql #{Shellwords.escape(config['database'])}`
-      raise 'Error loading db/settings.sql' if $?.exitstatus != 0
     else
       puts 'db/settings.sql not found: no settings to load.'
     end

data/lib/prodder/version.rb

@@ -1,3 +1,3 @@
 module Prodder
-  VERSION = "1.7.5"
+  VERSION = "1.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prodder
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Kyle Hargraves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deject
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Maintain your Rails apps' structure, seed and quality_checks files using