txpadmin 0.0.2 → 0.0.3

data/bin/txpadmin

@@ -11,30 +11,36 @@ include TxpAdmin
 
 options = {}
 
-op = OptionParser.new do |opts|
+op = OptionParser.new() do |opts|
   opts.banner = "Usage: "     
   
-  opts.on("-h", "--help", "Print this message") do |v|
+  opts.on("-h", "--help", "Print this message") do 
     puts opts
     exit 
   end  
   
-  opts.on("-V", "--version", "Print version") do |v|
+  opts.on("-V", "--version", "Print version") do 
     puts "TxpAdmin gem version #{Gem.searcher.find('txp_admin').version.to_s}" 
     exit
   end
   
-  opts.on(nil, "--dbconsole", "Connect to mysql database") do |v|
-    config = TxpAdmin::Config.new.options    
-    password = config[:pass].strip != "" ? " -p#{config[:pass]}" : ""     
-    
-    # FIXME: how do a mysql alias evaluated in exec? 
-    # Example: mysql='mysql --socket=/Applications/xampp/xamppfiles/var/mysql/mysql.sock'    
-    config[:host] = config[:host] == "localhost" ? "127.0.0.1" : config[:host] 
-    
-    commandline = "mysql -u#{config[:user]} #{password} -h#{config[:host]} #{config[:db]}"
-    puts "executing command: #{commandline}"    
-    exec(commandline)
+  opts.on("--backup", "Backup database. Creates a zipped dump in the current directory.") do 
+    TxpAdmin::MysqlConnect.backup
+  end
+  
+  opts.on("--restore FILE_PATH", String, "Restore FILE_PATH dump into database.") do |file_path|    
+    puts "Importing a dump. Enter to continue..."    
+    input = gets("\n").strip 
+    TxpAdmin::MysqlConnect.restore(file_path)
+  end
+  
+  opts.on("--dbconsole", "Connect to mysql database.") do 
+    TxpAdmin::MysqlConnect.console
+    exit
+  end
+  
+  opts.on("--purge-logs", "Remove logs from txplogs.") do 
+    TxpAdmin::MysqlConnect.execute "delete from txp_log" 
     exit
   end
   
@@ -53,11 +59,18 @@ args = ARGV
 args = ["-h"] if ARGV.size == 0 
 
 begin 
-  op.parse(args)
+  op.parse!(args)
 rescue OptionParser::AmbiguousOption => e 
-  op.parse(["-h"])
+  op.parse!(["-h"])
 rescue TxpAdmin::ConfigNotFound => e 
   puts "Config file not found"
+rescue TxpAdmin::RestoreFileNotFound => e 
+  puts "Restore file not found" 
+rescue OptionParser::MissingArgument => e 
+  puts "Missing argument"
+  op.parse!(["-h"])
+rescue Interrupt => e 
+  puts "Interrupted"
 end
 
 

data/lib/txp_admin.rb

@@ -3,7 +3,60 @@ module TxpAdmin
   class ConfigNotFound < Exception
   end
   
-  
+  class RestoreFileNotFound < Exception 
+  end
+    
+  class MysqlConnect 
+    
+    @@config = nil 
+        
+    def self.config 
+      return @@config unless @@config.nil? 
+      @@config = TxpAdmin::Config.new.options       
+      # puts @@config.inspect
+      # FIXME: how do a mysql alias evaluated in exec? 
+      # Example: mysql='mysql --socket=/Applications/xampp/xamppfiles/var/mysql/mysql.sock'    
+      @@config[:host] = @@config[:host] == "localhost" ? "127.0.0.1" : @@config[:host]        
+      @@password = @@config[:pass].strip != "" ? " -p#{@@config[:pass]}" : ""
+      @@config
+    end
+    
+    def self.dump_command
+      c = "mysqldump #{self.command_options}"       
+    end    
+    
+    def self.backup 
+      command = "#{self.dump_command} | gzip -c > txpadmin_backup_#{Time.now.to_i}.dump.gz"
+      puts "executing: #{command}"      
+      exec(command)
+    end
+    
+    def self.restore(filename) 
+      raise RestoreFileNotFound unless File.exists?(filename)      
+      # "Restoring file #{filename}. Continue? [Y/n] "
+      command = "gunzip -c #{filename} | #{self.commandline}"
+      exec(command)
+    end
+    
+    def self.command_options 
+      " -u#{self.config[:user]} #{@@password} -h#{self.config[:host]} #{self.config[:db]}"
+    end
+    
+    def self.commandline 
+      c = "mysql #{self.command_options}"
+    end
+    
+    def self.execute(sql_command)      
+      puts "executing SQL: #{sql_command}"
+      exec("#{commandline} -e \"#{sql_command}\" ")
+    end
+    
+    def self.console       
+      # puts "executing command: #{commandline}"          
+      exec(commandline)
+    end
+    
+  end
   
   class Config 
     
@@ -13,8 +66,7 @@ module TxpAdmin
       @options = self.class.parse_config_file      
     end
 
-    def self.parse_config_file(path=".")      
-    
+    def self.parse_config_file(path=".")          
       config_file = "#{path}/textpattern/config.php"      
       raise TxpAdmin::ConfigNotFound unless File.exists?(config_file)            
       config = `cat #{config_file}`
@@ -22,13 +74,11 @@ module TxpAdmin
       config.gsub!("<?php", "")
       config.gsub!("?>", "")
       config.gsub!("$txpcfg", "txpcfg")
-      eval(config)      
-      
+      eval(config)            
       txpcfg.each do |key,value|
         txpcfg[key.to_sym] = value
       end  
-      
-      
+            
       # puts txpcfg.inspect
       return txpcfg      
     end

data/txpadmin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{txpadmin}
-  s.version = "0.0.2"   
+  s.version = "0.0.3"   
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabrizio Regini"]
   s.date = %q{2009-12-26}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: txpadmin
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Fabrizio Regini