siba 0.5.6 → 0.5.7

data/README.md

@@ -64,15 +64,15 @@ It is recommended to run `siba backup` command daily or hourly. Use your favouri
 * **mysql**: backup and restore MySQL database ([homepage](https://github.com/evgenyneu/siba-source-mysql)).
 
 ### Archive
-  
+
 * **tar:** archive with optional gzip or bzip2 compression.
 
 ### Encryption
-  
+
 * **gpg:** encrypt with AES256, Blowfish, Twofish, 3DES and other ciphers.
 
 ### Destination
-  
+
 * **dir:** backup to local directory.
 * **aws-s3:** upload backup to Amazon S3 storage ([homepage](https://github.com/evgenyneu/siba-destination-aws-s3)).
 * **ftp:** store backups on FTP server ([homepage](https://github.com/evgenyneu/siba-destination-ftp)).

data/Rakefile

@@ -3,17 +3,17 @@ require 'rake/testtask'
 
 namespace "test" do
   desc "Run all unit tests"
-  Rake::TestTask.new("unit") do |t|     
+  Rake::TestTask.new("unit") do |t|
     t.pattern = "test/unit/**/test*.rb"
-    t.libs << 'test'           
+    t.libs << 'test'
   end
 
   desc "Run all integration tests"
-  Rake::TestTask.new("integration") do |t|     
+  Rake::TestTask.new("integration") do |t|
     t.pattern = "test/integration/**/i9n_*.rb"
-    t.libs << 'test'           
+    t.libs << 'test'
   end
-  
+
   desc "Run all integration tests"
   task :i9n => ["test:integration"] do
   end
@@ -23,5 +23,5 @@ desc "Run all unit tests"
 task :test => ["test:unit"] do
 end
 
-desc "Run tests"               
+desc "Run tests"
 task :default => "test:unit"

data/lib/siba/backup.rb

@@ -20,10 +20,10 @@ private
       Siba.settings = options["settings"] || {}
       Siba.backup_name = File.basename path_to_options_yml, ".yml"
 
-      TmpDir.test_access 
+      TmpDir.test_access
       SibaTasks.new(options, path_to_options_yml, false).backup
       Siba.cleanup_tmp_dir
-    rescue Exception => e 
+    rescue Exception => e
       logger.fatal e
       logger.log_exception e, true
     end

data/lib/siba/console.rb

@@ -6,7 +6,7 @@ require 'siba/generator'
 
 module Siba
   class Console
-    include Siba::FilePlug 
+    include Siba::FilePlug
 
     UNUSED_COMMAND = "unused" # unused command for testing command line options
     attr_accessor :test_mode, :parser, :options
@@ -28,8 +28,8 @@ module Siba
       parser = OptionParser.new do |o|
         o.banner = "Usage: siba command ARGUMENTS [options...]
 
-Examples: 
-    siba generate mybak         Generate mybak.yml options file                        
+Examples:
+    siba generate mybak         Generate mybak.yml options file
     siba backup mybak           Run backup, reading options from mybak.yml
     siba restore mybak          Restore the backup
     siba list                   Show available plugins
@@ -43,12 +43,12 @@ Options:"
         o.on("--log FILE", "Set path to log FILE") do |log|
           options['log'] = log
         end
-        
-        o.on("--no-log", "Work without logging") do 
+
+        o.on("--no-log", "Work without logging") do
           SibaLogger.no_log = true
         end
 
-        o.on("--current-source", "Used with 'restore' command. Restores into the source location which is specified in the CURRENT options file instead of the ORIGINAL source location") do 
+        o.on("--current-source", "Used with 'restore' command. Restores into the source location which is specified in the CURRENT options file instead of the ORIGINAL source location") do
           options['cur'] = true
         end
 
@@ -74,12 +74,12 @@ Options:"
         o.separator "Homepage: https://github.com/evgenyneu/siba"
       end
 
-      if argv.empty? 
+      if argv.empty?
         show_message parser.to_s
         return
       end
-      
-      begin      
+
+      begin
         parser.parse! argv
       rescue Exception => e
         @parser = parser
@@ -90,14 +90,14 @@ Options:"
         show_error "ambiguous usage of both --log and --no-log switches"
         return
       end
-      
+
       parser
     end
 
     def parse_command(argv)
       command = argv.shift
       show_error "missing a command", true if command.nil?
-      
+
       case command.downcase
       when "b", "backup"
         backup argv
@@ -173,7 +173,7 @@ Options:"
 
     def list
       show_message "Available SIBA plugins:
-      
+
 #{Siba::Plugins.get_list} * Currently installed"
     end
 
@@ -181,7 +181,7 @@ Options:"
       file = argv.shift
       if file.nil?
         show_error "missing file name"
-      end      
+      end
       begin
         path_to_yaml = Siba::Generator.new(file).generate
         show_message "Options file generated: #{path_to_yaml}

data/lib/siba/generator.rb

@@ -43,15 +43,14 @@ module Siba
             end
 
             unless Siba::InstalledPlugins.installed? category, type
-              siba_kernel.puts "#{type} plugin is not installed."
-              siba_kernel.puts "Run 'gem install #{Siba::InstalledPlugins.gem_name(category, type)}' to install it and try again."
+              siba_kernel.puts Siba::InstalledPlugins.install_gem_message(category, type)
               return
             end
           else
             type = types.keys.first
           end
 
-          options = Siba::Generator.load_plugin_yaml_content category, type 
+          options = Siba::Generator.load_plugin_yaml_content category, type
           unless options =~ /^\s*type:/
             options = "type: #{type}\n" + options
           end
@@ -83,7 +82,7 @@ module Siba
             raise "Failed to load options for #{InstalledPlugins.plugin_category_and_type(category, type)} plugin from file: #{path}. Error: #{ex.message}"
           end
         end
-      end 
+      end
 
       def get_plugin_yaml_path(category, type)
         siba_file.run_this do
@@ -107,7 +106,7 @@ module Siba
             return types[number-1]
           else
             siba_kernel.printf msg
-          end 
+          end
         end
       end
     end

data/lib/siba/helpers/file_helper.rb

@@ -46,21 +46,21 @@ module Siba
         siba_file.dir_entries(dir) - %w{ . .. }
       end
 
-      # Retuns an array containing names of sub-directories located in the dir 
+      # Retuns an array containing names of sub-directories located in the dir
       def dirs(dir)
         entries(dir).select do |entry|
           siba_file.file_directory?(File.join(dir,entry))
         end
       end
 
-      # Retuns an array containing names of files located in the dir 
+      # Retuns an array containing names of files located in the dir
       def files(dir)
         entries(dir).select do |entry|
           siba_file.file_file?(File.join(dir,entry))
         end
       end
 
-      # Raises error if dirs are not identical 
+      # Raises error if dirs are not identical
       def dirs_same?(dir1, dir2)
         dir1_entries = siba_file.dir_entries dir1
         dir2_entries = siba_file.dir_entries dir2
@@ -80,13 +80,13 @@ module Siba
           if siba_file.file_file? sub_dir1_entry
             raise "#{msg}'#{sub_dir2_entry}' is not a file" unless siba_file.file_file? sub_dir2_entry
             unless siba_file.file_utils_compare_file sub_dir1_entry, sub_dir2_entry
-              raise Siba::Error, "#{msg}'#{sub_dir1_entry}' and '#{sub_dir2_entry}' files are different." 
+              raise Siba::Error, "#{msg}'#{sub_dir1_entry}' and '#{sub_dir2_entry}' files are different."
             end
           end
-          
+
           # compare permissions
           if (siba_file.file_stat(sub_dir1_entry).mode % 01000) != (siba_file.file_stat(sub_dir2_entry).mode % 01000)
-            raise Siba::Error, "#{msg}'#{sub_dir1_entry}' and '#{sub_dir2_entry}' entries have different permissions." 
+            raise Siba::Error, "#{msg}'#{sub_dir1_entry}' and '#{sub_dir2_entry}' entries have different permissions."
           end
 
           # compare sub-dirs

data/lib/siba/helpers/password_strength.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 
 module Siba
-  # Password strength calculator based on: 
+  # Password strength calculator based on:
   #   http://snippets.dzone.com/posts/show/4698
   #   https://www.grc.com/haystack.htm
-  class PasswordStrength 
+  class PasswordStrength
     PASSWORD_SETS = {
       /[a-z]/ => 26,
       /[A-Z]/ => 26,
@@ -48,7 +48,7 @@ module Siba
       end
 
       # Convert the number of seconds human-friendly timespan string
-      # Example: 
+      # Example:
       #   130: 2 minutes
       #   12345: 3 hours
       def seconds_to_timespan(seconds)
@@ -82,8 +82,8 @@ module Siba
         illion_unit = ""
         Illions.each_pair do |a,b|
           ticks_next = ticks.to_f / b
-          break if ticks_next < 1 
-          illion_unit = a 
+          break if ticks_next < 1
+          illion_unit = a
           ticks = ticks_next
         end
 

data/lib/siba/helpers/security_helper.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
- 
+
 require 'securerandom'
 
 module Siba
@@ -8,23 +8,23 @@ module Siba
       def generate_password_for_yaml(length = 16)
         characters = (32..126).to_a - "\\\"".bytes.to_a - "`".bytes.to_a
 
-        (0...length).map{      
+        (0...length).map{
           characters[SecureRandom.random_number(characters.size)].chr
-        }.join                 
+        }.join
       end
 
       def alphanumeric_password(length = 16, lowercase_only=false, non_ambiguous = false)
         characters = ('a'..'z').to_a + ('0'..'9').to_a
         characters += ('A'..'Z').to_a unless lowercase_only
 
-        %w{I O l 0 1}.each{ |ambiguous_character| 
-          characters.delete ambiguous_character 
-        } if non_ambiguous     
+        %w{I O l 0 1}.each{ |ambiguous_character|
+          characters.delete ambiguous_character
+        } if non_ambiguous
 
-        (0...length).map{      
+        (0...length).map{
           characters[SecureRandom.random_number(characters.size)]
-        }.join    
+        }.join
       end
-    end   
+    end
   end
 end

data/lib/siba/helpers/test/extend_test.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 class MiniTest::Unit::TestCase
-  include Siba::FilePlug 
+  include Siba::FilePlug
   def must_log(level)
     verify_log true, level, true
   end
@@ -32,12 +32,12 @@ class MiniTest::Unit::TestCase
 
   def mock_file(name, retval, args=[])
     mock = new_mock_file
-    mock.expect name, retval, args 
+    mock.expect name, retval, args
     mock
   end
 
   def new_mock_file
-    Siba::FilePlug.siba_file = MiniTest::Mock.new 
+    Siba::FilePlug.siba_file = MiniTest::Mock.new
   end
 
   def create_plugin(yml_file_name_or_options_hash)
@@ -46,7 +46,7 @@ class MiniTest::Unit::TestCase
     else
       @options = yml_file_name_or_options_hash
     end
-    
+
     unless @plugin_category
       raise Siba::Error, "Initialize '@plugin_category' variable (#{Siba::Plugins.categories_str})"
     end
@@ -70,7 +70,7 @@ class MiniTest::Unit::TestCase
     tmp_dir ||= SibaTest.tmp_dir
     Siba::TestFiles::prepare_test_dir dir_name_part, tmp_dir
   end
-  
+
   def prepare_test_file(file_name_part, tmp_dir = nil)
     tmp_dir ||= SibaTest.tmp_dir
     Siba::TestFiles::prepare_test_file file_name_part, tmp_dir
@@ -93,13 +93,13 @@ class MiniTest::Unit::TestCase
   def prepare_options(src_yml_path, replace_data)
     Siba::TestFiles::prepare_options(src_yml_path, replace_data)
   end
-  
+
   def prepare_yml(src_yml_path, replace_data, tmp_dir=nil)
     tmp_dir ||= SibaTest.tmp_dir
     Siba::TestFiles::prepare_yml src_yml_path, replace_data, tmp_dir
   end
 
-  private 
+  private
 
   def verify_log(must_change, log_level, exact_level = true)
     log_count = Siba::SibaLogger.count log_level, exact_level

data/lib/siba/helpers/test/helper.rb

@@ -20,7 +20,7 @@ module SibaTest
         Siba::LoggerPlug.create "Test", nil
         Siba::SibaLogger.messages = []
         Siba.settings = {}
-        Siba.current_dir = @current_dir 
+        Siba.current_dir = @current_dir
         Siba.backup_name = "siba"
         SibaTest::KernelMock.mock_all_methods # prevents tests from accessing Kernel methods
       end
@@ -33,7 +33,7 @@ module SibaTest
     def init_unit
       init
       MiniTest::Unit::TestCase.add_setup_hook do
-        SibaTest::FileMock.mock_all_methods # prevents tests from doing file operations 
+        SibaTest::FileMock.mock_all_methods # prevents tests from doing file operations
         Siba.class_eval {@tmp_dir = SibaTest::TmpDirMocked}
       end
     end
@@ -42,7 +42,7 @@ module SibaTest
       init
       MiniTest::Unit::TestCase.add_teardown_hook do
         # cleanup after each integration test
-        Siba.current_dir = @current_dir 
+        Siba.current_dir = @current_dir
         Siba.cleanup_tmp_dir
         SibaTest.cleanup_tmp_dir
       end

data/lib/siba/logger_plug.rb

@@ -13,7 +13,7 @@ module Siba
       def logger
         raise Siba::Error, "Log is not created" unless LoggerPlug.opened?
         @logger
-      end    
+      end
 
       def create(name, path_to_log_file, show_start_message = true)
         raise Siba::Error, "Log is already created" if LoggerPlug.opened?

data/lib/siba/plugins/archive/tar/archive.rb

@@ -5,7 +5,7 @@ module Siba::Archive
     class Archive
       include Siba::FilePlug
       include Siba::LoggerPlug
-      attr_accessor :compression 
+      attr_accessor :compression
 
       def initialize(compression)
         @compression = compression
@@ -22,7 +22,7 @@ module Siba::Archive
         archive_name = "#{dest_file_name}.tar#{extension}"
         archive_path = File.join(dest_dir, archive_name)
         siba_file.run_this do
-          raise Siba::Error, "Archive file already exists: #{archive_path}" if siba_file.file_file?(archive_path) || siba_file.file_directory?(archive_path)  
+          raise Siba::Error, "Archive file already exists: #{archive_path}" if siba_file.file_file?(archive_path) || siba_file.file_directory?(archive_path)
 
           siba_file.file_utils_cd dest_dir
           command_text = %(tar c#{options}f #{archive_name} -C "#{sources_dir}" .)
@@ -38,7 +38,7 @@ module Siba::Archive
         options = get_tar_option
         archive_name = File.basename archive_path
         archive_dir = File.dirname archive_path
-        siba_file.file_utils_cd archive_dir 
+        siba_file.file_utils_cd archive_dir
         command_text = %(tar x#{options}f #{archive_name} -C "#{destination_dir}")
         # Using -C 'change directory' option to make it work on Windows
         # because Windows will not understand absolute path to tar: "tar xf c:\dir\file.tar"
@@ -65,7 +65,7 @@ module Siba::Archive
         end
       end
 
-      def test_archive_and_extract        
+      def test_archive_and_extract
         # archive
         src_dir = Siba::TestFiles.prepare_test_dir "tar-archive-src"
         dest_dir = Siba::TestFiles.mkdir_in_tmp_dir "tar-archive-dest"
@@ -89,27 +89,27 @@ module Siba::Archive
     protected
       def self.get_tar_extension(compression)
         case compression
-        when "none" 
+        when "none"
           ""
         when "gzip"
           ".gz"
         when "bzip2"
           ".bz2"
         else
-          raise 
+          raise
         end
       end
 
       def get_tar_option
         case compression
-        when "none" 
+        when "none"
           ""
         when "gzip"
           "z"
         when "bzip2"
           "j"
         else
-          raise 
+          raise
         end
       end
     end