mysql_truck 0.5.5 → 0.5.6

data/lib/mysql_truck/loader.rb

@@ -27,61 +27,75 @@ module MysqlTruck
       @time = Time.new(*backup_date_str.split("-"))
       initialize_directories
 
-      puts "Download & gunzip backups"
-      puts "-------------------"
+      # puts "Download & gunzip backups"
+      # puts "-------------------"
 
 
-      @bucket.keys(:prefix => s3_path).each do |key|
-        puts "\n#{key}"
-        next unless (filename = download_file(key))
+      # @bucket.keys(:prefix => s3_path).each do |key|
+      #   next unless (filename = download_file(key))
 
-        # gunzip file
-        if tmp_path.join(filename).exist?
-          print " - Inflating #{filename} ... "
-          time = benchmark { `gunzip -f #{tmp_path.join(filename)}` }
-          print "complete (#{formatted_time time}).\n"
-        end
-      end
+      #   # gunzip file
+      #   if tmp_path.join(filename).exist?
+      #     print " - Inflating #{filename} ... "
+      #     time = benchmark { `gunzip -f #{tmp_path.join(filename)}` }
+      #     print "complete (#{formatted_time time}).\n"
+      #   end
+      # end
 
       # Load data
       puts "\nLoading schema and data by table"
       puts "--------------------------------"
-      
-      files = Dir["#{tmp_path}/*.no_index.sql"]
-      total = files.size
+
+      files = Dir["#{tmp_path}/*"]
+      tables = files.map { |f| File.basename(f, File.extname(f)).to_s }.uniq
+      total = tables.size
       count = 0
 
-      # Find all .no_index.sql files and process
-      files.sort.each do |file|
+      # Find all table names and process
+      tables.sort.each do |table|
         count += 1
-        table = File.basename(file, ".no_index.sql")
-
         puts "\nProcessing #{table} (#{count}/#{total})"
 
-        schema_file   = Pathname.new(file)
-        index_file    = tmp_path.join("#{table}.indices.sql")
-        data_file     = tmp_path.join("#{table}.data.sql")
-        csv_data_file = tmp_path.join("#{table}.csv")
+        old_schema_file = tmp_path.join("#{table}.sql")
+        schema_file     = tmp_path.join("#{table}.no_index.sql")
+        index_file      = tmp_path.join("#{table}.indices.sql")
+        data_file       = tmp_path.join("#{table}.data.sql")
+        csv_data_file   = tmp_path.join("#{table}.csv")
+
+
+        if schema_file.exist?
+          print " - Loading schema: #{File.basename(schema_file)} ... "
+          execute_sql_file(table, backup_date_str, schema_file)
+          schema_file.delete
+
+        elsif old_schema_file.exist?
+          print " - Loading schema: #{File.basename(old_schema_file)} ... "
+          execute_sql_file(table, backup_date_str, old_schema_file)
+          old_schema_file.delete
+
+        else
+          puts "ERROR: no schema file!"
+          next
+        end
 
-        print " - Loading schema for #{table} ... "
-        execute_sql_file(table, backup_date_str, schema_file)
-        schema_file.delete if schema_file.exist?
 
         if data_file.exist?
-          print " - Importing #{schema_file.basename(".data.sql")} ... "
+          print " - Importing #{File.basename(data_file)} ... "
           execute_sql_file(table, backup_date_str, data_file)
+          data_file.delete
+
         elsif csv_data_file.exist?
-          print " - Importing #{schema_file.basename(".csv")} ... "
-          import_csv_file(table, backup_date_str, csv_data_file)
+          print " - Importing #{File.basename(csv_data_file)} ... "
+          csv_data_file = import_csv_file(table, backup_date_str, csv_data_file)
+          File.delete(csv_data_file)
         end
 
-        data_file.delete   if data_file.exist?
-
         if index_file.exist?
-          print " - Adding indices for #{schema_file.basename(".no_index.sql")} ... "
+          print " - Adding indices: #{File.basename(index_file)} ... "
           execute_sql_file(table, backup_date_str, index_file)
+          index_file.delete
         end
-        index_file.delete  if index_file.exist?
+        
       end
 
       puts "Backup loaded."
@@ -120,16 +134,19 @@ module MysqlTruck
       end
 
       print "complete (#{formatted_time time}).\n"
+
+      file_path
     end
 
     def download_file(key)
       filename = File.basename(key.name)
 
       unless should_download_file?(filename)
-        puts " [ SKIP ]"
         return
       end
 
+      puts "\n#{key}"
+
       file = tmp_path.join(filename)
       unzipped_file = tmp_path.join(file.basename(".gz"))
       if !smartly? || (smartly? && !unzipped_file.exist?)

data/lib/mysql_truck/version.rb

@@ -1,3 +1,3 @@
 module MysqlTruck
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql_truck
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws