smarbs 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.9.4 / 2010-01-28
+
+* fixed an ignore_leftovers bug
+* new tests for ignore_leftovers
+* require ruby >= 1.9.1
+
 === 0.9.3 / 2009-12-16
 
-* First gem release
+* First gem release

data/Rakefile

@@ -5,6 +5,7 @@ require 'hoe'
 
 Hoe.spec 'smarbs' do
   developer('Jan Rueegg', 'rggjan@gmail.com')
+  spec_extras[:required_ruby_version] = '>= 1.9.1'
 end
 
 # vim: syntax=ruby

data/lib/backup.rb

@@ -175,7 +175,8 @@ class Backup
     @logger.p("", 98)
     return cursize
   end
-  
+
+  # Starts the backup itself. Can raise a normal exeption, indicating something with the configfile is wrong, or a NoConfigException, meaning something else went wrong. Like, for example, when unknown rsync errors occur.
   def backup
 
     dest = @backup_dir.to_s + Time.now.strftime("%Y-%m-%d.%Hh%M") + "-backup.0"

data/lib/helpers.rb

@@ -323,7 +323,7 @@ end
 
 # Specifies a directory that contains smarbs backups.
 class SmarbsBackupDir < Directory
-  # Creates or reads out a SmarbsBackupDir, testing if it has valid contents.
+  # Creates or reads out a SmarbsBackupDir, testing if it has valid contents. Can raise a NoConfigException, or a RuntimeError
   def initialize(directory, ignore_leftovers=false)
     super(directory, :writable)
 
@@ -343,7 +343,8 @@ class SmarbsBackupDir < Directory
   # '...backup.0' directory is left. Otherwise returns false.
   def directory_left
     list = dirlist
-    if list[0][0] == 0
+
+    if not list.empty? and list[0][0] == 0
       return (list[0][1]).to_s+"-backup.0"
     else
       return false

data/lib/smarbs.rb

@@ -1,5 +1,5 @@
 module SMARBS
-  VERSION = "0.9.3"
-  DATE = "16. December 2009"
+  VERSION = "0.9.4"
+  DATE = "28. Januar 2010"
   DATADIR = File.expand_path("../data/", __FILE__)
 end

data/test/test_backup.rb

@@ -167,5 +167,31 @@ ls: cannot access /im/not/existing/too: No such file or directory") do
     assert_success do
       Script.new("/tmp/smarbs/smarbs")
     end
+
+    clean
+    cf = default_configfile
+    cf.ignore_leftovers=true
+    cf.write
+    
+    assert_success do
+      Script.new("/tmp/smarbs/smarbs/")
+    end
+
+    assert_backup_dirs([1])
+ 
+    assert_success do
+      Script.new("/tmp/smarbs/smarbs/")
+    end
+
+    assert_backup_dirs([1, 2])
+
+    `mkdir -p /tmp/smarbs/backedup/smarbsbackup/a-backup.0`
+
+    assert_success do
+      Script.new("/tmp/smarbs/smarbs/")
+    end
+
+    assert_backup_dirs([1, 2, 3])
+
   end
 end

data/test/test_helpers.rb

@@ -211,6 +211,8 @@ class TestSmarbsBackupDir < Test::Unit::TestCase
       SmarbsBackupDir.new("/tmp/smarbs/test_directory")
     end
 
+    assert_nothing_raised do SmarbsBackupDir.new("/tmp/smarbs/test_directory", true) end
+
     assert_equal "a-backup.0", SmarbsBackupDir.new("/tmp/smarbs/test_directory", true).directory_left
 
     `rm -r /tmp/smarbs/test_directory/a-backup.0`
@@ -220,6 +222,10 @@ class TestSmarbsBackupDir < Test::Unit::TestCase
     
     assert_equal false, SmarbsBackupDir.new("/tmp/smarbs/test_directory", true).directory_left
 
+    `mkdir -p /tmp/smarbs/test_directory2/`
+
+    assert_equal false, SmarbsBackupDir.new("/tmp/smarbs/test_directory2", true).directory_left
+
     assert_raise_message "/etc/smarbs/ is not writable!" do
       SmarbsBackupDir.new("/etc/smarbs")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smarbs
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Jan Rueegg
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +01:00
+date: 2010-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -20,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.5.0
     version: 
 description: |-
   smarbs is a backup script written in ruby capable of doing intelligent and
@@ -81,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.9.1
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -97,11 +117,11 @@ signing_key:
 specification_version: 3
 summary: smarbs is a backup script written in ruby capable of doing intelligent and automated backups using rsync.
 test_files: 
-- test/test_backup.rb
+- test/test_script.rb
+- test/test_smarbs.rb
 - test/test_types.rb
+- test/test_log.rb
 - test/test_suite.rb
-- test/test_smarbs.rb
 - test/test_smarbs_test.rb
-- test/test_log.rb
+- test/test_backup.rb
 - test/test_helpers.rb
-- test/test_script.rb