mysql_truck 0.0.5 → 0.0.6

data/bin/mysql_truck

@@ -49,7 +49,7 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on("--bucket-dir BUCKET_DIR", "S3 bucket dir [defaults to database name]") do |dir|
-    options[:bucket_dir] = key
+    options[:bucket_dir] = dir
   end
 
   opts.on("--dump-dir DIR", "Directory where the mysql dumps will go before upload/download.", "Defaults to /tmp") do |dir|

data/lib/mysql_truck.rb

@@ -178,15 +178,7 @@ module MysqlTruck
 
       puts "Downloading backups ..."
       @bucket.keys(:prefix => prefix).each do |key|
-        filename = File.basename(key.name)
-
-        next if filename.match(/\.csv\.gz$/) && skip_tables.include?(File.basename(filename, ".csv.gz"))
-
-        print " - Downloading #{filename} ... "
-        File.open(tmp_path.join(filename), "wb") do |f|
-          f.write key.get
-        end
-        print "complete.\n"
+        next unless (filename = download_file(key))
 
         # gunzip file
         print " -- Inflating #{filename} ... "
@@ -214,10 +206,33 @@ module MysqlTruck
       end
 
       puts "Backup loaded."
+
+    rescue Exception => e
+      puts e.message
+      puts e.backtrace.join("\n")
     ensure
       remove_directories
     end
 
+    def download_file(key)
+      filename = File.basename(key.name)
+      print " - Downloading #{filename} ... "
+
+      if filename.match(/\.csv\.gz$/) && skip_tables.include?(File.basename(filename, ".csv.gz"))
+        puts " [ Skipping ]"
+        return false
+      end
+
+      File.open(tmp_path.join(filename), "wb") do |f|
+        @bucket.s3.interface.get(@bucket.name, key.name) do |chunk|
+          f.write chunk
+        end
+      end
+
+      print "complete.\n"
+      filename
+    end
+
     # Get a list of backups stored on S3.
     #
     # Returns an array of s3 paths that look like:

data/lib/mysql_truck/version.rb

@@ -1,3 +1,3 @@
 module MysqlTruck
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

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