syc-backup 0.0.5 → 0.0.6

data/README.rdoc

@@ -7,22 +7,35 @@ The application can be installed with
 
 == Usage
 Backup a database to the default folder _~/backup_
-    $ sycup -d database -uuser -ppass
+    $ sycbackup -d database -uuser -ppass
 
 Backup a MySQL database, a directory and files to the default folder
-    $ sycup -d database -uuser -ppass -f directory,file1,file2
+    $ sycbackup -d database -uuser -ppass -f directory,file1,file2
 
 Specify a backup folder
-    $ sycup backup/folder -d database -uuser -ppass -f directory,file1,file2
+    $ sycbackup backup/folder -d database -uuser -ppass -f directory,file1,file2
 
 Override files in the backup folder if they exist
-    $ sycup backup/folder --override -f directory,file1,file2
+    $ sycbackup backup/folder --override -f directory,file1,file2
 
 Don't compress the backup
-    $ sycup --no-compress -f directory,file1,file2
+    $ sycbackup --no-compress -f directory,file1,file2
 
 Create a cron job that is scheduled every day at 2:30
-    $ sycup -d database -uuser -ppass -f directory,file1 --cron 30,2,*,*,*
+    $ sycbackup -d database -uuser -ppass -f directory,file1 --cron 30,2,*,*,*
+
+If the user or password contains characters as '(' you have to escape
+them. A password like 123(56 has to be provided with pass\"123\\\\(56\".
+
+== Usage of --override and --no-compress
+Whether the backup directory and the backup files are time stamped depends how
+--override and --no-compress is set. The results are shown in the table below.
+
+    --override      --no-compress     backup directory      backup file(s)
+         0                0            w/o timestamp         w/ timestamp
+         1                0            w/o timestamp         w/ timestamp
+         0                1            w/  timestamp         uncompressed
+         1                1            w/o timestamp         uncompressed
 
 == Supported Platform
 syc-backup has been tested with 1.9.3
@@ -41,6 +54,9 @@ The tests create folders and files and will be deleted after the tests finish. _
 
 The test files live in the test folder and begin with test_.
 
+There is a rake file available which can be used to run all tests with
+    $ rake test
+
 == Links
 * [http://sugaryourcoffee.github.com/syc-backup] - RubyDoc
 * [http://www.github.com/sugaryourcoffee/syc-backup] - Source code on GitHub

data/lib/backup/options.rb

@@ -101,12 +101,10 @@ module Backup
     # provided by the user
     def initialize_default_arguments_if_missing
       @backup_folder = DEFAULT_BACKUP_FOLDER unless @backup_folder
-      unless @override
+      if @override and @no_compress
         timestamp = Time.now.strftime("%Y%m%d-%H%M%S")
-        if @backup_folder and File.exists?(@backup_folder)
-          @backup_folder = File.dirname(@backup_folder) + '/' +
-                           File.basename(@backup_folder) + '_' + timestamp
-        end
+        @backup_folder = File.dirname(@backup_folder) + '/' +
+                         File.basename(@backup_folder) + '_' + timestamp
       end
       @backup_folder = File.expand_path(@backup_folder)
       @backup_folder += '/' unless @backup_folder.match(/.*\/\Z/)

data/lib/backup/process.rb

@@ -74,10 +74,7 @@ module Backup
     # displayed and the application exits. If the method runs without errors
     # the tar file is returned
     def compress_files_and_copy
-      timestamp = ""
-      unless @override
-       timestamp = Time.now.strftime("%Y%m%d-%H%M%S") + '_'
-      end
+      timestamp = Time.now.strftime("%Y%m%d-%H%M%S") + '_'
       tar_file = @backup_folder + timestamp + "syc-backup.tar.gz" 
       tar_command = "tar cfz #{tar_file} #{@files.join(" ")}"
 

data/lib/backup_version.rb

@@ -5,5 +5,5 @@
 # per default compressed but this can be ommitted
 module Backup
   # Version of the application
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/test/test_options.rb

@@ -102,18 +102,11 @@ class TestOptions < Test::Unit::TestCase
   context "Correct user input" do
 
     should "return database, user, password and default backup_folder" do
-      default_backup_folder_exists = 
-        File.exists? Backup::Options::DEFAULT_BACKUP_FOLDER
       opts = Backup::Options.new(["-d", "database", "-u", "user", "-p", "pass"])
       assert_equal "database", opts.database
       assert_equal "user", opts.user
       assert_equal "pass", opts.password
-      unless default_backup_folder_exists
-        assert_match Backup::Options::DEFAULT_BACKUP_FOLDER, opts.backup_folder
-      else
-        assert_match /#{Backup::Options::DEFAULT_BACKUP_FOLDER}_\d{8}-\d{6}\//, 
-                     opts.backup_folder
-      end
+      assert_match Backup::Options::DEFAULT_BACKUP_FOLDER, opts.backup_folder
     end
 
     should "return database and specified backup folder" do
@@ -184,6 +177,11 @@ class TestOptions < Test::Unit::TestCase
       assert_equal true, opts.no_compress
     end
 
+    should "return time stamped backup directory" do
+      opts = Backup::Options.new(["-f", "a,b,c", "--no-compress", "--override"])
+      assert_match /#{Backup::Options::DEFAULT_BACKUP_FOLDER}_\d{8}-\d{6}\//, 
+                   opts.backup_folder
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syc-backup
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies: []
 description: ! "Back up a database and files or schedule cron job \n                      for
   backup"
@@ -19,6 +19,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- syc-backup-0.0.5.gem
 - README.rdoc
 - test/test_process.rb
 - test/test_mysql_backup.rb
@@ -26,7 +27,6 @@ files:
 - test/test_cron_edit.rb
 - test/test_environment.rb
 - test/test_file_backup.rb
-- syc-backup-0.0.4.gem
 - sycbackup.gemspec
 - lib/backup_version.rb
 - lib/backup/file_backup.rb