effective_developer 0.4.15 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7cccd4c476002105c649c582f9fe243d7ec605941756b705c0fba8012cd8db
-  data.tar.gz: dddc8875b4723c497471b4445e42c6e45de0c59fab4a2493062d608b236fa68d
+  metadata.gz: 9b699364e669ff684e3f426ba3a61ff3d3ed9033fc5de0d87e47f0525aab757f
+  data.tar.gz: 4c86bfca263befc898633b2d260b9a439da0da12257afeb66cf45413786c714d
 SHA512:
-  metadata.gz: 8301e15ea438d1e927b601824f96a352ce996d653200e21509bdceb738f2f69bdbb522d7570656e3d6265a6607d0574f312ebb44624ae31f2063aa840f56af11
-  data.tar.gz: 8f89d98d3413016395f27d4d1576c1c6514a0820734f18f4acde0374d6c66eb954554349ead83aaddbfb26711d8afce83213cf94ebbb58bc109304a7292a8da9
+  metadata.gz: 193641e2323b3fb9d68f77e4d429021d2064a142feeb040e6f08ff3fa24ae0452ee6016e42f363746144a9c5ce26f51b9d92af6901a7c1e8987ec508df91bbfb
+  data.tar.gz: 97783809f4dc074280d343b59803e8d1a3d23c5ea49e19cdaebdacfc9575abfe66f32b077435f966887f1270c631bf96f94ee6e9baa06ce3d93584223c8013f8

data/lib/effective_developer/version.rb

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

data/lib/tasks/pg_pull.rake

@@ -6,17 +6,60 @@ namespace :pg do
   # 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|
+
+    # Heroku mode
     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"
+      args.with_defaults(remote: 'heroku')
+
+      puts "=== Pulling remote '#{args.remote}' database into latest.dump"
+
+      # Create a backup on heroku
+      unless system("heroku pg:backups:capture --remote #{args.remote}")
+        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
 
-    Rake::Task['pg:load'].invoke
+    # 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
+
+      # 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
+
+    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
@@ -29,6 +72,7 @@ namespace :pg do
 
     config = ActiveRecord::Base.configurations[Rails.env]
     db = { username: (config['username'] || `whoami`), password: config['password'], host: config['host'], port: (config['port'] || 5432), database: config['database'] }
+    db.transform_values! { |v| v.respond_to?(:chomp) ? v.chomp : v }
 
     puts "=== Loading #{args.file_name} into local '#{db[:database]}' database"
 
@@ -43,7 +87,7 @@ namespace :pg do
     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
 
@@ -54,25 +98,23 @@ namespace :pg do
     args.with_defaults(:file_name => 'latest.dump')
 
     db = if ENV['DATABASE_URL'].to_s.length > 0
-      regex = Regexp.new(/postgres:\/\/(\w+):(\w+)@(.+):(\d+)\/(\w+)/)
-      info = ENV['DATABASE_URL'].match(regex)
+      uri = URI.parse(ENV['DATABASE_URL']) rescue nil
+      abort("Invalid DATABASE_URL") unless uri.present?
 
-      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] }
+      { 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`), password: config['password'], host: config['host'], port: (config['port'] || 5432), database: config['database'] }
+      { username: (config['username'] || `whoami`.chomp), password: config['password'], host: config['host'], port: (config['port'] || 5432), database: config['database'] }
     end
 
+    db.transform_values! { |v| v.respond_to?(:chomp) ? v.chomp : v }
+
     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
 
@@ -85,20 +127,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
 
@@ -110,7 +149,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
@@ -121,14 +160,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"
 
@@ -137,7 +176,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
@@ -145,11 +184,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.15
+  version: 0.5.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,8 +95,6 @@ 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
@@ -120,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.

data/lib/tasks/hatchbox.rake

@@ -1,15 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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