effective_developer 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7cccd4c476002105c649c582f9fe243d7ec605941756b705c0fba8012cd8db
-  data.tar.gz: dddc8875b4723c497471b4445e42c6e45de0c59fab4a2493062d608b236fa68d
+  metadata.gz: 7d56abcd9d4964e1ef609e137ee2e5cf0af65fef0b94420b75ece42f5dea60a9
+  data.tar.gz: 626969c07fd04d4886b2b6044111ec3651c8f682dbb316318106f2528dca7dd1
 SHA512:
-  metadata.gz: 8301e15ea438d1e927b601824f96a352ce996d653200e21509bdceb738f2f69bdbb522d7570656e3d6265a6607d0574f312ebb44624ae31f2063aa840f56af11
-  data.tar.gz: 8f89d98d3413016395f27d4d1576c1c6514a0820734f18f4acde0374d6c66eb954554349ead83aaddbfb26711d8afce83213cf94ebbb58bc109304a7292a8da9
+  metadata.gz: 046a257cd7af7e70f2973f3d6082758a66c54982e8ee4b34f32ee91146ef43dd66c4c1b04dc7eb9d2503a5321d83d64f159d715d17f19bcf4b41d64f6427a555
+  data.tar.gz: 904fe1dea98e96c21e87c7a74c6c2b7364025edc208719e6d657915566d3de47851892de84811b7e14ab6601edb65dcfecfd543aace4ec6f1bfa3edc5f47c15c

data/lib/effective_developer/version.rb

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

data/lib/tasks/hatchbox.rake

@@ -9,6 +9,8 @@ namespace :hatchbox do
       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

data/lib/tasks/heroku.rake

@@ -12,14 +12,13 @@ namespace :heroku do
 
       Bundler.with_clean_env do
         unless system("heroku pg:backups:capture --remote #{args.remote}")
-          puts("Error capturing heroku backup")
-          exit
+          abort("Error capturing heroku backup")
         end
 
         if system("curl -o latest.dump `heroku pg:backups:public-url --remote #{args.remote}`")
-          puts "Downloading database completed"
+          puts("Downloading database completed")
         else
-          puts "Error downloading database"
+          abort("Error downloading database")
         end
       end
     end

data/lib/tasks/pg_pull.rake

@@ -13,7 +13,7 @@ namespace :pg do
     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
+      abort
     end
 
     Rake::Task['pg:load'].invoke
@@ -43,7 +43,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,14 +54,10 @@ 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'] }
@@ -72,7 +68,7 @@ namespace :pg do
     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 +81,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 +103,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 +114,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 +130,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 +138,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
 platform: ruby
 authors:
 - Code and Effect