mysql_db_tool 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f58a8a6254b856cac959a89c42c2b261f8f2888bb8eb7042b64155c25d67461
-  data.tar.gz: 9e955ad5bb771f353290099daf3b813793bc557c2f72615e39b5a97c8919703e
+  metadata.gz: 246f356370dec4811df1950c8972b0110618d4551bc3776c746efd597413f5b4
+  data.tar.gz: 58e81526ba38e1f9201396d808d5aeb6499bb7f91d479a5e4df8f4110d07652f
 SHA512:
-  metadata.gz: 89ae0acb67eecfc7fc4a7a598ed484edd63adece7f4777f92bf23f36843e522d8f3a69aa942cfe499708324d4ff23b7399982ffb4187b61e9f0185689a064d4c
-  data.tar.gz: 461425b16cf7f41ba6a92d10541adc3cedb42e948bf3e12a5dc247c107930011e2dd5b4d04a74f67e82a83587d7e7ffe1c3ee89b1f2f4cd5fb1dbe2ecfcf3825
+  metadata.gz: 014563a869d15aef0140f1d04580896cb12616efeb5e95435e1c84dc401e2ae538657c853ff63d8376464f2091f14a859ac031e2715799d98875a12e3b067e0b
+  data.tar.gz: 689bc7c215256672151f4b8041303d74570449cdfababbf48025155da23940e242a8697bd877987fb7a7008cc6a7a106cf6bc108ec74c7d452ad4f353759bd43

data/README.md

@@ -77,6 +77,10 @@ gen_create_db_user {user} {password} {db} {host}
 
 ## Installing Ruby
 
+You can use OS default ruby if it is already installed.
+
+Below is additional steps to install or develop with the latest version of Ruby.
+
 Install using `rbenv` on Mac OS X
 
 ```bash
@@ -87,6 +91,3 @@ rbenv global 3.3.0
 ruby -v
 ```
 
-## TODO
-
-* [ ] Add option to get db configuration information from spring cloud config

data/bin/mysql_backup

@@ -9,7 +9,8 @@ options = {
   env: "local",
   id: "0",
   run: false,
-  gzip: true
+  gzip: true,
+  gzip_suffix: ".gz"
 }
 
 # Parse command line arguments
@@ -19,11 +20,16 @@ OptionParser.new do |opts|
   MySQLDBTool.env_opt(options, opts)
   MySQLDBTool.id_opt(options, opts)
   MySQLDBTool.run_opt(options, opts)
+  MySQLDBTool.database_opt(options, opts)
 
   opts.on("-g", "--[no-]gzip", "Enable or disable gzip (default: enabled)") do |gzip|
     options[:gzip] = gzip
   end
 
+  opts.on("-s", "--gzip-suffix SUFFIX", "Set the gzip suffix (default: .gz), some platform requires '.Z'") do |gzip_suffix|
+    options[:gzip_suffix] = gzip_suffix
+  end
+
   opts.on("-h", "--help", "Show this help message") do
     puts opts
     exit

data/bin/mysql_restore

@@ -19,8 +19,9 @@ OptionParser.new do |opts|
   MySQLDBTool.env_opt(options, opts)
   MySQLDBTool.id_opt(options, opts)
   MySQLDBTool.run_opt(options, opts)
+  MySQLDBTool.database_opt(options, opts)
 
-  opts.on("-d", "--[no-]drop-all-tables", "Drop all tables before restoring (default: disabled)") do |drop_all_tables|
+  opts.on("-D", "--[no-]drop-all-tables", "Drop all tables before restoring (default: disabled)") do |drop_all_tables|
     options[:drop_all_tables] = drop_all_tables
   end
 

data/lib/mysql_db_tool/backup.rb

@@ -12,6 +12,8 @@ module MySQLDBTool
       @data_tables = tableConfig[:data_tables]
       @ignore_tables = tableConfig[:ignore_tables]
       @db_info = tableConfig[:db_info]
+      
+      @db_info[:database] = @options[:database] if @options[:database]
     end
 
     def perform
@@ -21,6 +23,7 @@ module MySQLDBTool
       id=@options[:id] || "0"
       isGzip=@options[:gzip]
       limitDays=@options[:limit_days] || 3
+      gzipSuffix = @options[:gzip_suffix] || '.gz'
 
       Array(@db_info[:database]).flat_map.each_with_index do |database, index |
 
@@ -40,9 +43,9 @@ module MySQLDBTool
 
         puts "backupFile=#{backupFile}"
 
-        ignoreTablesOption = @ignore_tables.map { |e| "--ignore-table=#{@db_info[:database]}.#{e}"  }.join(' ')
+        ignoreTablesOption = @ignore_tables.map { |e| "--ignore-table=#{e.include?('.') ? e : "#{database}.#{e}"}" }.join(' ')
 
-        commands.push gzipCommand("mysqldump --no-data #{ignoreTablesOption} #{defaultOptions}", isGzip, "#{backupFile}-schema.sql#{isGzip ? '.gz' : ''}")
+        commands.push gzipCommand("mysqldump --no-data #{ignoreTablesOption} #{defaultOptions}", isGzip, "#{backupFile}-schema.sql", gzipSuffix)
 
         backupTables = []
 
@@ -52,17 +55,17 @@ module MySQLDBTool
             backupTables.push(table[:name])
             next
           else
-            commands.push(gzipCommand("mysqldump --no-create-info #{options} #{where} #{defaultOptions} #{table[:name]}", isGzip, "#{backupFile}-#{table[:name]}.sql#{isGzip ? '.gz' : ''}"))
+            commands.push(gzipCommand("mysqldump --no-create-info #{options} #{where} #{defaultOptions} #{table[:name]}", isGzip, "#{backupFile}-#{table[:name]}.sql", gzipSuffix))
           end
         }
 
-        commands.push(gzipCommand("mysqldump --no-create-info #{options} #{defaultOptions} #{backupTables.join(' ')}", isGzip, "#{backupFile}-all-other-tables.sql#{isGzip ? '.gz' : ''}"))
+        commands.push(gzipCommand("mysqldump --no-create-info #{ignoreTablesOption} #{options} #{defaultOptions} #{backupTables.join(' ')}", isGzip, "#{backupFile}-all-other-tables.sql", gzipSuffix))
         commands
       end
     end
 
-    def gzipCommand(command, isGzip, file)
-      "#{command} #{isGzip ? '| gzip ' : ''} > #{file}"
+    def gzipCommand(command, isGzip, file, gzipSuffix = '.gz')
+      "#{command} #{isGzip ? '| gzip ' : ''} > #{file}#{isGzip ? gzipSuffix : ''}"
     end
 
   end

data/lib/mysql_db_tool/restore.rb

@@ -10,6 +10,8 @@ module MySQLDBTool
       @data_tables = tableConfig[:data_tables]
       @ignore_tables = tableConfig[:ignore_tables]
       @db_info = tableConfig[:db_info]
+
+      @db_info[:database] = @options[:database] if @options[:database]
     end
 
     def perform
@@ -46,10 +48,10 @@ module MySQLDBTool
 
       gsubstring = sameDb ? "" : databaseMap.map { |k,v| ".gsub(/#{k}/, \"#{v}\")" }.join("")
 
-      commands = []
-
       Dir.entries(backupDir).reject {|f| File.directory? f}.sort.flat_map do |f|
 
+        commands = []
+
         index, origin_database = split_integer_and_string(f)
         database = get_element_or_last(databases, index)
 
@@ -74,10 +76,10 @@ module MySQLDBTool
     def restore_each(commands, file, defaultOptions, gsubstring)
       command = ""
       replacing = " | ruby -pe '$_=$_#{gsubstring}'" unless gsubstring.empty?
-      if file.end_with? ".sql.gz"
-        command = "zcat #{file} #{replacing} | mysql #{defaultOptions}"
-      elsif file.end_with? ".sql"
+      if file.end_with? ".sql"
         command = "cat #{file} #{replacing} | mysql #{defaultOptions}"
+      elsif gzip_file?(file)
+        command = "zcat #{file} #{replacing} | mysql #{defaultOptions}"
       else
         puts "not supported file #{file}"
       end
@@ -96,6 +98,14 @@ module MySQLDBTool
       index < array.length ? array[index] : array.last
     end
 
+    def gzip_file?(file_path)
+      magic_number = "\x1F\x8B".force_encoding('ASCII-8BIT')
+
+      File.open(file_path, "rb") do |file|
+        file.read(2) == magic_number
+      end
+    end
+
   end
 end
 

data/lib/mysql_db_tool/version.rb

@@ -1,5 +1,5 @@
 # lib/mysql_db_tool/version.rb
 
 module MySQLDBTool
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/mysql_db_tool.rb

@@ -32,6 +32,12 @@ module MySQLDBTool
     end
   end
 
+  def self.database_opt(options, opts)
+    opts.on("-d", "--database DATABASE", "Override option for dbInfo.database configuration") do |database|
+      options[:database] = database.split(',')
+    end
+  end
+
   # You might want to add methods to easily access your main functionalities
   def self.backup(options = {})
     commands = Backup.new(options).perform

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_db_tool
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Soonoh Jung
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler