effective_developer 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db076604fcb663e2f5ad49b01da50837dfde6c9ae38b9be6d6ba3b265504a44
-  data.tar.gz: cd78feba26b117b151bdea4b0f6840d5bb01851b9d522d2e0df4bb68dd669f4e
+  metadata.gz: fc26ec312df01c35b4f0541fbb8fee46f5b93c32c615cd3c1f0c8c659b67110a
+  data.tar.gz: 74a960c89033ea9531c3d0950e97d2e4bcac7c4d7a64ee4e9bc6cd1029e7ac51
 SHA512:
-  metadata.gz: '0338a8bcac5b91c619acf7b4137c26a992a5398ee79444e50f47efee88051ba2bbf128998c095086de636fec797f246e778e9a2139a4644651b399e1c170863d'
-  data.tar.gz: 90f4c12d302a98c1be2e46da4b0d04bbc123953ddebd4864a8dd79d2837273ebf58a7492bd244fd9e78df3642286729d762dfb82f7a751e080c772001dd025ea
+  metadata.gz: d63cb384af0910ac4f33e2696e4c72ab388fce049c31e35174bd940da6cbfc699e0bc5dcf821e72a60a1d000d6644b351ed231d9b5c5a180bcca8da7d71f5566
+  data.tar.gz: efeb52d66a9c083038609146ac5901ed8cd9521ff5ef74e0cd7537d4ac1fe2d9609095a2d79d998150612c7e2e52ce11ab1f377b824cd6bac21a574d62c1701b

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/lib/tasks/pg_pull.rake

@@ -4,14 +4,35 @@ namespace :pg do
   # bundle exec rake pg:pull
   # bundle exec rake pg:pull[staging]
   # bundle exec rake pg:pull[158.204.33.124]
+
+  # bundle exec rake pg:pull
+  # bundle exec rake pg:pull[staging]
+  # bundle exec rake pg:pull[158.204.33.124]
+  # bundle exec rake pg:pull filename=latest.dump database=example
+  # DATABASE=example bundle exec rake pg:load
   desc 'Creates a new backup on remote server and downloads it to latest.dump'
   task :pull, [:remote] => :environment do |t, args|
+    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }
+    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'] }
+    keywords = ARGV.map { |a| a.split('=') if a.include?('=') }.compact.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
+    args.with_defaults(defaults.compact.merge(env_keys.compact).merge(keywords))
+
+    # Validate Config
+    config = ActiveRecord::Base.configurations[Rails.env]
+    configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+
+    if configs.length > 1 && args.database.blank?
+      puts "Multiple database configs exist for #{Rails.env} environment."
+      puts "Please run bundle exec rake pg:pull database=x"
+      puts "Where x is one of: #{configs.map { |config| config.name }.to_sentence}"
+      exit
+    end
 
     # Heroku mode
     if `git remote -v | grep heroku`.length > 0
       args.with_defaults(remote: 'heroku')
 
-      puts "=== Pulling remote '#{args.remote}' database into latest.dump"
+      puts "=== Pulling remote '#{args.remote}' #{args.database} database into #{args.filename}"
 
       # Create a backup on heroku
       unless system("heroku pg:backups:capture --remote #{args.remote}")
@@ -19,12 +40,12 @@ namespace :pg do
       end
 
       # Download it to local
-      unless system("curl -o latest.dump `heroku pg:backups:public-url --remote #{args.remote}`")
+      unless system("curl -o #{args.filename} `heroku pg:backups:public-url --remote #{args.remote}`")
         abort("Error downloading database")
       end
 
       # Load it
-      Rake::Task['pg:load'].invoke
+      Rake::Task['pg:load'].invoke(*args)
       exit
     end
 
@@ -36,24 +57,24 @@ namespace :pg do
         user: ENV['HATCHBOX_USER'] || 'deploy'
       )
 
-      puts "=== Pulling hatchbox '#{args.remote}' #{args.app} database into latest.dump"
+      puts "=== Pulling hatchbox '#{args.remote}' #{args.app} #{args.database} database into #{args.filename}"
 
       # SSH into hatchbox and call rake pg:save there to create latest.dump
-      unless(result = `ssh #{args.user}@#{args.remote} << EOF
+      unless(result = `ssh -T #{args.user}@#{args.remote} << EOF
         cd ~/#{args.app}/current/
-        bundle exec rake pg:save[latest.dump]
+        bundle exec rake pg:save database=#{args.database} filename=#{args.filename}
       `).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 ./")
+      unless system("scp #{args.user}@#{args.remote}:~/#{args.app}/current/#{args.filename} ./")
         abort("Error downloading database")
       end
 
       # Load it
-      Rake::Task['pg:load'].invoke
+      Rake::Task['pg:load'].invoke(*args)
       exit
     end
 
@@ -67,6 +88,7 @@ namespace :pg do
   # bundle exec rake pg:load => Will replace the current database with latest.dump
   # bundle exec rake pg:load[something.dump] => Will replace the current database with something.dump
   # bundle exec rake pg:load filename=latest.dump database=example
+  # DATABASE=example bundle exec rake pg:load
   desc 'Loads a postgresql .dump file into the development database (latest.dump by default)'
   task :load, [:filename] => :environment do |t, args|
     defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }
@@ -106,19 +128,6 @@ namespace :pg do
 
     puts "=== Loading #{args.filename} into local '#{db[:database]}' database"
 
-    # bin/rails db:environment:set RAILS_ENV=development
-    if Rails.env != 'production'
-      ENV['DISABLE_DATABASE_ENVIRONMENT_CHECK'] = '1'
-    end
-
-    if configs.length > 1
-      Rake::Task["db:drop:#{args.database}"].invoke
-      Rake::Task["db:create:#{args.database}"].invoke
-    else
-      Rake::Task['db:drop'].invoke
-      Rake::Task['db:create'].invoke
-    end
-
     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.filename}")
       puts "Loading database completed"
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails