prodder 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d073f63217c538b5ec9fa2a83c668548f95673
-  data.tar.gz: e1e81386094c8c7054c2bea7228db0bd345ea385
+  metadata.gz: d6ea348f3b248b5660b358f476eae0339608c3d0
+  data.tar.gz: dcb3d21cb200fdce2755505f221c115da3b3548c
 SHA512:
-  metadata.gz: d6f9275cf746c5dcfd50e05e5c1d21eaabbfe8316e5107f358e38fd62f52e1b070accf1dcc9d9bcc119768883804ebc8b6c4add17172d31c71a3010aec7e7076
-  data.tar.gz: 81bf60f578179fdb3a39011826a0ed4bbcc84c24c6294ef82f193e3115c9bb086b6d8aaa1600f87931377c820c0004714622ae9380220f3813416994c0c51c2a
+  metadata.gz: 381f5e5da69fa8513382656c1734fd8b3aeb4cf33114652e7d46382f42fb58aae9f8c6e302bce3a7cff9f0d98417bbcabd787dc3dff41754cd7866945d5e198b
+  data.tar.gz: 54c89d1d27dab947d1039c3347fae18c1e65641097163692fe5597360a940630d92bfefdf458c3f612d8cb371b655505b0348a7d2a236bc3611693d33e7384dc

data/lib/prodder/prodder.rake

@@ -98,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
@@ -214,78 +214,74 @@ namespace :db do
 
   desc "Load initial seeds from db/seeds.sql"
   task :seed => dependencies do
-    unless File.exist?('db/seeds.sql')
+    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
       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
-    unless File.exist?('db/quality_checks.sql')
+    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
       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
-    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
+    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 "Restoring permissions as config/database.yml non-superuser: '#{config['username']}', expect errors, or rerun after granting superuser"
+      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
+    else
+      puts 'db/permissions.sql not found: no permissions to load.'
     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)
-    result = ActiveRecord::Base.connection.execute(<<-SQL).first
+    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 "Restoring settings as config/database.yml non-superuser: '#{config['username']}', expect errors, or rerun after granting superuser"
+      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
+    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.

data/lib/prodder/version.rb

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

metadata

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