siba 0.5.6 → 0.5.7

data/siba.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = '~>1.8'
 
-  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'
 

data/test/integration/helpers/i9n_file_helper.rb

@@ -22,7 +22,7 @@ describe Siba::FileHelper do
     entries.wont_be_empty
     entries.must_equal entries_to_compare
   end
-  
+
   it "should call dirs" do
     test_dir = prepare_test_dir "dir-not-empty"
     entries = @obj.dirs test_dir

data/test/integration/i9n_backup.rb

@@ -16,7 +16,7 @@ describe Siba::Backup do
     src_file = prepare_test_file "bf-src-file"
     dest_dir = mkdir_in_tmp_dir "bf-dest-dir"
 
-    test_yml_path = prepare_yml @path_to_src_yml, 
+    test_yml_path = prepare_yml @path_to_src_yml,
       { src_dir: src_dir,
         src_file: src_file,
         dest_dir: dest_dir,

data/test/integration/i9n_scaffold.rb

@@ -5,7 +5,7 @@ require 'helper/require_integration'
 describe Siba::Scaffold do
   before do
     @gem_name = "myname"
-    @obj = Siba::Scaffold.new "destination", @gem_name 
+    @obj = Siba::Scaffold.new "destination", @gem_name
   end
 
   it "should run scaffold" do

data/test/integration/i9n_test_unicode_files.rb

@@ -27,7 +27,7 @@ describe Siba::Backup do
     src_file = prepare_test_file "bf-src-file-#{SibaTest::UNICODE_FILE_NAME}"
     dest_dir = mkdir_in_tmp_dir "bf-dest-dir-#{SibaTest::UNICODE_FILE_NAME}"
 
-    test_yml_path = prepare_yml @path_to_src_yml, 
+    test_yml_path = prepare_yml @path_to_src_yml,
       { src_dir: src_dir,
         src_file: src_file,
         dest_dir: dest_dir,

data/test/integration/i9n_tmp_dir.rb

@@ -14,7 +14,7 @@ describe Siba::TmpDir do
   it "should get tmp dir" do
     siba_file.file_directory?(@tmp_dir.get).must_equal true
   end
-  
+
   it "should get the same tmp on second call" do
     dir1 = @tmp_dir.get
     dir2 = @tmp_dir.get
@@ -22,7 +22,7 @@ describe Siba::TmpDir do
   end
 
   it "should use dir specified in settings" do
-    test_dir = prepare_test_dir "tmp-dir"    
+    test_dir = prepare_test_dir "tmp-dir"
     Siba.settings = {"tmp_dir"=>test_dir}
     dir1 = @tmp_dir.get
     dir1.must_match /^#{test_dir}/

data/test/integration/plugins/destination/dir/i9n_dest_dir.rb

@@ -4,7 +4,7 @@ require 'helper/require_integration'
 require 'siba/plugins/destination/dir/init'
 
 describe Siba::Destination::Dir::DestDir do
-  before do    
+  before do
     @cls = Siba::Destination::Dir::DestDir
   end
 

data/test/integration/plugins/encryption/gpg/i9n_encryption.rb

@@ -11,7 +11,7 @@ describe Siba::Encryption::Gpg::Encryption do
   it "init should fail if cipher is not supported" do
     ->{Siba::Encryption::Gpg::Encryption.new @passphrase, "unknown_cipher"}.must_raise Siba::CheckError
   end
-  
+
   it "init should assign default cipher if it's not supplied" do
     encryption = Siba::Encryption::Gpg::Encryption.new @passphrase
     encryption.cipher.wont_be_nil
@@ -31,14 +31,14 @@ describe Siba::Encryption::Gpg::Encryption do
     path_to_decrypted_file.must_equal path_to_output_file
     siba_file.file_utils_compare_file(path_to_source_file, path_to_decrypted_file).must_equal true
 
-   
+
     # decrypt without output file parameter
     ->{encryption.decrypt path_to_encrypted_file}.must_raise Siba::Error, "Should fail to decrypt if file already exists"
     FileUtils.mv path_to_source_file, path_to_source_file + "new"
     path_to_decrypted_file = encryption.decrypt path_to_encrypted_file
     path_to_decrypted_file.must_equal path_to_source_file
 
-    # should fail to decrypt with incorrect passphrase 
+    # should fail to decrypt with incorrect passphrase
     encryption.passphrase = "incorrect"
     ->{encryption.decrypt path_to_encrypted_file}.must_raise Siba::Error
   end
@@ -80,7 +80,7 @@ describe Siba::Encryption::Gpg::Encryption do
     ->{Siba::Encryption::Gpg::Encryption.check_cipher(nil)}.must_raise Siba::CheckError
     SibaTest::RemovableConstants.redef_without_warning Siba::Encryption::Gpg::Encryption, "DEFAULT_CIPHER", old_cipher
   end
-  
+
   it "check_cipher must fail if unknown cipher is used" do
     ->{Siba::Encryption::Gpg::Encryption.check_cipher("incorrect")}.must_raise Siba::CheckError
   end

data/test/integration/plugins/source/files/i9n_files.rb

@@ -47,7 +47,7 @@ describe Siba::Source::Files::Files do
     dest_sub_dir = File.join dest_dir, File.basename(src_dir)
     Siba::FileHelper.entries(src_dir).each do |entry|
       entry_path = File.join src_dir, entry
-      siba_file.file_utils_remove_entry_secure entry_path if siba_file.file_directory?(entry_path) 
+      siba_file.file_utils_remove_entry_secure entry_path if siba_file.file_directory?(entry_path)
     end
     siba_file.file_directory?(dest_sub_dir).must_equal true
     dirs_same? src_dir, dest_sub_dir
@@ -77,8 +77,8 @@ describe Siba::Source::Files::Files do
 
     dest_dir = mkdir_in_tmp_dir "s-f-dest-dir"
     f.backup dest_dir
-   
-    # compare dir 
+
+    # compare dir
     backup_dir = @files.sub_dir_name 1, 1, false, File.basename(src_dir), dest_dir
     dirs_same? src_dir, backup_dir
 
@@ -89,7 +89,7 @@ describe Siba::Source::Files::Files do
 
     Siba::FileHelper.dirs_count(dest_dir).must_equal 2, "Should create two folders for each source"
   end
-  
+
   it "backup should log error message if one of the sources is not found" do
     src_dir = prepare_test_dir "s-f-src-dir"
     f = @files.new ["/non-existing-file", src_dir],[],true
@@ -97,7 +97,7 @@ describe Siba::Source::Files::Files do
     dest_dir = mkdir_in_tmp_dir "s-f-dest-dir"
     f.backup dest_dir
 
-    # The existing dir must be copied 
+    # The existing dir must be copied
     backup_dir = @files.sub_dir_name 2, 1, false, File.basename(src_dir), dest_dir
     dirs_same? src_dir, backup_dir
 
@@ -136,7 +136,7 @@ describe Siba::Source::Files::Files do
 
     # Compare dirs
     restore_dir1.wont_equal backup_dir1
-    dirs_same? restore_dir1, backup_dir1 
+    dirs_same? restore_dir1, backup_dir1
 
     # Compare file
     restore_file.wont_equal backup_file

data/test/integration/tasks/i9n_siba_tasks.rb

@@ -9,7 +9,7 @@ describe Siba::SibaTasks do
   end
 
   it "should backup and testore tasks" do
-    src_dir = prepare_test_dir "b-src-dir" 
+    src_dir = prepare_test_dir "b-src-dir"
     src_file = prepare_test_file "b-src-file"
     dest_dir = mkdir_in_tmp_dir "b-dest-dir"
 
@@ -22,7 +22,7 @@ describe Siba::SibaTasks do
     options = SibaTest.load_options path_to_test_yml
 
     tasks = Siba::SibaTasks.new options, path_to_test_yml, false
-    tasks.backup 
+    tasks.backup
 
     # restore into original source
     backup_file_name = Siba::FileHelper.entries(dest_dir)[0]

data/test/unit/helpers/test_encoding_helper.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper/require_unit' 
+require 'helper/require_unit'
 
 describe Siba::EncodingHelper do
   before do

data/test/unit/helpers/test_gem_helper.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper/require_unit' 
+require 'helper/require_unit'
 
 describe Siba::GemHelper do
   before do

data/test/unit/helpers/test_security_helper.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper/require_unit' 
+require 'helper/require_unit'
 
 describe Siba::SecurityHelper do
   before do

data/test/unit/helpers/test_string_helper.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper/require_unit' 
+require 'helper/require_unit'
 
 describe Siba::StringHelper do
   before do

data/test/unit/plugins/archive/tar/test_archive.rb

@@ -4,7 +4,7 @@ require 'helper/require_unit'
 require 'siba/plugins/archive/tar/init'
 
 describe Siba::Archive::Tar::Init do
-  before do    
+  before do
     @yml_path = File.expand_path('../yml/archive', __FILE__)
   end
 
@@ -25,7 +25,7 @@ describe Siba::Archive::Tar::Init do
     Siba::Archive::Tar::Archive.new("gzip")
       .archive("",dest_dir,file_name)
       .must_match /^#{file_name}\.tar.gz$/
-        
+
     Siba::Archive::Tar::Archive.new("bzip2")
       .archive("",dest_dir,file_name)
       .must_match /^#{file_name}\.tar.bz2$/

data/test/unit/plugins/archive/tar/test_init.rb

@@ -4,7 +4,7 @@ require 'helper/require_unit'
 require 'siba/plugins/archive/tar/init'
 
 describe Siba::Archive::Tar::Init do
-  before do    
+  before do
     @yml_path = File.expand_path('../yml/init', __FILE__)
     @plugin_category="archive"
     @plugin_type="tar"
@@ -28,7 +28,7 @@ describe Siba::Archive::Tar::Init do
     archive = create_plugin("valid")
     archive.backup("/src-dir", "/dst-dir", "file_name").must_be_instance_of String
   end
-  
+
   it "should run restore" do
     archive = create_plugin("valid")
     archive.restore "/path-to-archive", "/to_dir"

data/test/unit/plugins/destination/dir/test_dest_dir.rb

@@ -4,7 +4,7 @@ require 'helper/require_unit'
 require 'siba/plugins/destination/dir/init'
 
 describe Siba::Destination::Dir::DestDir do
-  before do    
+  before do
     @dir = "/some-dir"
     @cls = Siba::Destination::Dir::DestDir
   end

data/test/unit/plugins/destination/dir/test_init.rb

@@ -4,7 +4,7 @@ require 'helper/require_unit'
 require 'siba/plugins/destination/dir/init'
 
 describe Siba::Destination::Dir::Init do
-  before do    
+  before do
     @yml_path = File.expand_path('../yml/init', __FILE__)
     @plugin_category="destination"
     @plugin_type="dir"

data/test/unit/plugins/encryption/gpg/test_encryption.rb

@@ -8,18 +8,6 @@ describe Siba::Encryption::Gpg::Encryption do
     @passphrase = "aj(dJ6Hja2Jj$kjask"
   end
 
-  it "init should call test_encryption" do
-    fmock = mock_file :run_this, nil, ["test_encryption"]
-    Siba::Encryption::Gpg::Encryption.new(@passphrase)
-    fmock.verify
-  end
-  
-  it "init should call check_cipher" do
-    fmock = mock_file :run_this, nil, ["check_cipher"]
-    Siba::Encryption::Gpg::Encryption.new(@passphrase)
-    fmock.verify
-  end
-
   it "must call encrypt" do
     encryption = Siba::Encryption::Gpg::Encryption.new(@passphrase)
     path_to_archive = "/path/to/archive.tar.gz"
@@ -33,7 +21,7 @@ describe Siba::Encryption::Gpg::Encryption do
     path_to_decrypted_file = encryption.decrypt(path + ".gpg")
     path_to_decrypted_file.must_equal path
   end
-  
+
   it "must call decrypt with output file parameter" do
     encryption = Siba::Encryption::Gpg::Encryption.new(@passphrase)
     path = "/path/to/archive.tar.gz.gz"
@@ -51,7 +39,7 @@ describe Siba::Encryption::Gpg::Encryption do
       Siba::Encryption::Gpg::Encryption.parse_cipher_names(a[0]).must_equal a[1]
     end
   end
-    
+
   it "init must warn if the password is weak" do
     Siba::Encryption::Gpg::Encryption.new "passwordisweak"
     must_log "warn"

data/test/unit/plugins/encryption/gpg/test_init.rb

@@ -15,8 +15,8 @@ describe Siba::Encryption::Gpg::Init do
     plugin.encryption.wont_be_nil
     plugin.encryption.passphrase.wont_be_nil
     plugin.encryption.cipher.wont_be_nil
-    plugin.encryption.passphrase.must_equal @options["passphrase"] 
-    plugin.encryption.cipher.must_equal @options["cipher"] 
+    plugin.encryption.passphrase.must_equal @options["passphrase"]
+    plugin.encryption.cipher.must_equal @options["cipher"]
   end
 
   it "must init with missing" do
@@ -34,7 +34,7 @@ describe Siba::Encryption::Gpg::Init do
     ->{create_plugin({'passphrase' => ""})}.must_raise Siba::CheckError
     ->{create_plugin({'passphrase' => " "})}.must_raise Siba::CheckError
   end
-  
+
   it "must call backup" do
     plugin = create_plugin(@options)
     plugin.backup("/path/to/archive", "/dest_dir").must_be_instance_of String

data/test/unit/plugins/source/files/test_files.rb

@@ -9,12 +9,12 @@ describe Siba::Source::Files::Files do
   end
   it "ignored? must NOT log if no files are excluded" do
     @f.new([], [], true).ignored?("/.hidden")
-    wont_log "info" 
+    wont_log "info"
   end
 
   it "ignored? must log if files are excluded" do
     @f.new([], ["*"], true).ignored?("/.hidden")
-    must_log "info" 
+    must_log "info"
   end
 
   it "should call backup" do

data/test/unit/plugins/source/files/test_init.rb

@@ -4,7 +4,7 @@ require 'helper/require_unit'
 require 'siba/plugins/source/files/init'
 
 describe Siba::Source::Files::Init do
-  before do    
+  before do
     @yml_path = File.expand_path('../yml', __FILE__)
     @plugin_category="source"
     @plugin_type="files"
@@ -25,7 +25,7 @@ describe Siba::Source::Files::Init do
   it "should load ignore list" do
     create_plugin("valid").files.ignore.must_be_instance_of Array
   end
-  
+
   it "load should fail ignore is not array" do
     -> {create_plugin("ignore_not_array")}.must_raise Siba::CheckError
   end
@@ -37,7 +37,7 @@ describe Siba::Source::Files::Init do
   it "should load include_subdirs=false" do
     create_plugin("include_subdirs_false").files.include_subdirs.must_equal false
   end
-  
+
   it "backup should copy file" do
     create_plugin("valid").backup "dir"
   end

data/test/unit/plugins/source/files/test_path_match.rb

@@ -4,7 +4,7 @@ require 'helper/require_unit'
 require 'siba/plugins/source/files/init'
 
 describe Siba::Source::Files do
-  before do    
+  before do
     @yml_path = File.expand_path('../yml', __FILE__)
     @plugin_category="source"
     @plugin_type="files"
@@ -13,7 +13,7 @@ describe Siba::Source::Files do
   it "should call path_match?" do
     Siba::Source::Files::Files.path_match? "file", "include"
   end
-  
+
   it "must match path" do
     match_list = [
       # ----------------------
@@ -102,7 +102,7 @@ describe Siba::Source::Files do
       # ----------------------
       # match basenames against pattern
       ["name*",   "/somename"],
-      
+
       # ----------------------
       # match whole path against pattern
       [".*",      "/.hidden/file"],
@@ -111,9 +111,9 @@ describe Siba::Source::Files do
       ["dir",     "/dir1/dir/file"],
       ["dir",     "/dir/name/file"],
       ["dir/name",  "/name"],
-      ["dir/name",  "/root/dir/name"],      
-      ["/file*",    "/root/file"],      
-      ["/file/*",   "/file"],      
+      ["dir/name",  "/root/dir/name"],
+      ["/file*",    "/root/file"],
+      ["/file/*",   "/file"],
     ]
 
     must_not_match_list.each do |item|

data/test/unit/plugins/test_installed_plugins.rb

@@ -29,4 +29,8 @@ describe Siba::InstalledPlugins do
     @cls.gem_name("source", "files").must_be_instance_of String
   end
 
+  it "should call install_gem_message" do
+    @cls.install_gem_message("source", "files").must_be_instance_of String
+  end
+
 end

data/test/unit/plugins/test_plugin_loader.rb

@@ -12,9 +12,12 @@ describe Siba::LogMessage do
     @loader.load "archive", "tar", @options
   end
 
-  it "should fail when plugin name is incorrect" do
-    ->{@loader.load "incorrect", "tar", @options}.must_raise Siba::PluginLoadError
-
+  it "should fail when plugin name is incorrect or note installed" do
+    begin
+      @loader.load "source", "incorrect", @options
+    rescue Siba::PluginLoadError => e
+      e.message.must_match /\A'incorrect' plugin is not installed/
+    end
   end
 
   it "should fail when plugin type is unknown" do

data/test/unit/tasks/test_siba_task.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'helper/require_unit' 
+require 'helper/require_unit'
 
 describe Siba::SibaTask do
   before do
@@ -11,7 +11,7 @@ describe Siba::SibaTask do
     task_category = "archive"
     options = load_options "valid"
     new_task = Siba::SibaTask.new options, task_category
-    new_task.wont_be_nil 
+    new_task.wont_be_nil
     new_task.plugin.wont_be_nil
     new_task.category.must_equal task_category
     new_task.type.must_equal "tar"