rmybackup 0.3.5 → 0.3.6

data/bin/rmybackup

@@ -51,19 +51,21 @@ end
 #The first remaining ARGV, we'll take as a command
 command = ARGV.shift
 
-#Load up the config file. This will exit 1 if the config file can't be found
-RMyBackup::Base.load_config(options[:config_file])
 
 #Evaluate edit or list options
 if options[:list]
-  RMyBackup.list_config_file
+  RMyBackup.list_config_file(File.expand_path(options[:config_file]))
   exit 0
 end
 
 if options[:edit]
-  RMyBackup.edit_config_file
+  RMyBackup.edit_config_file(File.expand_path(config_file))
   exit 0
 end
 
+#Load up the config file. This will exit 1 if the config file can't be found
+RMyBackup::Base.load_config(options[:config_file])
+
+
 #Run the backups
 RMyBackup::Backup.run

data/lib/rmybackup/install_config.rb

@@ -3,7 +3,7 @@ module RMyBackup
   def self.install_config(file=false)
     #Default the file location
     if not file
-      if File.writable_real?("/etc/rmybackup.conf")
+      if File.writable_real?("/etc/")
         file = "/etc/rmybackup.conf"
       else
         file = "~/.rmybackup.conf"
@@ -46,10 +46,14 @@ module RMyBackup
     end
   end
   
-  def self.list_config_file
+  def self.list_config_file(file)
     if editor
-      config = RMyBackup::Base.get_config
-      file = config['file']
+
+      #See if the config file exists
+      if not File.exists? file
+        puts "The config file cannot be found: #{file}"
+      end
+      
       puts "Showing config file - #{file}:\n"
       File.open(file, "r") do |infile|
         while(line = infile.gets)
@@ -62,10 +66,15 @@ module RMyBackup
     end
   end
   
-  def self.edit_config_file
-    config = RMyBackup::Base.get_config
+  def self.edit_config_file(file)
+
+    #See if the config file exists
+    if not File.exists? file
+      puts "The config file cannot be found: #{file}"
+    end
+
     if editor
-      exec "#{editor} #{config['file']}"
+      exec "#{editor} #{file}"
     else
       puts "Can't locate vim and $EDITOR isn't set"
       exit 1

data/lib/rmybackup/push.rb

@@ -14,7 +14,7 @@ module RMyBackup
           push += "/" if push[-1,1] != "/"
           
           puts "\nPushing to : #{push} -->\n\n"
-          system "#{rsync_command} -rz --delete #{@config['backup_dir']}/ #{push}"
+          system "#{rsync_command} -rtz --delete #{@config['backup_dir']}/ #{push}"
         end
         
       end

data/lib/rmybackup.rb

@@ -11,5 +11,5 @@ require File.expand_path('../rmybackup/push',__FILE__)
 
 #Set the version
 module RMyBackup
-  GEM_VERSION = "0.3.5"
+  GEM_VERSION = "0.3.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Bryan Shelton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 -06:00
+date: 2010-07-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency