pg_backup 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8413fa19c76ce5651b2db1d6ad5a2e9b556e3e1e
-  data.tar.gz: 74f811f636be76248699ac8d164c7fc4eb2cd1d9
+  metadata.gz: aae918d69fa35757f12220b03705420527a1e116
+  data.tar.gz: ba1e0cc7aafb5fbc540c732d05ff889cd2f80906
 SHA512:
-  metadata.gz: e514eb5aebbeb3082ad1bb3533943ae13643a428be6f71e1aea18c58929f52b2ba2f5a3ab52476a65dd16fdc135050ad4888dcd7c40a09225a2a7e7c47aaf626
-  data.tar.gz: 14f8a49fd277909205e4dcce3f7ff7bd122fbaf10f453e384cec619a8c5af5def9c5192429cf589c49dd3ea0059f5b2093a46a6b0b4810169fcd86a42191b165
+  metadata.gz: c67efdac865ea88bb4b36bfd9fad2ad098864b82d354ed7ed586dad80aaf9017a5e1659f6b307580b96960b8d4c2b5b00d9b961a29cc50ad6143268f9819318e
+  data.tar.gz: 13cd2f6e0a3477cd4c8a205f3301e235d19add91fa0ef9c7109cd4a76d0565713422582eb12846191c81602f6b5b5e03cd1cf131a33018e8e2196903cf936f1f

data/README.md

@@ -29,7 +29,13 @@ rake pg_backup:dump:create # create a dump from local db and save it locally
 rake pg_backup:dump:load   # import latest dump from local file into local db
 ```
 
-### Capistrano integration 
+If you want to create or load a dump file from a different directory, use the ``` DUMP_DIR ``` env var:
+```
+rake DUMP_DIR=my_dump_dir pg_backup:dump:create
+rake DUMP_DIR=my_dump_dir pg_backup:dump:load
+```
+
+### Capistrano integration
 (https://github.com/capistrano/capistrano)
 
 add to your ```Capfile```
@@ -44,7 +50,13 @@ cap <env> pg_backup:dump:download  # downloads latest remote dump to local dir
 cap <env> pg_backup:dump:upload    # uploads latest local dump to remote dir
 ```
 
-### deploy-mate integration 
+To overwrite dump directories in capistrano, place something like this in your deploy.rb or \<stage\>.rb
+```
+set :pg_backup_local_dump_dir, 'my_dump_dir'
+set :pg_backup_remote_dump_dir, 'my_dump_dir'
+```
+
+### deploy-mate integration
 (https://github.com/hanseventures/deploy-mate)
 
 add to your ```Capfile```
@@ -54,7 +66,6 @@ require "pg_backup/integration/deploy_mate"
 ```
 
 ## ToDo
-- allow change of dump dir (local and remote)
 - tests? https://github.com/technicalpickles/capistrano-spec
 - rotate local and remote dumps (keep last x dumps)
 

data/lib/pg_backup/tasks/capistrano.rake

@@ -1,7 +1,10 @@
 namespace :load do
   task :defaults do
+    # set default names for dump directories
+    set :pg_backup_local_dump_dir, 'dump'
+    set :pg_backup_remote_dump_dir, 'dump'
     # add the dump dir to the linked directories
-    set :linked_dirs, fetch(:linked_dirs, []).push('dump')
+    set :linked_dirs, fetch(:linked_dirs, []).push(fetch(:pg_backup_remote_dump_dir))
   end
 end
 
@@ -12,7 +15,7 @@ namespace :pg_backup do
     task :load do
       on roles(:app) do
         within current_path do
-          with rails_env: fetch(:environment) do
+          with rails_env: fetch(:environment), dump_dir: fetch(:pg_backup_remote_dump_dir) do
             ask :answer, "Are you sure? This overwrites the '#{fetch(:environment)}' database! Type 'YES' if you want to continue..."
             if fetch(:answer) == "YES"
               rake "pg_backup:dump:load"
@@ -28,7 +31,7 @@ namespace :pg_backup do
     task :create do
       on roles(:app) do
         within current_path do
-          with rails_env: fetch(:environment) do
+          with rails_env: fetch(:environment), dump_dir: fetch(:pg_backup_remote_dump_dir) do
             rake "pg_backup:dump:create"
           end
         end
@@ -38,12 +41,12 @@ namespace :pg_backup do
     desc "Upload latest db dump from (local) dump dir"
     task :upload do
       on roles(:app) do
-        within shared_path do
+        within current_path do
           with rails_env: fetch(:environment) do
-            file_path = Dir.glob("#{ENV.fetch('PWD')}/dump/*.backup").last
+            file_path = Dir.glob("#{ENV.fetch('PWD')}/#{fetch(:pg_backup_local_dump_dir)}/*.backup").last
             fail "Can't find a dump file!" unless file_path
             file_name = File.basename file_path
-            upload! file_path, "#{shared_path}/dump/#{file_name}"
+            upload! file_path, "#{shared_path}/#{fetch(:pg_backup_remote_dump_dir)}/#{file_name}"
           end
         end
       end
@@ -52,12 +55,12 @@ namespace :pg_backup do
     desc "Download remote db dump"
     task :download do
       on roles(:app) do
-        within shared_path do
+        within current_path do
           with rails_env: fetch(:environment) do
-            file_name = capture("ls -t #{shared_path}/dump | head -1")
+            file_name = capture("ls -t #{shared_path}/#{fetch(:pg_backup_remote_dump_dir)} | head -1")
             # TODO: exit if there is no dump
             # TODO: ensure dump dir
-            download! "#{shared_path}/dump/#{file_name}", "dump"
+            download! "#{shared_path}/#{fetch(:pg_backup_remote_dump_dir)}/#{file_name}", "#{fetch(:pg_backup_local_dump_dir)}"
           end
         end
       end

data/lib/pg_backup/tasks/dump.rake

@@ -6,25 +6,33 @@ namespace :pg_backup do
 
     desc "Load dumped postgres backup file "
     task load: :environment do
-      file_name = Dir.glob("#{Rails.root}/dump/*.backup").sort.last
-      fail "Can't find a dump file!" unless file_name
-      puts "Loading dump file from #{file_name}..."
+      file_name = Dir.glob("#{Rails.root}/#{dump_dir}/*.backup").sort.last
+      fail "[pg_backup:dump:load] Can't find a dump file!" unless file_name
+      say "[pg_backup:dump:load] Loading dump file from #{file_name}..."
       with_database_config do |host, db, user, pw|
         %x{ PGPASSWORD=#{pw} pg_restore --host #{host} --username #{user} --schema public --no-owner --no-acl --clean --dbname #{db} #{file_name} }
       end
-      puts "Done."
+      say "[pg_backup:dump:load] Done."
     end
 
     desc "Create dump from postgres db"
     task create: :environment do
-      puts "Creating dump file..."
-      FileUtils.mkdir_p Rails.root.join("dump")
-      file_name = Rails.root.join("dump", "dump-#{Time.now.to_i}.backup")
+      say "[pg_backup:dump:create] Creating dump file..."
+      FileUtils.mkdir_p Rails.root.join(dump_dir)
+      file_name = Rails.root.join(dump_dir, "dump-#{Time.now.to_i}.backup")
       with_database_config do |host, db, user, pw|
         %x{ PGPASSWORD=#{pw} pg_dump --host #{host} --username #{user} --clean --format=c --no-owner --no-acl #{db} > #{file_name} }
       end
-      puts "Dump file located at #{file_name}."
-      puts "Done."
+      say "[pg_backup:dump:create] New dump file located at #{file_name}."
+      say "[pg_backup:dump:create] Done."
+    end
+
+    def dump_dir
+      ENV["DUMP_DIR"] || "dump" # default to 'dump' folder as dump dir
+    end
+
+    def say(text)
+      respond_to?(:info) ? info(text) : puts(text)
     end
 
   end

data/lib/pg_backup/version.rb

@@ -1,3 +1,3 @@
 module PgBackup
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_backup
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Marcus Geissler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Create, restore, download and upload postgres dumps locally and on remote