sqlup 0.0.12 → 0.0.13

data/History.txt

@@ -1,3 +1,10 @@
+== 0.0.13 / 2007-07-23
+
+  * Improved handling of command-line options.  You can
+    now put options in your .sqluprc file for any command-line
+    option, including user, pass, and sock (the mysql options)
+   
+
 == 0.0.12 / 2007-07-23
 
 * 1 major enhancement

data/Rakefile

@@ -12,7 +12,7 @@ Hoe.new('sqlup', MysqlBackup::VERSION) do |p|
   p.extra_deps << ['optiflag', '>= 0.6.5']
   p.extra_deps << ['daemons', '>= 1.0.6']
   p.extra_deps << ['aws-s3', '>= 0.3.0']
-  p.extra_deps << 'active_record'
+  p.extra_deps << 'activerecord'
   p.remote_rdoc_dir = ''
 end
 

data/bin/sqlup

@@ -5,7 +5,9 @@ require 'rubygems'
 require 'optiflag'
 require 'pp'
 require 'logger'
-require 'active_record'
+require 'active_record/vendor/mysql'
+require 'ostruct'
+
 require File.dirname(__FILE__) + '/../lib/mysql_backup'
 
 module Example extend OptiFlagSet
@@ -25,56 +27,63 @@ module Example extend OptiFlagSet
   optional_flag "engine", :description => "The storage engine.  The default (and currently the only option) is s3."
   optional_flag "get_directory", :alternate_forms => 'd', :description => "The directory to write files for the get command (defaults to the current directory)"
   optional_flag 'logs_delay', :description => 'The delay (in seconds, as a float) to use for log_daemon.  Defaults to 1.'
+  optional_flag 'config', :description => 'The location of the .sqluprc file to use (instead of ENV[HOME]/.sqluprc)'
+  optional_flag 'user', :description => 'The mysql user'
+  optional_flag 'pass', :description => 'The mysql password'
+  optional_flag 'user', :description => 'The mysql socket'
   optional_switch_flag 'verbose', :alternate_forms => %w(v) do
     description 'Send verbose output'
   end
   and_process!
 end 
 
-flags = ARGV.flags
+flags = OpenStruct.new ARGV.flags
 
-if flags.help?
+if flags.help
   puts File.readlines(File.dirname(__FILE__) + '/../README.txt')
   exit 0
 end
 
-puts "Warning: no -bucket specified" unless flags.bucket?
+puts "Warning: no -bucket specified" unless flags.bucket
 
 if flags.get && !flags.name
   raise RuntimeError, "You must specify the name of a backup (--name)"
 end
 
-if flags.verbose?
+if flags.verbose
   log = Logger.new $stderr
   log.level = Logger::DEBUG
 else
   log = nil
 end
 
+# Read in more flags from the .sqluprc config file
+flags.config ||= (Pathname.new(ENV['HOME'] || '/') + '.sqluprc').cleanpath
+p = Pathname.new flags.config
+if p.readable?
+  keys = YAML::load p.open
+  keys.each_pair do |k,v|
+    flags.send "#{k}=", v
+  end
+else
+  raise RuntimeError, ("Cannot open #{p.to_s}; that file should have two lines, one for access_key_id: yourkey and the other for secret_access_key: yourotherkey")
+end
+
 engine = flags.engine || 's3'
 
 case engine
 when 's3'
   # Read the keys from the $HOME/.sqluprc file
-  args = {:log => log, :bucket => flags.bucket}
-  p = Pathname.new(ENV['HOME']) + '.sqluprc'
-  if p.readable?
-    keys = YAML::load p.open
-    keys.each_pair do |k,v|
-      args[k.to_sym] = v
-    end
-  else
-    raise RuntimeError, ("Cannot open #{p.to_s}; that file should have two lines, one for access_key_id: yourkey and the other for secret_access_key: yourotherkey")
-  end
+  args = {:log => log, :bucket => flags.bucket, :access_key_id => flags.access_key_id, :secret_access_key => flags.secret_access_key}
   engine = MysqlBackup::Storage::S3.new args
   engine.read_existing_objects
 end
-librarian = MysqlBackup::Librarian.new :log => log, :storage => engine, :user => 'root', :bucket => 'banshee', :sock => '/var/lib/mysql/mysql.sock'
+librarian = MysqlBackup::Librarian.new :log => log, :storage => engine, :bucket => flags.bucket, :user => flags.user, :pass => flags.pass, :sock => flags.sock
 
 begin
-  if flags.ls?
+  if flags.ls
     klass = Kernel.const_get flags.backup_type rescue nil
-  klass ||= case flags.backup_type
+    klass ||= case flags.backup_type
     when /log_complete/: MysqlBackup::Librarian::Backup::Log::Complete
     when /log_current/: MysqlBackup::Librarian::Backup::Log::Current
     when /log/: MysqlBackup::Librarian::Backup::Log
@@ -86,25 +95,25 @@ begin
     end
     puts librarian.ls(klass).slice(range).join("\n")
   end
-  if flags.mysqldump?
+  if flags.mysqldump
     librarian.backup_mysqldump
   end
-  if flags.binary?
+  if flags.binary
     librarian.backup_data_files
   end
-  if flags.rm?
+  if flags.rm
     librarian.rm flags.name
   end
-  if flags.logs?
+  if flags.logs
     librarian.backup_binary_logs
   end
-  if flags.get?
+  if flags.get
     librarian.get flags.name, flags.get_directory || '.'
   end
-  if flags.get_logs?
+  if flags.get_logs
     librarian.get_logs flags.get_directory || '.'
   end
-  if flags.log_daemon?
+  if flags.log_daemon
     while true
       librarian.backup_binary_logs
       delay = flags.logs_delay.to_f

data/lib/mysql_backup.rb

@@ -1,10 +1,10 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'rubygems'
-require 'active_record'
+require 'active_record/vendor/mysql'
 require 'mysql_backup/librarian'
 require 'mysql_backup/storage/s3'
 
 module MysqlBackup
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/lib/mysql_backup/librarian.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'active_record/vendor/mysql'
 require 'named_arguments'
 require 'mysql_backup/server'
 require 'mysql_backup/storage/s3'
@@ -170,6 +171,7 @@ class MysqlBackup::Librarian
   end
   
   def create_connection 
+    ENV["MYSQL_UNIX_PORT"] ||= '/var/lib/mysql/mysql.sock'
     @connection ||= Mysql.connect(@host, @user, @pass, @db, @port, @sock, @flag)
   end
 end

data/lib/mysql_backup/librarian/backup.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'named_arguments'
 require 'mysql_backup/entity/identifier'
-require 'active_record'
 
 module MysqlBackup; end
 class MysqlBackup::Librarian; end

data/test/unit/mysql_backup/librarian/librarian_test.rb

@@ -75,9 +75,8 @@ class MysqlBackup::LibrarianTest < Test::Unit::TestCase
   
   def stubbed_librarian
     connection_stub = stub_everything('connection stub')
-    m = MysqlBackup::Librarian.new :bucket => 'foo', :access_key_id => 'key', :secret_access_key => 'secret_key' do |o|
-      o.stubs(:create_connection).returns(connection_stub)
-    end
+    MysqlBackup::Librarian.any_instance.stubs(:create_connection).returns(connection_stub)
+    m = MysqlBackup::Librarian.new :bucket => 'foo', :access_key_id => 'key', :secret_access_key => 'secret_key'
     m.mysql_server.stubs(:show_master_status).returns(:file => 'foo.0001', :position => 10)
     m.mysql_server.stubs(:datadir).returns('/tmp')
     m.mysql_server.stubs(:innodb_data_home_dir).returns('/tmp')

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sqlup
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 date: 2007-07-23 00:00:00 -07:00
 summary: A backup tool for saving MySQL data to Amazon's S3 service
 require_paths: 
@@ -124,7 +124,7 @@ dependencies:
         version: 0.3.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: active_record
+  name: activerecord
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: