leipreachan 1.1.0 → 1.1.1

data/Changelog

@@ -1,16 +1,22 @@
+v1.1.1
+[*] Fix empty file name while restore
+[+] Allow list with param DATE via Capistrano
+[+] Add check for file and folder exist
+[+] Add check for system dependencies
+
 v1.1.0
 [+] Allow restore any backup via Capistarano
 
 v1.0.3
+[*] Fix postgresql backup
 [+] English doc
 [+] Capistrano 2 support
 [+] Allow restore lasts backup via Capistarano
 [+] Drop tables before restore
-[*] Fix postgresql backup
 
 v1.0.2
 [*] Update gemspec
 [*] Decrease depend gem versions
 
 v1.0.0:
-[+] Initial version
+[+] Initial version

data/lib/capistrano2/tasks/leipreachan.cap

@@ -9,18 +9,35 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "List of backups"
       task :list, role: :app do
-        run "cd #{latest_release} && RAILS_ENV=#{fetch(:rails_env)} bundle exec rake leipreachan:list DIR=#{fetch(:folder)}"
+        set :date, ENV['DATE'].nil? ? '' : "DATE=#{ENV['DATE']}"
+        run "cd #{latest_release} && RAILS_ENV=#{fetch(:rails_env)} bundle exec rake leipreachan:list DIR=#{fetch(:folder)} #{fetch(:date)}"
       end
 
       desc "Restore database"
       task :restore, role: :app do
+        run "cd #{latest_release} && RAILS_ENV=#{fetch(:rails_env)} bundle exec rake leipreachan:list DIR=#{fetch(:folder)}"
+        date = Capistrano::CLI.ui.ask('Please specify date (default: latest one)', nil)
+        puts "Your choice: #{date.empty? ? 'Latest one' : date.strip}"
+
+        unless date.empty?
+          run "cd #{latest_release} && RAILS_ENV=#{fetch(:rails_env)} bundle exec rake leipreachan:list DIR=#{fetch(:folder)} DATE=#{date.strip}"
+        end
+
+        filename = Capistrano::CLI.ui.ask('Please specify filename for restore (default: latest one)', nil)
+        puts "Your choice: #{filename.empty? ? 'Latest one' : filename.strip}"
+
         puts "="*80
-        puts "  WARNING!!! YOUR CURRENT DATABASE DATA WILL BE LOST!!!"
-        puts "  Think twice before enter 'YES' and push the Enter button"
+        puts "WARNING!!! YOUR CURRENT DATABASE DATA WILL BE LOST!!!"
+        puts "Think twice before enter 'YES' and push the Enter button"
         puts "="*80
-        answer = Capistrano::CLI.ui.ask "  \"YES\" for restore last backup of the database: '"
-        if answer == 'YES' then
-          run "cd #{latest_release} && RAILS_ENV=#{fetch(:rails_env)} bundle exec rake leipreachan:restorelast DIR=#{fetch(:folder)}"
+
+        answercheck = Capistrano::CLI.ui.ask('"YES" for restore last backup of the database: ', nil)
+        if answercheck == 'YES'
+          filename = filename.empty? ? '' : "FILE=#{filename.strip}"
+          date = date.empty? ? '' : "DATE=#{date.strip}"
+          run "cd #{latest_release} && RAILS_ENV=#{fetch(:rails_env)} bundle exec rake leipreachan:restorefile DIR=#{fetch(:folder)} #{date} #{filename}"
+        else
+          puts "Incorrect Answer!!!"
         end
       end
     end

data/lib/capistrano3/tasks/leipreachan.cap

@@ -16,7 +16,8 @@ namespace :deploy do
       on roles(:app) do
         within current_path do
           with rails_env: fetch(:rails_env) do
-            execute :bundle, :exec, :rake, "leipreachan:list DIR=#{fetch(:folder)}"
+            set :date, ENV['DATE'].nil? ? '' : "DATE=#{ENV['DATE']}"
+            execute :bundle, :exec, :rake, "leipreachan:list DIR=#{fetch(:folder)} #{fetch(:date)}"
           end
         end
       end
@@ -44,7 +45,8 @@ namespace :deploy do
 
             set :answercheck, ask('"YES" for restore last backup of the database: ', 'No')
             if fetch(:answercheck) == 'YES'
-              execute :bundle, :exec, :rake, "leipreachan:restorefile DIR=#{fetch(:folder)} DATE=#{fetch(:date)} FILE=#{fetch(:filename)}"
+              filename = filename.nil? ? '' : "FILE=#{filename.strip}"
+              execute :bundle, :exec, :rake, "leipreachan:restorefile DIR=#{fetch(:folder)} DATE=#{fetch(:date)} #{fetch(:filename)}"
             end
           end
         end

data/lib/leipreachan/mysql2.rb

@@ -1,5 +1,9 @@
 module Leipreachan
   class Backuper < DBBackup
+    def system_check_list
+      %w(gzip zcat mysql mysqldump)
+    end
+
     def user
       @user ||= db_config['username'].present? ? "-u#{db_config['username']}" : ""
     end
@@ -17,7 +21,7 @@ module Leipreachan
     end
 
     def dbrestore! file
-      system("zcat < #{backup_base_on(backup_folder)}/#{file} | mysql -h #{host} #{user} #{password}#{db_config['database']}")
+      system("zcat < #{file} | mysql -h #{host} #{user} #{password}#{db_config['database']}")
     end
 
     private

data/lib/leipreachan/postgresql.rb

@@ -1,5 +1,9 @@
 module Leipreachan
   class Backuper < DBBackup
+    def system_check_list
+      %w(gzip zcat psql pg_dump)
+    end
+
     def user
       @user ||= db_config['user'].present? ? "-U #{db_config['user']}" : ""
     end
@@ -20,15 +24,13 @@ module Leipreachan
       puts "Will be restored -> #{file}"
       puts ""
       drop_tables!
-      system("zcat < #{backup_base_on(backup_folder)}/#{file} | #{password}psql -h #{host} #{user} #{db_config['database']}")
+      system("zcat < #{file} | #{password}psql -h #{host} #{user} #{db_config['database']}")
     end
 
     private
 
     def drop_tables!
-      # drop_table_query = "drop schema public cascade; create schema public;"
       system("#{password}psql -h #{host} #{user} #{db_config['database']} -t -c \"select 'drop table \\\"' || tablename || '\\\" cascade;' from pg_tables where schemaname = 'public'\"  | #{password}psql -h #{host} #{user} #{db_config['database']}");
-      # system("echo \"#{drop_table_query}\" | #{password}psql -h #{host} #{user} #{db_config['database']}")
     end
   end
 end

data/lib/leipreachan/version.rb

@@ -1,5 +1,5 @@
 module Leipreachan
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
   RAILS_VERSION = "3.1.12"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip.split("-").first
 end

data/lib/leipreachan.rb

@@ -24,6 +24,7 @@ module Leipreachan
                   :file_for_restore
 
     def initialize env
+      check_system_requirements!
       @max_days = (env['DAYS'] || MAX_DAYS).to_i
       @target_date = env['DATE']
       @backup_folder = env['DATE'].presence || Time.now.strftime("%Y%m%d")
@@ -38,6 +39,13 @@ module Leipreachan
       @db_config = ActiveRecord::Base.configurations[Rails.env]
     end
 
+    def check_system_requirements!
+      system_check_list.each do |command|
+        system("#{command} --help > /dev/null 2>&1")
+        raise "#{command} is required for Leipreachan backups" if $?.exitstatus > 0
+      end
+    end
+
     def backup!
       FileUtils.mkdir_p(backup_base_on(backup_folder))
       dbbackup!
@@ -49,11 +57,11 @@ module Leipreachan
     end
 
     def restore!
-      dbrestore! get_file_for_restore
+      dbrestore! File.join(backup_base_on(backup_folder), get_file_for_restore)
     end
 
     def restorefile!
-      dbrestore! file_for_restore || get_lastfile_for_restore
+      dbrestore! File.join(backup_base_on(backup_folder), file_for_restore || get_lastfile_for_restore)
     end
 
     def list

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leipreachan
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler