mysql_truck 0.0.2 → 0.0.3

data/bin/mysql_truck

@@ -44,6 +44,14 @@ parser = OptionParser.new do |opts|
     options[:s3_secret_access_key] = key
   end
 
+  opts.on("-b", "--s3-bucket BUCKET", "S3 bucket") do |bucket|
+    options[:bucket] = bucket
+  end
+
+  opts.on("--bucket-dir BUCKET_DIR", "S3 bucket dir [defaults to database name]") do |dir|
+    options[:bucket_dir] = key
+  end
+
   opts.on("-t", "--skip-tables TABLES",
           "List of tables to skip separated by commas.") do |tables|
     options[:skip_tables] = tables.split(",")
@@ -69,7 +77,7 @@ begin
 
   missing_opts = []
   [ :s3_access_key, :s3_secret_access_key,
-    :host, :username, :database
+    :host, :username, :database, :bucket
   ].each do |opt|
     missing_opts << opt unless options.include?(opt)
   end

data/lib/mysql_truck/version.rb

@@ -1,3 +1,3 @@
 module MysqlTruck
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/mysql_truck.rb

@@ -33,7 +33,7 @@ module MysqlTruck
       @s3 = RightAws::S3.new(
         config[:s3_access_key],
         config[:s3_secret_access_key])
-      @bucket = @s3.bucket("8tr.db_backups")
+      @bucket = @s3.bucket(config[:bucket])
     end
 
     def db_connection_options
@@ -48,15 +48,32 @@ module MysqlTruck
       " --fields-enclosed-by=\\\" --fields-terminated-by=, "
     end
 
+    def initialize_directories
+      mkdir_p base_path
+      mkdir_p tmp_path
+      chmod 0777, tmp_path
+    end
+
+    def remove_directories
+      rm_r tmp_path, :force => true
+    end
+
     def tmp_path
-      unless @tmp_path
-        @tmp_path = config[:tmp_dir] || Pathname.new("/data/s3backup")
-        @tmp_path = @tmp_path.join(@time.to_i.to_s) if @time # Only set with the Dumper class
-      end
+      raise "@time not initialized yet" unless @time
+      base_path.join(@time.strftime("%Y-%m-%d-%H-%M"))
+    end
 
-      @tmp_path
+    def base_path
+      if config[:tmp_dir]
+        config[:tmp_dir].is_a?(Pathname) ? config[:tmp_dir] : Pathname.new(config[:tmp_dir])
+      else
+        Pathname.new("/data/mysqltruck")
+      end
     end
 
+    def bucket_dir
+      "mysql/#{config[:bucket_dir] || config[:database]}/"
+    end
   end
 
   class Dumper
@@ -65,7 +82,7 @@ module MysqlTruck
 
     def initialize(config)
       @config = config
-      @time = Time.now
+      @time = Time.now # Sets the directory for dump
 
       initialize_s3
       initialize_directories
@@ -76,7 +93,7 @@ module MysqlTruck
       upload
 
     ensure
-      # rm_r tmp_path, :force => true
+      remove_directories
     end
 
     def dump_data
@@ -92,6 +109,7 @@ module MysqlTruck
         puts cmd
         `#{cmd}`
 
+        # `mysqldump` creates files with .txt extensions, so we rename it.
         path, file = csv_file.split
         csv_file = path.join("#{file.basename(".txt")}.csv")
         mv path.join(file), csv_file
@@ -115,9 +133,6 @@ module MysqlTruck
 
     private
 
-    def initialize_directories
-      mkdir_p tmp_path
-    end
 
     def upload_file(local_file)
       path = Pathname.new(local_file)
@@ -137,7 +152,7 @@ module MysqlTruck
     end
 
     def bucket_path
-      @bucket_path ||= Pathname.new("mysql").join(@time.strftime("%Y-%m-%d-%H-%M"))
+      @bucket_path ||= Pathname.new(bucket_dir).join(@time.strftime("%Y-%m-%d-%H-%M"))
     end
   end # class Dumper
 
@@ -158,8 +173,9 @@ module MysqlTruck
     def load_latest
       prefix = backups.first
 
-      tmp_dir = tmp_path.join(prefix.split("/").last)
-      mkdir_p tmp_dir # Creates a directory for day of the backup downloaded
+      # Set directory where backup is downloaded to
+      @time = Time.new(*prefix.split("/").last.split("-"))
+      initialize_directories
 
       puts "Downloading backups ..."
       @bucket.keys(:prefix => prefix).each do |key|
@@ -168,20 +184,20 @@ module MysqlTruck
         next if filename.match(/\.csv\.gz$/) && skip_tables.include?(File.basename(filename, ".csv.gz"))
 
         print " - Downloading #{filename} ... "
-        File.open(tmp_dir.join(filename), "wb") do |f|
+        File.open(tmp_path.join(filename), "wb") do |f|
           f.write key.get
         end
         print "complete.\n"
 
         # gunzip file
         print " -- Inflating #{filename} ... "
-        `gunzip #{tmp_dir.join(filename)}`
+        `gunzip #{tmp_path.join(filename)}`
         print "complete.\n"
       end
 
       # Load schemas
       puts "Loading schema."
-      cmd = "cat #{tmp_dir}/*.sql | "
+      cmd = "cat #{tmp_path}/*.sql | "
       cmd += "mysql #{db_connection_options}"
       puts cmd
       `#{cmd}`
@@ -191,7 +207,7 @@ module MysqlTruck
       puts "Loading data."
       cmd = "mysqlimport #{db_connection_options}"
       cmd += csv_options
-      Dir["#{tmp_dir}/*.csv"].each do |table|
+      Dir["#{tmp_path}/*.csv"].each do |table|
         print " - Importing #{File.basename(table, ".csv")} ... "
         puts cmd + " " + table
         `#{cmd} #{table}`
@@ -200,7 +216,7 @@ module MysqlTruck
 
       puts "Backup loaded."
     ensure
-      rm_r tmp_dir, :force => true
+      # remove_directories
     end
 
     # Get a list of backups stored on S3.
@@ -215,7 +231,7 @@ module MysqlTruck
         @backups = []
         # Backups are stored in the mysql/ directory
         @bucket.s3.interface.incrementally_list_bucket(@bucket.name, {
-          :prefix => "mysql/", :delimiter => "/"
+          :prefix => "#{bucket_dir}", :delimiter => "/"
         }) do |item|
           @backups += item[:common_prefixes]
         end
@@ -232,8 +248,5 @@ module MysqlTruck
       @tables
     end
 
-    def initialize_directories
-      mkdir_p tmp_dir
-    end
   end # class Loader
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql_truck
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000 -07:00
+date: 2011-09-16 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws
-  requirement: &2159027440 !ruby/object:Gem::Requirement
+  requirement: &2156700300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159027440
+  version_requirements: *2156700300
 description: Mysql database backup tool. Dumps/Loads to/from S3.
 email:
 - peter@paydrotalks.com