effective_developer 0.4.16 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d56abcd9d4964e1ef609e137ee2e5cf0af65fef0b94420b75ece42f5dea60a9
-  data.tar.gz: 626969c07fd04d4886b2b6044111ec3651c8f682dbb316318106f2528dca7dd1
+  metadata.gz: 5b1e21ed1c3b2080e07244e8e7d01cb9b611ce045c9c8ffa2073caded089f6c1
+  data.tar.gz: a0be18c08741489856b6aff27861d4b5408c4db12bd9e33b9e8898f072c47fd6
 SHA512:
-  metadata.gz: 046a257cd7af7e70f2973f3d6082758a66c54982e8ee4b34f32ee91146ef43dd66c4c1b04dc7eb9d2503a5321d83d64f159d715d17f19bcf4b41d64f6427a555
-  data.tar.gz: 904fe1dea98e96c21e87c7a74c6c2b7364025edc208719e6d657915566d3de47851892de84811b7e14ab6601edb65dcfecfd543aace4ec6f1bfa3edc5f47c15c
+  metadata.gz: 8c2822c02d0ce42a2f875ff1efa2dd84df01063e2d18dd14dcbb08b1379e9eaa19bcb6dafa1453943c953b8debaae210054973d6de7d6def7a3a4f0eb22ce6e0
+  data.tar.gz: a0f964f2d4e70ee5624618cd44819d8a97cd3875e9a3dac2531552fe12484d1a09031d96a12ac1729e28522c4110ece5208c49e9d8765acd0efa649537d2e1e2

data/lib/effective_developer.rb

@@ -1,4 +1,5 @@
 require 'effective_resources'
+require 'rails/generators'
 require 'generators/effective/helpers'
 require 'effective_developer/engine'
 require 'effective_developer/version'

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.4.16'.freeze
+  VERSION = '0.5.4'.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"
-      abort
+      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
+
+    # 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
 
-    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
@@ -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"
 
@@ -60,9 +104,11 @@ namespace :pg do
       { 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}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.5.4
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-09-09 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
@@ -105,7 +103,7 @@ homepage: https://github.com/code-and-effect/effective_developer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,8 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Provides some quality of life developer tools.
 test_files: []

data/lib/tasks/hatchbox.rake

@@ -1,17 +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"
-
-      #scp deploy@159.203.32.114:~/cab/current/latest.dump ./
-    end
-
-  end
-end

data/lib/tasks/heroku.rake

@@ -1,27 +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}")
-          abort("Error capturing heroku backup")
-        end
-
-        if system("curl -o latest.dump `heroku pg:backups:public-url --remote #{args.remote}`")
-          puts("Downloading database completed")
-        else
-          abort("Error downloading database")
-        end
-      end
-    end
-
-  end
-end