siba 0.5.6 → 0.5.7

data/lib/siba/siba_check.rb

@@ -44,7 +44,7 @@ module Siba
         raise Siba::CheckError, "'#{name}' option should be of [Hash] type" unless obj.is_a? Hash
         obj
       end
-      
+
       # Tries to conver value to string
       def try_to_s(value, key_name)
         raise Siba::CheckError, "'#{key_name}' option should be string" if [Array, Hash].any?{|a| value.is_a?(a)}
@@ -65,8 +65,8 @@ module Siba
         if item_type == String
           value = try_to_s value, key_name
         else
-          item_type = [item_type] unless item_type.is_a?(Array) 
-          raise Siba::CheckError, "'#{key_name}' option should be of #{item_type.to_s} type" if item_type.none? {|i| value.is_a? i } 
+          item_type = [item_type] unless item_type.is_a?(Array)
+          raise Siba::CheckError, "'#{key_name}' option should be of #{item_type.to_s} type" if item_type.none? {|i| value.is_a? i }
         end
         value
       end

data/lib/siba/siba_file.rb

@@ -24,11 +24,11 @@ module Siba
         return File, meth.to_s.gsub(FILE_REGEXP, "")
       end
     end
-    
+
     def method_missing(meth, *args, &block)
       file_class, class_meth = SibaFile.get_file_class meth
       if file_class
-        file_class.send(class_meth, *args, &block)  
+        file_class.send(class_meth, *args, &block)
       else
         super
       end
@@ -56,10 +56,10 @@ module Siba
     rescue Exception => ex
       fail_message ||= "Failed to run the command: #{command}"
       raise Siba::Error, "#{fail_message}
-#{ex.message}" 
+#{ex.message}"
     end
 
-    # Runs the shell command. 
+    # Runs the shell command.
     # Works the same way as Kernel.system method but without showing the output.
     # Returns true if it was successfull.
     def shell_ok?(command)
@@ -70,7 +70,7 @@ module Siba
       return false
     end
   end
-  
+
   # Used to inject "siba_file" to classes that include this module
   module FilePlug
     def siba_file
@@ -78,7 +78,7 @@ module Siba
     end
 
     def self.siba_file
-      @siba_file ||= SibaFile.new 
+      @siba_file ||= SibaFile.new
     end
 
     # It is used in test to insert mock SibaFile object

data/lib/siba/siba_logger.rb

@@ -25,10 +25,10 @@ module Siba
         return 0 if SibaLogger.messages.nil?
         return SibaLogger.messages.size if severity.nil?
         severity_i = SibaLogger.level_to_i severity
-        SibaLogger.messages.count do |i| 
-          if exact_level 
-            i.level == severity_i 
-          else 
+        SibaLogger.messages.count do |i|
+          if exact_level
+            i.level == severity_i
+          else
             i.level >= severity_i
           end
         end
@@ -38,15 +38,15 @@ module Siba
       def count_messages(msg, severity=nil, exact_level=true)
         return 0 if SibaLogger.messages.nil?
         severity_i = SibaLogger.level_to_i severity unless severity.nil?
-        SibaLogger.messages.count do |i| 
+        SibaLogger.messages.count do |i|
           match_level = true
           if severity_i
-            if exact_level 
+            if exact_level
               match_level = i.level == severity_i
-            else 
+            else
               match_level = i.level >= severity_i
             end
-          end 
+          end
           if match_level
             !((i.msg =~ /#{msg}/).nil?)
           else
@@ -68,13 +68,13 @@ module Siba
       @loggers << Logger.new(@strlog)
 
       unless SibaLogger.quiet
-        @stdout_log = Logger.new(STDOUT) 
+        @stdout_log = Logger.new(STDOUT)
         @loggers << stdout_log
       end
 
       unless path_to_log_file.nil? || SibaLogger.no_log
         @file = File.open(path_to_log_file, "a:utf-8")
-        @file_log = Logger.new(file) 
+        @file_log = Logger.new(file)
         @loggers << file_log
       end
 
@@ -127,7 +127,7 @@ module Siba
     def log_exception(exception, log_only_backtrace=false)
       log('debug',exception.message) unless log_only_backtrace
       unless exception.backtrace.nil?
-        log('debug',"\n--- stack trace ---\n#{exception.backtrace.join("\n")}\n--- stack trace ---") 
+        log('debug',"\n--- stack trace ---\n#{exception.backtrace.join("\n")}\n--- stack trace ---")
       end
     end
 

data/lib/siba/tasks/siba_task.rb

@@ -35,7 +35,7 @@ module Siba
     def load(options)
       @options = options
       @type = Siba::SibaCheck.options_string(@options, "type")
-      @type.downcase! 
+      @type.downcase!
       @plugin = Siba::PluginLoader.loader.load(category, type, options)
     end
   end

data/lib/siba/tasks/siba_tasks.rb

@@ -39,7 +39,7 @@ module Siba
         end
         path_to_backup = File.join encryption_dir, name_of_encrypted_file
         unless siba_file.file_file? path_to_backup
-          raise Siba::Error, "Failed to encrypt backup: #{path_to_backup}" 
+          raise Siba::Error, "Failed to encrypt backup: #{path_to_backup}"
         end
 
         @tasks["destination"].backup path_to_backup
@@ -53,7 +53,7 @@ module Siba
         unless siba_file.file_file? path_to_backup
           raise Siba::Error, "Failed to get backup from destination: #{backup_file_name}"
         end
-        
+
         archive_file_name = @tasks["encryption"].restore path_to_backup, encryption_dir
         path_to_archive = File.join encryption_dir, archive_file_name
         unless siba_file.file_file? path_to_archive
@@ -64,7 +64,7 @@ module Siba
         if Siba::FileHelper.dir_empty? source_dir
           raise Siba::Error, "Failed to extract archive: #{path_to_archive}"
         end
-      
+
         @tasks["source"] = OptionsBackup.load_source_from_backup source_dir if @tasks["source"].nil?
         @tasks["source"].restore source_dir
       end
@@ -76,7 +76,7 @@ module Siba
 
     def self.backup_name(now=nil)
       if Siba::StringHelper.nil_or_empty Siba.backup_name
-        raise Siba::Error, "Backup task name is not specified" 
+        raise Siba::Error, "Backup task name is not specified"
       end
       "#{Siba.backup_name}-#{SibaTasks.backup_name_suffix(now)}"
     end
@@ -96,7 +96,7 @@ module Siba
     def encryption_dir
       @encryption_dir ||= TestFiles::mkdir_in_tmp_dir("enc").freeze
     end
-    
+
     def destination_dir
       @destination_dir ||= TestFiles::mkdir_in_tmp_dir("dest").freeze
     end
@@ -106,7 +106,7 @@ module Siba
 
       # Monthly backup on the 1st day of each month
       # "month-01" through "month-12"
-      return "month-#{"%02d" % now.month}" if now.day == 1 
+      return "month-#{"%02d" % now.month}" if now.day == 1
 
       # Weekly backup on Sunday
       # "week-1-sun" through "week-5-sun"
@@ -114,7 +114,7 @@ module Siba
 
       # Daily backup
       # "day-2-mon" through "day-7-sat"
-      "day-#{now.wday+1}-#{now.strftime("%a").downcase}"  
+      "day-#{now.wday+1}-#{now.strftime("%a").downcase}"
     end
   end
 end

data/lib/siba/test_files.rb

@@ -9,11 +9,11 @@ module Siba::TestFiles
 
     def test_file
       File.join test_files_dir, "a_file"
-    end    
+    end
 
     def test_dir
       File.join test_files_dir, "files_and_dirs"
-    end    
+    end
 
     def prepare_test_dir(dest_dir_name_part, tmp_dir=nil)
       tmp_dir ||= Siba.tmp_dir
@@ -22,7 +22,7 @@ module Siba::TestFiles
       siba_file.file_utils_cp_r test_dir, dest_dir
       dest_dir
     end
-    
+
     def prepare_test_file(dest_file_name_part, tmp_dir=nil)
       tmp_dir ||= Siba.tmp_dir
       dest_file = File.join(tmp_dir,"#{dest_file_name_part}#{random_suffix}")
@@ -34,7 +34,7 @@ module Siba::TestFiles
     def generate_path(dest_file_name_part, tmp_dir=nil)
       tmp_dir ||= Siba.tmp_dir
       File.join(tmp_dir,"#{dest_file_name_part}#{random_suffix}")
-    end  
+    end
 
     def mkdir_in_tmp_dir(prefix, tmp_dir=nil)
       tmp_dir ||= Siba.tmp_dir

data/lib/siba/tmp_dir.rb

@@ -30,8 +30,8 @@ module Siba
             raise unless siba_file.file_directory? test_dir
             tmp_dir_obj.cleanup
           rescue Exception
-            logger.error %q{Can not create temporary directory. 
-Please make sure you have write permissions to the system temporary folder. 
+            logger.error %q{Can not create temporary directory.
+Please make sure you have write permissions to the system temporary folder.
 You can also specify the alternative location for temporary folder in options:
 
 settings:
@@ -51,7 +51,7 @@ settings:
         tmp_dir_from_settings = Siba.settings && Siba.settings["tmp_dir"]
         tmp_path = nil
         if tmp_dir_from_settings.nil?
-          tmp_path = siba_file.dir_mktmpdir TmpDirPrefix 
+          tmp_path = siba_file.dir_mktmpdir TmpDirPrefix
         else
           tmp_path = File.join(siba_file.file_expand_path(tmp_dir_from_settings),
                                   "#{TmpDirPrefix}#{Siba::TestFiles.random_suffix}")
@@ -61,7 +61,7 @@ settings:
       end
     end
   end
-  
+
   module TmpDirPlug
     include Siba::FilePlug
     include Siba::LoggerPlug

data/lib/siba/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Siba
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/scaffolds/archive.rb

@@ -1,14 +1,14 @@
 # encoding: UTF-8
 
 module Siba::C6y
-  module Demo                 
-    class Init                 
+  module Demo
+    class Init
       include Siba::FilePlug
       include Siba::LoggerPlug
 
       def initialize(options)
 ## init_example.rb ##
-      end                      
+      end
 
       # Archive the contents of sources_dir and put it to dest_dir.
       # Return the archive file name. It must start with dest_file_name

data/scaffolds/destination.rb

@@ -1,18 +1,18 @@
 # encoding: UTF-8
 
 module Siba::C6y
-  module Demo                 
-    class Init                 
+  module Demo
+    class Init
       include Siba::FilePlug
       include Siba::LoggerPlug
 
       def initialize(options)
 ## init_example.rb ##
-      end                      
+      end
 
       # Put backup file (path_to_backup_file) to destination
       # No return value is expected
-      def backup(path_to_backup_file) 
+      def backup(path_to_backup_file)
 ## examples.rb ##
       end
 

data/scaffolds/encryption.rb

@@ -1,14 +1,14 @@
 # encoding: UTF-8
 
 module Siba::C6y
-  module Demo                 
-    class Init                 
+  module Demo
+    class Init
       include Siba::FilePlug
       include Siba::LoggerPlug
 
       def initialize(options)
 ## init_example.rb ##
-      end                      
+      end
 
       # Encrypt backup archive file (path_to_archive) and put it to dest_dir.
       # Return the name of encrypted file. It must begin with archive name

data/scaffolds/project/siba-c6y-demo.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_runtime_dependency     'siba', '~>siba_version'
 
-  s.add_development_dependency  'minitest', '~>2.10'
+  s.add_development_dependency  'minitest', '~>3.0'
   s.add_development_dependency  'rake', '~>0.9'
   s.add_development_dependency  'guard-minitest', '~>0.4'
 end

data/scaffolds/project/test/helper/require_integration.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 require 'siba/helpers/test/require'
-SibaTest.init_integration      
+SibaTest.init_integration
 

data/scaffolds/project/test/integration/i9n_init.rb

@@ -8,11 +8,11 @@ require 'siba-c6y-demo/init'
 describe Siba::C6y::Demo::Init do
   it "should run integration test" do
     # All file operations will work normally in integration tests
-    # You can use the following helper methods 
-    
+    # You can use the following helper methods
+
     # Get path to test tmp dir (will be cleaned automatically after each test)
     SibaTest.tmp_dir
-    
+
     # Make a sub dir with a random name in a test tmp dir
     tmp_sub_dir = mkdir_in_tmp_dir "prefix"
 
@@ -27,7 +27,7 @@ describe Siba::C6y::Demo::Init do
     dirs_same? path_to_test_dir, path_to_test_dir2
 
     # Read test yml and replace values (see siba/test/integration/yml/valid.yml)
-    # path_to_options = prepare_options path_to_yml, 
+    # path_to_options = prepare_options path_to_yml,
     #                       { src_dir: path_to_test_dir,
     #                         src_file: path_to_test_file,
     #                         dest_dir: path_to_test_dir2 }

data/scaffolds/project/test/unit/test_init.rb

@@ -7,31 +7,31 @@ require 'siba-c6y-demo/init'
 # 'rake' command runs unit tests
 # 'guard' command will run unit tests automatically
 describe Siba::C6y::Demo do
-  before do                    
+  before do
     @yml_path = File.expand_path('../yml', __FILE__)
   end
 
   it "should load plugin" do
     # helper to load options from YAML from @yml_path dir
-    options_hash = load_options "valid" 
+    options_hash = load_options "valid"
 
     plugin = Siba::C6y::Demo::Init.new options_hash
     plugin.must_be_instance_of Siba::C6y::Demo::Init
   end
 
-  it "siba should load plugin" do 
+  it "siba should load plugin" do
     # helper to load the plugin by siba (build and install demo gem to make it work)
-    # @plugin_category = "c6y"      
-    # @plugin_type = "demo"         
-    # plugin = create_plugin "valid" 
+    # @plugin_category = "c6y"
+    # @plugin_type = "demo"
+    # plugin = create_plugin "valid"
   end
-      
+
   it "should check log" do
     # ... code
     # must_log "info"
     # wont_log "warn"
     # wont_log_from "warn"
-    # show_log 
+    # show_log
   end
 
   it "should verify file operations" do

data/scaffolds/shared/examples.rb

@@ -10,7 +10,7 @@
 
         # -- File operations --
         # "siba_file" object is available after including Siba::FilePlug
-        # You can use it for file operations 
+        # You can use it for file operations
         # instead of calling Dir, File, FileUtils directly.
         # It mocks all methods of these classes in unit tests
         # but runs them normally and in integration tests.
@@ -35,11 +35,11 @@
         tmp_dir = Siba.tmp_dir
 
         # Create a sub-dir with a random name in the temp dir
-        path_to_tmp_dir = Siba::TestFiles.mkdir_in_tmp_dir "you_dir_prefix" 
+        path_to_tmp_dir = Siba::TestFiles.mkdir_in_tmp_dir "you_dir_prefix"
 
-        # Note: Siba.tmp_dir will be removed automatically, 
+        # Note: Siba.tmp_dir will be removed automatically,
         # so there is no need to clean anything.
-        
+
         # Some Siba::FileHelper methods
         files_and_dirs = Siba::FileHelper.entries current_dir
         my_file = File.join tmp_dir, "myfile"

data/scaffolds/source.rb

@@ -1,14 +1,14 @@
 # encoding: UTF-8
 
 module Siba::C6y
-  module Demo                 
-    class Init                 
+  module Demo
+    class Init
       include Siba::FilePlug
       include Siba::LoggerPlug
 
       def initialize(options)
 ## init_example.rb ##
-      end                      
+      end
 
       # Collect source files and put them into dest_dir
       # No return value is expected
@@ -16,7 +16,7 @@ module Siba::C6y
 ## examples.rb ##
       end
 
-      # Restore source files from_dir 
+      # Restore source files from_dir
       # No return value is expected
       def restore(from_dir)
       end