effective_developer 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e92fc9bd9a51a447bd0128b11463ac1e06c854389e1e996872c5f012b02e47
-  data.tar.gz: 87049e6643aaa2235639729e97d93d48f642827a53a9cefe8aab34b1d206ea1e
+  metadata.gz: 2f7cccd4c476002105c649c582f9fe243d7ec605941756b705c0fba8012cd8db
+  data.tar.gz: dddc8875b4723c497471b4445e42c6e45de0c59fab4a2493062d608b236fa68d
 SHA512:
-  metadata.gz: 67119ab7a04b64551565dacc737a8bf95eb06793c0bab5fbd6bf26b3e8f2afc7a62e4c2e686b4b48f55db477f86e70147a1ab3d30f9c7b13b21b36a403a60bf8
-  data.tar.gz: 6908000780ca6d53f58dd21ca7a6cf15f757113db5e27e8b2aaa6ef4ae09c15efb60a5965b50c03801c28e4fb9751074dea193c1445d6880df2499820304bcb4
+  metadata.gz: 8301e15ea438d1e927b601824f96a352ce996d653200e21509bdceb738f2f69bdbb522d7570656e3d6265a6607d0574f312ebb44624ae31f2063aa840f56af11
+  data.tar.gz: 8f89d98d3413016395f27d4d1576c1c6514a0820734f18f4acde0374d6c66eb954554349ead83aaddbfb26711d8afce83213cf94ebbb58bc109304a7292a8da9

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.4.14'.freeze
+  VERSION = '0.4.15'.freeze
 end

data/lib/tasks/hatchbox.rake

@@ -0,0 +1,15 @@
+namespace :hatchbox do
+  namespace :pg do
+    # Creates a new backup on heroku, downloads that backup to latest.dump, and then calls pg:load
+    #
+    # bundle exec rake heroku:pull
+    # bundle exec rake heroku:pull[staging]
+    desc 'Pulls a newly captured backup from heroku (--remote heroku by default) and calls pg:load'
+    task :pull, [:remote] => :environment do |t, args|
+      args.with_defaults(remote: ENV['HATCHBOX_IP'])
+
+      puts "=== Pulling remote '#{args.remote}' database into latest.dump"
+    end
+
+  end
+end

data/lib/tasks/heroku.rake

@@ -0,0 +1,28 @@
+namespace :heroku do
+  namespace :pg do
+    # Creates a new backup on heroku, downloads that backup to latest.dump, and then calls pg:load
+    #
+    # bundle exec rake heroku:pg:pull
+    # bundle exec rake heroku:pg:pull[staging]
+    desc 'Pulls a newly captured backup from heroku (--remote heroku by default)'
+    task :pull, [:remote] => :environment do |t, args|
+      args.with_defaults(remote: 'heroku')
+
+      puts "=== Pulling remote '#{args.remote}' database into latest.dump"
+
+      Bundler.with_clean_env do
+        unless system("heroku pg:backups:capture --remote #{args.remote}")
+          puts("Error capturing heroku backup")
+          exit
+        end
+
+        if system("curl -o latest.dump `heroku pg:backups:public-url --remote #{args.remote}`")
+          puts "Downloading database completed"
+        else
+          puts "Error downloading database"
+        end
+      end
+    end
+
+  end
+end

data/lib/tasks/pg_pull.rake

@@ -1,26 +1,19 @@
 namespace :pg do
-  # Creates a new backup on heroku, downloads that backup to latest.dump, and then calls pg:load
+  # Creates a new backup on remote server, downloads that backup to latest.dump, and then calls pg:load
   #
   # bundle exec rake pg:pull
   # bundle exec rake pg:pull[staging]
-  desc 'Pulls a newly captured backup from heroku (--remote heroku by default) and calls pg:load'
+  # bundle exec rake pg:pull[158.204.33.124]
+  desc 'Creates a new backup on remote server and downloads it to latest.dump'
   task :pull, [:remote] => :environment do |t, args|
-    args.with_defaults(:remote => 'heroku')
-
-    puts "=== Pulling remote '#{args.remote}' database into latest.dump"
-
-    Bundler.with_clean_env do
-      unless system("heroku pg:backups:capture --remote #{args.remote}")
-        puts "Error capturing heroku backup"
-        exit
-      end
-
-      if system("curl -o latest.dump `heroku pg:backups:public-url --remote #{args.remote}`")
-        puts "Downloading database completed"
-      else
-        puts "Error downloading database"
-        exit
-      end
+    if `git remote -v | grep heroku`.length > 0
+      Rake::Task['heroku:pg:pull'].invoke(args[:remote])
+    elsif (args[:remote] || ENV['HATCHBOX_IP']).to_s.count('.') == 3
+      Rake::Task['hatchbox:pg:pull'].invoke(args[:remote])
+    else
+      puts "Unable to find pg:pull provider."
+      puts "Please add a heroku git remote or a HATCHBOX_IP environment variable and try again"
+      exit
     end
 
     Rake::Task['pg:load'].invoke
@@ -33,9 +26,11 @@ namespace :pg do
   desc 'Loads a postgresql .dump file into the development database (latest.dump by default)'
   task :load, [:file_name] => :environment do |t, args|
     args.with_defaults(:file_name => 'latest.dump')
-    db = ActiveRecord::Base.configurations[Rails.env]
 
-    puts "=== Loading #{args.file_name} into local '#{db['database']}' database"
+    config = ActiveRecord::Base.configurations[Rails.env]
+    db = { username: (config['username'] || `whoami`), password: config['password'], host: config['host'], port: (config['port'] || 5432), database: config['database'] }
+
+    puts "=== Loading #{args.file_name} into local '#{db[:database]}' database"
 
     # bin/rails db:environment:set RAILS_ENV=development
     if Rails.env != 'production'
@@ -45,7 +40,7 @@ namespace :pg do
     Rake::Task['db:drop'].invoke
     Rake::Task['db:create'].invoke
 
-    if system("pg_restore --no-acl --no-owner --clean --if-exists -h localhost -U #{db['username']} -d #{db['database']} #{args.file_name}")
+    if system("export PGPASSWORD=#{db[:password]}; pg_restore --no-acl --no-owner --clean --if-exists -h #{db[:host]} -U #{db[:username]} -d #{db[:database]} #{args.file_name}")
       puts "Loading database completed"
     else
       puts "Error loading database"
@@ -57,11 +52,24 @@ namespace :pg do
   desc 'Saves the development database to a postgresql .dump file (latest.dump by default)'
   task :save, [:file_name] => :environment do |t, args|
     args.with_defaults(:file_name => 'latest.dump')
-    db = ActiveRecord::Base.configurations[Rails.env]
 
-    puts "=== Saving local '#{db['database']}' database to #{args.file_name}"
+    db = if ENV['DATABASE_URL'].to_s.length > 0
+      regex = Regexp.new(/postgres:\/\/(\w+):(\w+)@(.+):(\d+)\/(\w+)/)
+      info = ENV['DATABASE_URL'].match(regex)
+
+      if info.blank? || info.length != 6
+        puts("Invalid DATABASE_URL") and exit
+      end
+
+      { username: info[1], password: info[2], host: info[3], port: info[4], database: info[5] }
+    else
+      config = ActiveRecord::Base.configurations[Rails.env]
+      { username: (config['username'] || `whoami`), password: config['password'], host: config['host'], port: (config['port'] || 5432), database: config['database'] }
+    end
+
+    puts "=== Saving local '#{db[:database]}' database to #{args.file_name}"
 
-    if system("pg_dump -Fc --no-acl --no-owner -h localhost -U '#{db['username']}' '#{db['database']}' > #{args.file_name}")
+    if system("export PGPASSWORD=#{db[:password]}; pg_dump -Fc --no-acl --no-owner -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} #{db[:database]} > #{args.file_name}")
       puts "Saving database completed"
     else
       puts "Error saving database"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,6 +95,8 @@ files:
 - lib/scaffolds/models/model.rb
 - lib/scaffolds/views/_resource.html.haml
 - lib/tasks/effective_csv_importer.rake
+- lib/tasks/hatchbox.rake
+- lib/tasks/heroku.rake
 - lib/tasks/pg_pull.rake
 - lib/tasks/rename_class.rake
 - lib/tasks/reset_pk_sequence.rake