txpadmin 0.0.3 → 0.0.4

data/bin/txpadmin

@@ -66,6 +66,9 @@ rescue TxpAdmin::ConfigNotFound => e
   puts "Config file not found"
 rescue TxpAdmin::RestoreFileNotFound => e 
   puts "Restore file not found" 
+rescue OptionParser::InvalidOption => e 
+  puts "Invalid argument"
+  op.parse!(["-h"])
 rescue OptionParser::MissingArgument => e 
   puts "Missing argument"
   op.parse!(["-h"])

data/lib/txp_admin.rb

@@ -33,7 +33,6 @@ module TxpAdmin
     
     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
@@ -69,12 +68,17 @@ module TxpAdmin
     def self.parse_config_file(path=".")          
       config_file = "#{path}/textpattern/config.php"      
       raise TxpAdmin::ConfigNotFound unless File.exists?(config_file)            
-      config = `cat #{config_file}`
+      
+      config_lines = File.readlines(config_file)
+      config_to_eval = String.new 
+      
+      config_lines.each do |line|
+         config_to_eval << line if (line.include? "$txpcfg" and !line.include? "define")
+      end
+            
+      config_to_eval.gsub!("$txpcfg", "txpcfg") 
       txpcfg = {}
-      config.gsub!("<?php", "")
-      config.gsub!("?>", "")
-      config.gsub!("$txpcfg", "txpcfg")
-      eval(config)            
+      eval(config_to_eval)            
       txpcfg.each do |key,value|
         txpcfg[key.to_sym] = value
       end  

data/txpadmin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{txpadmin}
-  s.version = "0.0.3"   
+  s.version = "0.0.4"   
   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.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Fabrizio Regini