prodder 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7018f84da517a86834a557666183b7a8fd81d9b3
-  data.tar.gz: 33a7fe098859ec975862a8413f29a38cf3a4a8e1
+  metadata.gz: 46d073f63217c538b5ec9fa2a83c668548f95673
+  data.tar.gz: e1e81386094c8c7054c2bea7228db0bd345ea385
 SHA512:
-  metadata.gz: c05ab47457496eeabdbcbe792dacd9069b5c1ef8d1f3c21ddc5bf81e460e9648994f6c2e5aa0352aac7ce1faba642acb0a7794844a7465f6c9670020e6eb4f27
-  data.tar.gz: 9258441141b1ec6f90052bf898c99735ad2cb9e2e7be3d334baa5ef1e9b4406b648554275196fd192736f91218184d0c26d064dccc9bfd4435e3b0a89fdb99b3
+  metadata.gz: d6f9275cf746c5dcfd50e05e5c1d21eaabbfe8316e5107f358e38fd62f52e1b070accf1dcc9d9bcc119768883804ebc8b6c4add17172d31c71a3010aec7e7076
+  data.tar.gz: 81bf60f578179fdb3a39011826a0ed4bbcc84c24c6294ef82f193e3115c9bb086b6d8aaa1600f87931377c820c0004714622ae9380220f3813416994c0c51c2a

data/.travis.yml

@@ -18,7 +18,7 @@ before_install:
   # 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
+  - if [[ "$PG_VERSION" = "9.5" ]]; then echo "setting up users for pg9.5"; PGUSER=postgres createuser --superuser travis || echo role travis already exists.; fi
   # setup pg_dump
   - sudo ln -sfn /usr/lib/postgresql/$PG_VERSION/bin/pg_dump /usr/bin/pg_dump
   # start up the specific version of PG

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

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)
@@ -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
@@ -210,71 +214,77 @@ namespace :db do
 
   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
-    else
+    unless File.exist?('db/seeds.sql')
       puts 'db/seeds.sql not found: no seeds to load.'
+      return
     end
+
+    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
   end
 
   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
-    else
+    unless File.exist?('db/quality_checks.sql')
       puts 'db/quality_checks.sql not found: no quality_checks to load.'
+      return
     end
+
+    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
   end
 
   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"
-      end
-      `psql --no-psqlrc -f db/permissions.sql #{Shellwords.escape(config['database'])}`
-
-      raise 'Error loading db/permissions.sql' if $?.exitstatus != 0
-    else
+    unless File.exist?('db/permissions.sql')
       puts 'db/permissions.sql not found: no permissions to load.'
+      return
     end
+
+    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 "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
 
   desc "Load database settings"
   task :settings => dependencies do
+    unless File.exist?('db/settings.sql')
+      puts 'db/settings.sql not found: no settings to load.'
+      return
+    end
+
     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']
+    result = ActiveRecord::Base.connection.execute(<<-SQL).first
       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"
+    unless result && result['is_super']
+      puts "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
 

data/lib/prodder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prodder
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Kyle Hargraves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deject