siba 0.5.2 → 0.5.3

data/lib/siba/console.rb

@@ -34,7 +34,7 @@ Examples:
     siba restore mybak          Restore the backup
     siba list                   Show available plugins
     siba scaffold source my-db  Create a new gem for a source plugin
-                                (or archive, encryption or destination)
+                                 (or archive, encryption or destination)
 
     Note: single letter commands are also supported, like b for backup
 
@@ -48,6 +48,10 @@ Options:"
           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 
+          options['cur'] = true
+        end
+
         o.on("-q", "--quiet", "No output to console") do
           SibaLogger.quiet = true
         end
@@ -193,7 +197,7 @@ Edit it and run backup command" unless path_to_yaml.nil?
       show_error "needless arguments: #{argv.join(', ')}" unless argv.empty?
       path_to_options = siba_file.file_expand_path path_to_options
       path_to_options += ".yml" unless path_to_options =~ /\.yml$/
-      Siba::Restore.new.restore path_to_options
+      Siba::Restore.new.restore path_to_options, options["cur"] == true
     end
   end
 end

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

@@ -18,6 +18,14 @@ class MiniTest::Unit::TestCase
     verify_log false, level, false
   end
 
+  def must_log_msg(msg, level)
+    verify_log_msg msg, true, level
+  end
+
+  def wont_log_msg(msg, level)
+    verify_log_msg msg, false, level
+  end
+
   def show_log
     puts Siba::SibaLogger.messages.map{|a| a.msg}.join("\n")
   end
@@ -110,5 +118,18 @@ class MiniTest::Unit::TestCase
       raise message if log_count > 0
     end
   end
+
+  def verify_log_msg(msg, must_change, log_level)
+    log_count = Siba::SibaLogger.count_messages msg, log_level
+    message = "'#{log_level}' log messages with text '#{msg}'"
+
+    if must_change
+      message = "Expected " + message
+      raise message if log_count == 0
+    else
+      message = "Unexpected " + message
+      raise message if log_count > 0
+    end
+  end
 end
 

data/lib/siba/restore.rb

@@ -6,7 +6,10 @@ module Siba
     include Siba::FilePlug
     include Siba::KernelPlug
 
-    def restore(path_to_options_yml)
+    attr_accessor :current_source
+
+    def restore(path_to_options_yml, current_source)
+      @current_source = current_source
       run_restore path_to_options_yml
     ensure
       Siba.cleanup
@@ -21,7 +24,7 @@ private
       Siba.settings = options["settings"] || {}
       Siba.backup_name = File.basename path_to_options_yml, ".yml"
       TmpDir.test_access 
-      tasks = SibaTasks.new options, path_to_options_yml, true
+      tasks = SibaTasks.new options, path_to_options_yml, !current_source
       file_name = get_backup_choice tasks 
       unless file_name.nil?
         if user_wants_to_proceed?
@@ -86,8 +89,14 @@ private
     end
 
     def user_wants_to_proceed?
-      siba_kernel.printf "\nWarning: backup will be restored into your original source location.
-Your current source data will be overwritten and WILL BE LOST.
+      if current_source
+        source_msg = "CURRENT"
+      else
+        source_msg = "ORIGINAL"
+      end
+
+      siba_kernel.printf "\nWarning: backup will be restored into the #{source_msg} source location.
+Your source data will be overwritten and WILL BE LOST.
 Type 'yes' if you want to proceed:
 (yes/n) > "
       user_choice = siba_kernel.gets.chomp.strip

data/lib/siba/siba_logger.rb

@@ -33,6 +33,27 @@ module Siba
           end
         end
       end
+
+      # returns the number of log messages that contain given msg text
+      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| 
+          match_level = true
+          if severity_i
+            if exact_level 
+              match_level = i.level == severity_i
+            else 
+              match_level = i.level >= severity_i
+            end
+          end 
+          if match_level
+            !((i.msg =~ /#{msg}/).nil?)
+          else
+            false
+          end
+        end
+      end
     end
 
     attr_accessor :show_finish_message

data/lib/siba/tasks/siba_tasks.rb

@@ -65,7 +65,7 @@ module Siba
           raise Siba::Error, "Failed to extract archive: #{path_to_archive}"
         end
       
-        @tasks["source"] = OptionsBackup.load_source_from_backup source_dir
+        @tasks["source"] = OptionsBackup.load_source_from_backup source_dir if @tasks["source"].nil?
         @tasks["source"].restore source_dir
       end
     end

data/lib/siba/version.rb

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

data/test/integration/i9n_backup.rb

@@ -42,7 +42,7 @@ describe Siba::Backup do
 
     Siba::SibaLogger.quiet = true
     SibaTest::KernelMock.gets_return_value = "yes"
-    Siba::Restore.new.restore test_yml_path
+    Siba::Restore.new.restore test_yml_path, false
     
     File.directory?(src_dir).must_equal true
     File.file?(src_file).must_equal true

data/test/integration/tasks/i9n_siba_tasks.rb

@@ -23,8 +23,19 @@ describe Siba::SibaTasks do
     tasks = Siba::SibaTasks.new options, path_to_test_yml, false
     tasks.backup 
 
+    # restore into original source
     backup_file_name = Siba::FileHelper.entries(dest_dir)[0]
     tasks = Siba::SibaTasks.new options, path_to_test_yml, true
+    tasks.tasks["source"].must_be_nil # should not load source before restore
     tasks.restore backup_file_name
+    tasks.tasks["source"].wont_be_nil # source should be loaded on restore
+
+    # restore into curret source
+    backup_file_name = Siba::FileHelper.entries(dest_dir)[0]
+    tasks = Siba::SibaTasks.new options, path_to_test_yml, false
+    tasks.tasks["source"].wont_be_nil # should load current source on tasks init
+    source = tasks.tasks["source"]
+    tasks.restore backup_file_name
+    tasks.tasks["source"].must_equal source # should use current source during restore
   end
 end

data/test/unit/tasks/test_siba_tasks.rb

@@ -11,7 +11,6 @@ describe Siba::SibaTasks do
     create_tasks "valid"
   end
 
-
   it "should get tasks" do
     siba_tasks = create_tasks "valid"
     siba_tasks.tasks["source"].must_be_instance_of Siba::SibaTask

data/test/unit/test_console.rb

@@ -54,6 +54,12 @@ describe Siba::Console do
     @console.parse [@unused, "--no-log"]
     Siba::SibaLogger.no_log.must_equal true
   end
+
+  it "should accept cur switch" do
+    @console.options["cur"].must_be_nil
+    @console.parse [@unused, "--current-source"]
+    @console.options["cur"].must_equal true
+  end
   
   it "should fail when using both log and no-log" do
     Siba::SibaLogger.no_log = false

data/test/unit/test_restore.rb

@@ -7,12 +7,29 @@ describe Siba::Restore do
     @yml_path = File.expand_path('../yml', __FILE__)
   end
   
-  it "should call restore" do
+  it "should call restore without loading source plugin" do
     Siba::LoggerPlug.close
     Siba::SibaLogger.quiet = true
     path_to_options_file = File.join @yml_path, "valid.yml"
-    Siba::Restore.new.restore path_to_options_file
+    obj = Siba::Restore.new
+    obj.restore path_to_options_file, false
+    obj.current_source.must_equal false
     wont_log_from "warn"
+    must_log_msg "Loading destination", "debug"
+    wont_log_msg "Loading source", "debug"
+    Siba.tmp_dir_clean?.must_equal true
+  end
+
+  it "should call restore with loading source plugin" do
+    Siba::LoggerPlug.close
+    Siba::SibaLogger.quiet = true
+    path_to_options_file = File.join @yml_path, "valid.yml"
+    obj = Siba::Restore.new
+    obj.restore path_to_options_file, true
+    obj.current_source.must_equal true
+    wont_log_from "warn"
+    must_log_msg "Loading destination", "debug"
+    must_log_msg "Loading source", "debug"
     Siba.tmp_dir_clean?.must_equal true
   end
 end

data/test/unit/test_siba_logger.rb

@@ -5,75 +5,76 @@ require 'helper/require_unit'
 describe Siba::SibaLogger do
   before do
     @logger = Siba::SibaLogger.new "Test", nil
+    @cls = Siba::SibaLogger
   end
 
   describe "when access class" do
     it "must access quiet" do
-      Siba::SibaLogger.quiet = true
-      Siba::SibaLogger.quiet.must_equal true 
+      @cls.quiet = true
+      @cls.quiet.must_equal true 
     end
     
     it "must access verbose" do
-      Siba::SibaLogger.verbose = true
-      Siba::SibaLogger.verbose.must_equal true 
+      @cls.verbose = true
+      @cls.verbose.must_equal true 
     end
     
     it "must access no_log" do
-      Siba::SibaLogger.no_log = true
-      Siba::SibaLogger.no_log.must_equal true 
+      @cls.no_log = true
+      @cls.no_log.must_equal true 
     end
 
     it "must contain LogLevels" do
-      Siba::SibaLogger::LogLevels.must_include "debug"  
-      Siba::SibaLogger::LogLevels.must_include "info"  
-      Siba::SibaLogger::LogLevels.must_include "warn"  
-      Siba::SibaLogger::LogLevels.must_include "error"  
-      Siba::SibaLogger::LogLevels.must_include "fatal"  
-      Siba::SibaLogger::LogLevels.must_include "unknown"  
+      @cls::LogLevels.must_include "debug"  
+      @cls::LogLevels.must_include "info"  
+      @cls::LogLevels.must_include "warn"  
+      @cls::LogLevels.must_include "error"  
+      @cls::LogLevels.must_include "fatal"  
+      @cls::LogLevels.must_include "unknown"  
     end
 
     it "must check given log level" do
-      Siba::SibaLogger.log_level?("info").must_equal true
-      Siba::SibaLogger.log_level?("chelyabinsk").must_equal false
+      @cls.log_level?("info").must_equal true
+      @cls.log_level?("chelyabinsk").must_equal false
     end
 
     it "must have check_log_level method" do
-      Siba::SibaLogger::check_log_level "info"
+      @cls::check_log_level "info"
     end
 
     it "check_log_level must raise for unsupported level" do
-      -> { Siba::SibaLogger::check_log_level("weird") }.must_raise RuntimeError 
+      -> { @cls::check_log_level("weird") }.must_raise RuntimeError 
     end
 
     it "must return log level integer" do
-      Siba::SibaLogger.level_to_i("debug").must_equal 0
-      Siba::SibaLogger.level_to_i("info").must_equal 1
-      Siba::SibaLogger.level_to_i("warn").must_equal 2
-      Siba::SibaLogger.level_to_i("error").must_equal 3
-      Siba::SibaLogger.level_to_i("fatal").must_equal 4
-      Siba::SibaLogger.level_to_i("unknown").must_equal 5
+      @cls.level_to_i("debug").must_equal 0
+      @cls.level_to_i("info").must_equal 1
+      @cls.level_to_i("warn").must_equal 2
+      @cls.level_to_i("error").must_equal 3
+      @cls.level_to_i("fatal").must_equal 4
+      @cls.level_to_i("unknown").must_equal 5
     end
 
     it "must call count" do
-      Siba::SibaLogger.count.must_equal 1
+      @cls.count.must_equal 1
     end
 
     it "count should work when logger is closed" do
       Siba::LoggerPlug.close
-      Siba::SibaLogger.messages = nil
-      Siba::SibaLogger.count("warn").must_equal 0
+      @cls.messages = nil
+      @cls.count("warn").must_equal 0
     end
   end
 
   describe "when access logger" do
     it "must initialize SibaLogger" do
       @logger.wont_be_nil
-      Siba::SibaLogger.count("info").must_equal 1, "Must contain 'log start' message"
+      @cls.count("info").must_equal 1, "Must contain 'log start' message"
     end
 
     it "must initialize variables" do
-      Siba::SibaLogger.messages.must_be_instance_of Array
-      Siba::SibaLogger.count.must_equal 1
+      @cls.messages.must_be_instance_of Array
+      @cls.count.must_equal 1
     end
 
     it "should call log methods" do
@@ -90,13 +91,13 @@ describe Siba::SibaLogger do
       @logger.info "msg2"
       @logger.warn "msg3"
 
-      Siba::SibaLogger.messages.size.must_equal 4
-      Siba::SibaLogger.messages[1].must_be_instance_of Siba::LogMessage
-      Siba::SibaLogger.messages[1].msg.must_equal "msg1"
-      Siba::SibaLogger.messages[1].level.must_equal Siba::SibaLogger.level_to_i("debug")
-      Siba::SibaLogger.messages[1].time.must_be_instance_of Time 
-      Siba::SibaLogger.messages[3].msg.must_equal "msg3"
-      Siba::SibaLogger.messages[3].level.must_equal Siba::SibaLogger.level_to_i("warn")
+      @cls.messages.size.must_equal 4
+      @cls.messages[1].must_be_instance_of Siba::LogMessage
+      @cls.messages[1].msg.must_equal "msg1"
+      @cls.messages[1].level.must_equal @cls.level_to_i("debug")
+      @cls.messages[1].time.must_be_instance_of Time 
+      @cls.messages[3].msg.must_equal "msg3"
+      @cls.messages[3].level.must_equal @cls.level_to_i("warn")
     end
     
     it "should raise when called missing method" do
@@ -104,16 +105,16 @@ describe Siba::SibaLogger do
     end
 
     it "should log on different levels" do
-      Siba::SibaLogger::LogLevels.each do |level|
-        Siba::SibaLogger.count(level, true).must_equal (level == "info" ? 1 : 0)
+      @cls::LogLevels.each do |level|
+        @cls.count(level, true).must_equal (level == "info" ? 1 : 0)
       end 
 
-      Siba::SibaLogger::LogLevels.each do |level|
+      @cls::LogLevels.each do |level|
         @logger.send(level,"#{level} message")
       end
 
-      Siba::SibaLogger::LogLevels.each do |level|
-        Siba::SibaLogger.count(level, true).must_equal (level == "info" ? 2 : 1)
+      @cls::LogLevels.each do |level|
+        @cls.count(level, true).must_equal (level == "info" ? 2 : 1)
       end 
     end
 
@@ -129,33 +130,68 @@ describe Siba::SibaLogger do
       @logger.fatal "msg9"
       @logger.unknown "msg10"
 
-      Siba::SibaLogger.count.must_equal 11
-      Siba::SibaLogger.count("debug", false).must_equal 11
-      Siba::SibaLogger.count("debug").must_equal 1
-      Siba::SibaLogger.count("info", false).must_equal 10
-      Siba::SibaLogger.count("info").must_equal 3
-      Siba::SibaLogger.count("warn", false).must_equal 7
-      Siba::SibaLogger.count("error", false).must_equal 6
-      Siba::SibaLogger.count("error").must_equal 3
-      Siba::SibaLogger.count("fatal", false).must_equal 3
-      Siba::SibaLogger.count("fatal", true).must_equal 2
+      @cls.count.must_equal 11
+      @cls.count("debug", false).must_equal 11
+      @cls.count("debug").must_equal 1
+      @cls.count("info", false).must_equal 10
+      @cls.count("info").must_equal 3
+      @cls.count("warn", false).must_equal 7
+      @cls.count("error", false).must_equal 6
+      @cls.count("error").must_equal 3
+      @cls.count("fatal", false).must_equal 3
+      @cls.count("fatal", true).must_equal 2
+    end
+
+    it "should count messages in logs" do
+      @logger.debug "debug1"
+      @logger.debug "shared"
+      @logger.info "shared"
+      @logger.info "info1"
+      @logger.info "info2"
+      @logger.error "shared"
+      @logger.error "err1"
+      @logger.error "err2"
+      @logger.error "err3"
+      
+      @cls.count_messages("debug1").must_equal 1
+      @cls.count_messages("debug1", "debug").must_equal 1
+      @cls.count_messages("debug", "debug").must_equal 1
+      @cls.count_messages("hola", "debug").must_equal 0
+      @cls.count_messages("hola").must_equal 0
+
+      @cls.count_messages("info1").must_equal 1
+      @cls.count_messages("info2").must_equal 1
+      @cls.count_messages("info").must_equal 2
+      @cls.count_messages("info", "debug").must_equal 0
+      @cls.count_messages("info", "debug", false).must_equal 2
+      @cls.count_messages("info", "info").must_equal 2
+      @cls.count_messages("info", "warn").must_equal 0
+      
+      @cls.count_messages("err").must_equal 3
+      @cls.count_messages("err", "error").must_equal 3
+      @cls.count_messages("err1", "error").must_equal 1
+
+      @cls.count_messages("shared", "info").must_equal 1
+      @cls.count_messages("shared", "debug").must_equal 1
+      @cls.count_messages("shared", "error").must_equal 1
+      @cls.count_messages("shared").must_equal 3
     end
 
     it "must call log_exception" do
       @logger.log_exception Exception.new "hello"
-      Siba::SibaLogger.count("debug",true).must_equal 1
+      @cls.count("debug",true).must_equal 1
     end
 
     it "must call log backtrace with_exception" do
       ex = Exception.new "hello"
       ex.set_backtrace ["one","two","tree"]
       @logger.log_exception ex
-      Siba::SibaLogger.count("debug",true).must_equal 2
+      @cls.count("debug",true).must_equal 2
     end
 
     it "must close logger" do
       @logger.close
-      Siba::SibaLogger.count.must_equal 2
+      @cls.count.must_equal 2
       ->{@logger.info "hi"}.must_raise Siba::Error, "Error if trying to use closed log"
     end
 
@@ -168,7 +204,7 @@ describe Siba::SibaLogger do
     it "should access :show_finish_message" do
       @logger.show_finish_message = false
       @logger.close
-      Siba::SibaLogger.messages.size.must_equal 1
+      @cls.messages.size.must_equal 1
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: siba
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &74959570 !ruby/object:Gem::Requirement
+  requirement: &82437310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *74959570
+  version_requirements: *82437310
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &77393270 !ruby/object:Gem::Requirement
+  requirement: &82437080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *77393270
+  version_requirements: *82437080
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &77393040 !ruby/object:Gem::Requirement
+  requirement: &82436850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *77393040
+  version_requirements: *82436850
 description: ! 'SIBA is a backup and restore utility. It implements daily backup rotation
   scheme. It retains full year history of backups by keeping 23 files in total: for
   the last 6 days, 5 weeks and 12 months. Backups are archived and encrypted. Various