backup 3.0.10 → 3.0.11

data/lib/backup/archive.rb

@@ -49,7 +49,7 @@ module Backup
     def perform!
       mkdir(archive_path)
       Logger.message("#{ self.class } started packaging and archiving #{ paths.map { |path| "\"#{path}\""}.join(", ") }.")
-      run("#{ utility(:tar) } -c #{ paths_to_exclude } #{ paths_to_package } 1> '#{ File.join(archive_path, "#{name}.tar") }' 2> /dev/null")
+      run("#{ utility(:tar) } -c -f '#{ File.join(archive_path, "#{name}.tar") }' #{ paths_to_exclude } #{ paths_to_package } 2> /dev/null")
     end
 
   private

data/lib/backup/storage/s3.rb

@@ -34,14 +34,13 @@ module Backup
 
         instance_eval(&block) if block_given?
 
-        @path = path.sub(/^\//, '')
         @time = TIME
       end
 
       ##
       # This is the remote path to where the backup files will be stored
       def remote_path
-        File.join(path, TRIGGER, '/')
+        File.join(path, TRIGGER).sub(/^\//, '')
       end
 
       ##

data/lib/backup/version.rb

@@ -13,7 +13,7 @@ module Backup
     #  Defines the minor version
     # PATCH:
     #  Defines the patch version
-    MAJOR, MINOR, PATCH = 3, 0, 10
+    MAJOR, MINOR, PATCH = 3, 0, 11
 
     ##
     # Returns the major version ( big release based off of multiple minor releases )

data/spec/archive_spec.rb

@@ -64,7 +64,7 @@ describe Backup::Archive do
     context 'when both paths were added and paths that should be excluded were added' do
       it 'should render both the syntax for the paths that be included as well as excluded' do
         archive.expects(:mkdir).with(File.join(Backup::TMP_PATH, Backup::TRIGGER, 'archive'))
-        archive.expects(:run).with("tar -c --exclude={'/home/rspecuser/excludefile','/home/rspecuser/excludedir/'} '/home/rspecuser/somefile' '/home/rspecuser/logs/' '/home/rspecuser/dotfiles/' 1> '#{File.join(Backup::TMP_PATH, Backup::TRIGGER, 'archive', "#{:dummy_archive}.tar")}' 2> /dev/null")
+        archive.expects(:run).with("tar -c -f '#{File.join(Backup::TMP_PATH, Backup::TRIGGER, 'archive', "#{:dummy_archive}.tar")}' --exclude={'/home/rspecuser/excludefile','/home/rspecuser/excludedir/'} '/home/rspecuser/somefile' '/home/rspecuser/logs/' '/home/rspecuser/dotfiles/' 2> /dev/null")
         archive.expects(:utility).with(:tar).returns(:tar)
         archive.perform!
       end
@@ -77,7 +77,7 @@ describe Backup::Archive do
         end
 
         archive.stubs(:utility).returns(:tar)
-        archive.expects(:run).with("tar -c  '/path/to/archive' 1> '#{File.join(Backup::TMP_PATH, Backup::TRIGGER, 'archive', "#{:dummy_archive}.tar")}' 2> /dev/null")
+        archive.expects(:run).with("tar -c -f '#{File.join(Backup::TMP_PATH, Backup::TRIGGER, 'archive', "#{:dummy_archive}.tar")}'  '/path/to/archive' 2> /dev/null")
         archive.perform!
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: backup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 +01:00
+date: 2011-03-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency