rmybackup 0.0.5 → 0.1.0

data/Readme.md

@@ -9,9 +9,9 @@ RMyBackup was created to solve a simple problem I had, and is hopefully useful t
 
 The gem will install an rmybackup binary. RMyBackup will read its configuration from /etc/rmybackup.conf (a sample configuration file is shown below). RMyBackup will backup the specified databases in the databases: [] list in the configuration file.
 
-To generate a sample config file, use the --config_file option. Default location is /etc/rmybackup.conf, or you can specify your own location.
+To generate a sample config file, use the --instal_config option. Default location is /etc/rmybackup.conf, or you can specify your own location.
 
-    # rmybackup --config_file /etc/rmybackup.conf
+    # rmybackup --install_config /etc/rmybackup.conf
 
 Right now the script relies on your [mysqldump] configuration in either /etc/my.cnf or the user's ~/.my.cnf. I'm hoping to change this soon, allowing you to specify the host, user, password, and socket in the configuration file.
 
@@ -39,7 +39,6 @@ The default location for the configuration file is /etc/rmybackup.conf, formatte
     #Databases to back up
     databases: [
       bercilak,
-      etrack,
       bbpress
     ]
 

data/bin/rmybackup

@@ -10,9 +10,16 @@ end
 
 require 'optparse'
 
-#Set some globals
-OPTIONS = { :config_file => "/etc/rmybackup.conf" }
-GEM_VERSION = "0.0.5"
+#GLOBALS
+
+#Default to local config file if it exists
+if File.exists?(File.expand_path("~/.rmybackup.conf"))
+  OPTIONS = { :config_file => File.expand_path("~/.rmybackup.conf") }
+else
+  OPTIONS = { :config_file => "/etc/rmybackup.conf" }
+end
+
+GEM_VERSION = "0.1.0"
 
 #Process the command line arguments
 ARGV.options do |opts|
@@ -20,6 +27,8 @@ ARGV.options do |opts|
   opts.on("-f /etc/rmybackup.conf","--config_file /etc/rmybackup.conf","Set Config File",String) do |o| 
     OPTIONS[:config_file] = o 
   end
+  
+  #Version
   opts.on("-v","--version","Outputs version") { puts "Version - #{GEM_VERSION}"; exit }
 
   #Allow the user to write the sample config file to either the default (no file specified) or to the file they specify
@@ -28,6 +37,7 @@ ARGV.options do |opts|
     RMyBackup.install_config(ic)
     exit 0
   end
+  
   opts.parse!
 end
 
@@ -38,4 +48,4 @@ if not File.exists? OPTIONS[:config_file]
 end
 
 #Run
-RMyBackup.new(OPTIONS[:config_file])
+RMyBackup::Base.new(OPTIONS[:config_file])

data/lib/rmybackup/config.rb

@@ -0,0 +1,26 @@
+module RMyBackup
+  #Install a baseline config file from the template
+  def self.install_config(file=false)
+    #Default the file location
+    file = "/etc/rmybackup.conf" if not file
+    file = File.expand_path(file)
+
+    if File.exists? file
+      puts "The file already exists, do you want to overwrite it? (Y/Yes):"
+      STDOUT.flush
+      answer = gets.chomp
+      exit 1 unless answer.upcase == "Y" or answer.upcase == "YES"
+    end
+
+    #Read Sample Config File
+    config_file = File.read(File.expand_path("../../rmybackup/config_file.txt",__FILE__))
+
+    begin
+      File.open(file,'w') {|f| f.write(config_file) }
+      puts "Installing #{file}"
+    rescue Errno::EACCES
+      puts "Can't write to - #{file}"
+    end
+    exit 0
+  end
+end

data/lib/rmybackup/config_file.txt

@@ -0,0 +1,13 @@
+#Backup Directory
+backup_dir: /Users/bshelton/mysql_tmp/
+
+#Databases to back up
+#databases: [ test, test2 ]
+
+databases: []
+
+#Command Locations
+#You can override where to find the needed system commands, default locations are prefixed with /usr/bin/
+
+#mysqldump_command: /usr/local/mysql/bin/mysqldump
+#gzip_command: /usr/bin/gzip

data/lib/rmybackup.rb

@@ -1,119 +1,70 @@
 require 'yaml'
 require 'time'
+require 'rmybackup/config'
 
-#The main RMyBackup library
-class RMyBackup
-    
-  def initialize(config_file)
-    @config_file = config_file
-    #if the config file passes, run the backups
-    run_backups if parse_config
-  end
-  
-  #Install a baseline config file from the template
-  def self.install_config(file=false)
-    #Default the file location
-    file = "/etc/rmybackup.conf" if not file
-    file = File.expand_path(file)
-
-    if File.exists? file
-      puts "The file already exists, do you want to overwrite it? (Y/Yes):"
-      STDOUT.flush
-      answer = gets.chomp
-      exit 1 unless answer.upcase == "Y" or answer.upcase == "YES"
+module RMyBackup
+  class Base
+    def initialize(config_file)
+      @config_file = config_file
+      #if the config file passes, run the backups
+      run_backups if parse_config
     end
-
-    config_file = <<CONFIG_FILE
-#Configuration File in YAML format
-
-#Backup Directory
-backup_dir: /Users/bshelton/mysql_tmp/
-
-#Databases to backup
-#This is an array of databases that are to be backed ups
-# i.e.
-# databases: [
-#   test,
-#   mysql,
-#   important_db
-# ]
-
-#Databases to back up
-databases: [
-  test
-]
-
-#Command Locations
-#You can override where to find the needed system commands, default locations are prefixed with /usr/bin/
-
-#mysqldump_command: /usr/local/mysql/bin/mysqldump
-#gzip_command: /usr/bin/gzip
-#find_command: /usr/bin/find
-CONFIG_FILE
-
-    begin
-      File.open(file,'w') {|f| f.write(config_file) }
-      puts "Installing #{file}"
-    rescue Errno::EACCES
-      puts "Can't write to - #{file}"
-    end
-    exit 0
-  end
   
-  private
-  #Run the backups, we should have proper validation at this point
-  def run_backups
-    #Grab some config variables
-    mysql_dump = @config['mysqldump_command']
-    backup_dir = @config['backup_dir']
-    gzip = @config['gzip_command']
-    date_string = Time.now.strftime "%m_%d_%Y_%H_%M"
+    private
+    #Run the backups, we should have proper validation at this point
+    def run_backups
+      #Grab some config variables
+      mysql_dump = @config['mysqldump_command']
+      backup_dir = @config['backup_dir']
+      gzip = @config['gzip_command']
+      date_string = Time.now.strftime "%m_%d_%Y_%H_%M"
 
-    #Cycle through databases to backup
-    @config['databases'].each do |db|
-      puts "Backing up #{db}\n"
-      system "#{mysql_dump} #{db} |#{gzip} > #{backup_dir}/#{db}_#{date_string}.sql.gz"
+      #Cycle through databases to backup
+      @config['databases'].each do |db|
+        puts "Backing up #{db}\n"
+        system "#{mysql_dump} #{db} |#{gzip} > #{backup_dir}/#{db}_#{date_string}.sql.gz"
+      end
     end
-  end
   
-  #Parse the config YAML file
-  def parse_config
-    @config = YAML::load(File.open(@config_file))
+    #Parse the config YAML file
+    def parse_config
+      @config = YAML::load(File.open(@config_file))
 
-    #Initialize error array
-    @error = Array.new 
+      #Initialize error array
+      @error = Array.new 
     
-    #Defaults
-    @config['gzip_command'] = "/usr/bin/gzip" if @config['gzip_command'].nil?
-    @config['mysqldump_command'] = "/usr/bin/mysqldump" if @config['mysqldump_command'].nil?
-    @config['find_command'] = "/usr/bin/find" if @config['find_command'].nil?
+      #Defaults
+      @config['gzip_command'] = "/usr/bin/gzip" if @config['gzip_command'].nil?
+      @config['mysqldump_command'] = "/usr/bin/mysqldump" if @config['mysqldump_command'].nil?
+      @config['find_command'] = "/usr/bin/find" if @config['find_command'].nil?
 
-    #Backup dir validation
-    if not File.directory? @config['backup_dir']
-      @error << "No Such Backup Directory #{@config['backup_dir']}"
-    else
-      @config['backup_dir'] = File.expand_path @config['backup_dir']
-      if not File.writable? @config['backup_dir']
-        @error << "Can't write to the backup directory - #{@config['backup_dir']}"
+      #Backup dir validation
+      if not File.directory? @config['backup_dir']
+        @error << "No Such Backup Directory #{@config['backup_dir']}"
+      else
+        @config['backup_dir'] = File.expand_path @config['backup_dir']
+        if not File.writable? @config['backup_dir']
+          @error << "Can't write to the backup directory - #{@config['backup_dir']}"
+        end
       end
-    end
 
-    #Check Commands
-    @error << "Can't locate find command: #{@config['find_command']}" unless File.exists? @config['find_command']
-    @error << "Can't locate gzip command: #{@config['gzip_command']}" unless File.exists? @config['gzip_command']
-    @error << "Can't locate mysqldump command: #{@config['mysqldump_command']}" unless File.exists? @config['mysqldump_command']
+      #Check Commands
+      @error << "Can't locate find command: #{@config['find_command']}" unless File.exists? @config['find_command']
+      @error << "Can't locate gzip command: #{@config['gzip_command']}" unless File.exists? @config['gzip_command']
+      @error << "Can't locate mysqldump command: #{@config['mysqldump_command']}" unless File.exists? @config['mysqldump_command']
 
-    #See if we've created any errors, if so, display them and exit
-    if @error.empty?
-      return true
-    else
+      #See if we've created any errors, if so, display them and exit
+      if @error.empty?
+        return true
+      else
+        @error.each {|e| puts "#{e}\n" }
+        exit 1
+      end
+    #Rescue anything by displaying errors if we have them and exiting 1
+    rescue
       @error.each {|e| puts "#{e}\n" }
       exit 1
+      return false
     end
-  #Rescue anything by displaying errors if we have them and exiting 1
-  rescue
-    @error.each {|e| puts "#{e}\n" }
-    exit 1
-    return false
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 5
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Bryan Shelton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 -06:00
+date: 2010-05-11 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,9 @@ extra_rdoc_files: []
 files: 
 - lib/rmybackup.rb
 - Readme.md
+- lib/rmybackup/config_file.txt
+- lib/rmybackup/config.rb
+- bin/rmybackup
 has_rdoc: true
 homepage: http://github.com/bshelton229/rmybackup/
 licenses: []
@@ -39,6 +42,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -46,6 +50,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -55,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby Mysql Backup Script