effective_developer 0.4.14 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e92fc9bd9a51a447bd0128b11463ac1e06c854389e1e996872c5f012b02e47
-  data.tar.gz: 87049e6643aaa2235639729e97d93d48f642827a53a9cefe8aab34b1d206ea1e
+  metadata.gz: 0deae13cd4fb9d39c7108dbe297cbccce12e308dc8510f4f974c634a7d4045ee
+  data.tar.gz: 575191ece3ae021c25de70db77066cc0893cd7713707a63f1b700586c1a4b547
 SHA512:
-  metadata.gz: 67119ab7a04b64551565dacc737a8bf95eb06793c0bab5fbd6bf26b3e8f2afc7a62e4c2e686b4b48f55db477f86e70147a1ab3d30f9c7b13b21b36a403a60bf8
-  data.tar.gz: 6908000780ca6d53f58dd21ca7a6cf15f757113db5e27e8b2aaa6ef4ae09c15efb60a5965b50c03801c28e4fb9751074dea193c1445d6880df2499820304bcb4
+  metadata.gz: 103153bf5fe52387af807cb90b2855f17bfc490af84e2f1b7dcb058deac2b1e1901c5feb04a00119f66ad51db9363f44ad2224d346c570a251711f45143742c1
+  data.tar.gz: b9b6041460328adad3dc4910f0548171a35fd89a1b518d8a515f18740f8238f6db62629a8ef5d7530babe3677799d409f44129a86651a89af7b9d8edca4a3094

data/lib/effective_developer/version.rb

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

data/lib/tasks/pg_pull.rake

@@ -1,29 +1,65 @@
 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"
+    # Heroku mode
+    if `git remote -v | grep heroku`.length > 0
+      args.with_defaults(remote: 'heroku')
 
-    Bundler.with_clean_env do
+      puts "=== Pulling remote '#{args.remote}' database into latest.dump"
+
+      # Create a backup on heroku
       unless system("heroku pg:backups:capture --remote #{args.remote}")
-        puts "Error capturing heroku backup"
-        exit
+        abort("Error capturing heroku backup")
+      end
+
+      # Download it to local
+      unless system("curl -o latest.dump `heroku pg:backups:public-url --remote #{args.remote}`")
+        abort("Error downloading database")
+      end
+
+      # Load it
+      Rake::Task['pg:load'].invoke
+      exit
+    end
+
+    # Hatchbox mode
+    if (ENV['HATCHBOX_IP'] || args[:remote]).count('.') == 3
+      args.with_defaults(
+        remote: ENV.fetch('HATCHBOX_IP'),
+        app: ENV['HATCHBOX_APP'] || `pwd`.split('/').last.chomp,
+        user: ENV['HATCHBOX_USER'] || 'deploy'
+      )
+
+      puts "=== Pulling hatchbox '#{args.remote}' #{args.app} database into latest.dump"
+
+      # SSH into hatchbox and call rake pg:save there to create latest.dump
+      unless(result = `ssh #{args.user}@#{args.remote} << EOF
+        cd ~/#{args.app}/current/
+        bundle exec rake pg:save[latest.dump]
+      `).include?('Saving database completed') # The output of pg:save down below
+        puts("Error calling ssh #{args.user}@#{args.remote} and running rake pg:save on hatchbox from ~/#{args.app}/current/")
+        abort(result)
       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
+      # SCP to copy the hatchkbox latest.dump to local
+      unless system("scp #{args.user}@#{args.remote}:~/#{args.app}/current/latest.dump ./")
+        abort("Error downloading database")
       end
+
+      # Load it
+      Rake::Task['pg:load'].invoke
+      exit
     end
 
-    Rake::Task['pg:load'].invoke
+    puts "Unable to find pg:pull provider."
+    puts "Please add a heroku git remote or a HATCHBOX_IP environment variable and try again"
+    abort
   end
 
   # Drops and re-creates the local database then initializes database with latest.dump
@@ -33,9 +69,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,10 +83,10 @@ 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"
+      abort "Error loading database"
     end
   end
 
@@ -57,14 +95,23 @@ 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
+      uri = URI.parse(ENV['DATABASE_URL']) rescue nil
+      abort("Invalid DATABASE_URL") unless uri.present?
 
-    if system("pg_dump -Fc --no-acl --no-owner -h localhost -U '#{db['username']}' '#{db['database']}' > #{args.file_name}")
+      { username: uri.user, password: uri.password, host: uri.host, port: (uri.port || 5432), database: uri.path.sub('/', '') }
+    else
+      config = ActiveRecord::Base.configurations[Rails.env]
+      { username: (config['username'] || `whoami`.chomp), 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("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"
+      abort "Error saving database"
     end
   end
 
@@ -77,20 +124,17 @@ namespace :pg do
 
     Bundler.with_clean_env do
       unless system("heroku pg:backups:capture --remote #{args.source_remote}")
-        puts "Error capturing heroku backup"
-        exit
+        abort "Error capturing heroku backup"
       end
 
       url = (`heroku pg:backups:public-url --remote #{args.source_remote}`).chomp
 
       unless (url || '').length > 0
-        puts "Error reading public-url from remote #{args.source_remote}"
-        exit
+        abort "Error reading public-url from remote #{args.source_remote}"
       end
 
       unless system("heroku pg:backups:restore '#{url}' DATABASE_URL --remote #{args.target_remote}")
-        puts "Error cloning heroku backup"
-        exit
+        abort "Error cloning heroku backup"
       end
     end
 
@@ -102,7 +146,7 @@ namespace :pg do
     args.with_defaults(:remote => 'heroku')
 
     if args.table.blank?
-      puts "Error, no table name specified. Expected usage: rake pg:push_table[prices]"; exit
+      abort "Error, no table name specified. Expected usage: rake pg:push_table[prices]"
     end
 
     # Find and parse my heroku database info
@@ -113,14 +157,14 @@ namespace :pg do
     if info.blank? || info.length != 6
       puts "Unable to find heroku DATABASE_URL"
       puts "Expected \"heroku config --remote #{args.remote} | grep DATABASE_URL\" to be present"
-      exit
+      abort
     end
 
     heroku = { username: info[1], password: info[2], host: info[3], port: info[4], database: info[5] }
 
     # Confirm destructive operation
     puts "WARNING: this task will overwrite the #{args.table} database table on #{args.remote}. Proceed? (y/n)"
-    (puts 'Aborted' and exit) unless STDIN.gets.chomp.downcase == 'y'
+    abort('Aborted') unless STDIN.gets.chomp.downcase == 'y'
 
     puts "=== Cloning local table '#{args.table}' to remote #{args.remote} database"
 
@@ -129,7 +173,7 @@ namespace :pg do
     tmpfile = "tmp/#{args.table}.sql"
 
     unless system("pg_dump --data-only --table=#{args.table} -h localhost -U '#{db['username']}' '#{db['database']}' > #{tmpfile}")
-      puts "Error dumping local database table"; exit
+      abort "Error dumping local database table"
     end
 
     # Now restore it to heroku
@@ -137,11 +181,11 @@ namespace :pg do
     delete = args.table.split(',').map { |table| "DELETE FROM #{table}" }.join(';')
 
     unless system("#{psql} -c \"#{delete}\"")
-      puts "Error deleting remote table data"; exit
+      abort "Error deleting remote table data"
     end
 
     unless system("#{psql} < #{tmpfile}")
-      puts "Error pushing table to remote database"; exit
+      abort "Error pushing table to remote database"
     end
 
     # Delete tmpfile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.5.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Provides some quality of life developer tools.