knjrbfw 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2011-11-15}
+  s.date = %q{2012-02-21}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
     "lib/knj/autoload/gd2.rb",
     "lib/knj/autoload/gettext.rb",
     "lib/knj/autoload/gtk2.rb",
-    "lib/knj/autoload/json_autoload.rb",
+    "lib/knj/autoload/json.rb",
     "lib/knj/autoload/magick.rb",
     "lib/knj/autoload/mysql.rb",
     "lib/knj/autoload/parsedate.rb",
@@ -49,15 +49,18 @@ Gem::Specification.new do |s|
     "lib/knj/autoload/soap.rb",
     "lib/knj/autoload/sqlite3.rb",
     "lib/knj/autoload/tmail.rb",
-    "lib/knj/autoload/twitter.rb",
     "lib/knj/autoload/xmlsimple.rb",
     "lib/knj/autoload/zip.rb",
     "lib/knj/cmd_gen.rb",
+    "lib/knj/cmd_parser.rb",
     "lib/knj/compiler.rb",
     "lib/knj/cpufreq.rb",
+    "lib/knj/csv.rb",
     "lib/knj/datarow.rb",
+    "lib/knj/datarow_custom.rb",
     "lib/knj/datestamp.rb",
     "lib/knj/datet.rb",
+    "lib/knj/db.rb",
     "lib/knj/degulesider.rb",
     "lib/knj/erb/apache_knjerb.conf",
     "lib/knj/erb/cache/README",
@@ -74,7 +77,6 @@ Gem::Specification.new do |s|
     "lib/knj/event_filemod.rb",
     "lib/knj/event_handler.rb",
     "lib/knj/exchangerates.rb",
-    "lib/knj/ext/webrick.rb",
     "lib/knj/facebook_connect.rb",
     "lib/knj/filesystem.rb",
     "lib/knj/fs/drivers/filesystem.rb",
@@ -94,6 +96,7 @@ Gem::Specification.new do |s|
     "lib/knj/http2.rb",
     "lib/knj/image.rb",
     "lib/knj/includes/appserver_cli.rb",
+    "lib/knj/includes/require_info.rb",
     "lib/knj/ip2location.rb",
     "lib/knj/ironruby-gtk2/button.rb",
     "lib/knj/ironruby-gtk2/dialog.rb",
@@ -135,7 +138,6 @@ Gem::Specification.new do |s|
     "lib/knj/jruby-gtk2/dialog.rb",
     "lib/knj/jruby-gtk2/eventbutton.rb",
     "lib/knj/jruby-gtk2/gladexml.rb",
-    "lib/knj/jruby-gtk2/gtk-4.0.jar",
     "lib/knj/jruby-gtk2/gtk2.rb",
     "lib/knj/jruby-gtk2/hbox.rb",
     "lib/knj/jruby-gtk2/iconsize.rb",
@@ -169,8 +171,7 @@ Gem::Specification.new do |s|
     "lib/knj/knjdb/libknjdb_java_sqlite3.rb",
     "lib/knj/knjdb/libknjdb_row.rb",
     "lib/knj/knjdb/libknjdb_sqlite3_ironruby.rb",
-    "lib/knj/knjdb/mysql-connector-java-5.1.13-bin.jar",
-    "lib/knj/knjdb/sqlitejdbc-v056.jar",
+    "lib/knj/knjdb/revision.rb",
     "lib/knj/libqt.rb",
     "lib/knj/libqt_window.rb",
     "lib/knj/locale_strings.rb",
@@ -183,6 +184,7 @@ Gem::Specification.new do |s|
     "lib/knj/notify.rb",
     "lib/knj/nvidia_settings.rb",
     "lib/knj/objects.rb",
+    "lib/knj/objects/objects_sqlhelper.rb",
     "lib/knj/opts.rb",
     "lib/knj/os.rb",
     "lib/knj/php.rb",
@@ -193,26 +195,35 @@ Gem::Specification.new do |s|
     "lib/knj/php_parser/tests/test_function.php",
     "lib/knj/php_parser/tests/test_function_run.rb",
     "lib/knj/power_manager.rb",
+    "lib/knj/process.rb",
+    "lib/knj/process_meta.rb",
     "lib/knj/rand.rb",
     "lib/knj/retry.rb",
+    "lib/knj/rhodes/delegate.rb",
     "lib/knj/rhodes/mutex.rb",
     "lib/knj/rhodes/rhodes.js",
     "lib/knj/rhodes/rhodes.rb",
+    "lib/knj/rhodes/weakref.rb",
     "lib/knj/rsvgbin.rb",
     "lib/knj/scripts/degulesider.rb",
     "lib/knj/scripts/filesearch.rb",
     "lib/knj/scripts/ip2location.rb",
     "lib/knj/scripts/keepalive.rb",
+    "lib/knj/scripts/php_to_rb_helper.rb",
+    "lib/knj/scripts/process_meta_exec.rb",
     "lib/knj/scripts/svn_merge.rb",
     "lib/knj/scripts/upgrade_knjrbfw_checker.rb",
     "lib/knj/sms.rb",
+    "lib/knj/sshrobot.rb",
     "lib/knj/sshrobot/sshrobot.rb",
     "lib/knj/strings.rb",
     "lib/knj/sysuser.rb",
+    "lib/knj/table_writer.rb",
     "lib/knj/tests/compiler/compiler_test.rb",
     "lib/knj/tests/compiler/compiler_test_file.rb",
     "lib/knj/tests/test_degulesider.rb",
     "lib/knj/tests/test_http2.rb",
+    "lib/knj/tests/test_http2_proxy.rb",
     "lib/knj/tests/test_mount.rb",
     "lib/knj/tests/test_retry.rb",
     "lib/knj/thread.rb",
@@ -226,12 +237,22 @@ Gem::Specification.new do |s|
     "lib/knj/win.rb",
     "lib/knj/win_registry.rb",
     "lib/knj/win_tightvnc.rb",
+    "lib/knj/wref.rb",
     "lib/knj/x11vnc.rb",
     "lib/knj/youtube.rb",
     "lib/knjrbfw.rb",
     "spec/amixer_spec.rb",
+    "spec/cmd_parser_spec.rb",
+    "spec/db_spec.rb",
+    "spec/db_spec_encoding_test_file.txt",
+    "spec/http2_spec.rb",
     "spec/knjrbfw_spec.rb",
+    "spec/php_spec.rb",
+    "spec/process_meta_spec.rb",
+    "spec/process_spec.rb",
     "spec/spec_helper.rb",
+    "spec/strings_spec.rb",
+    "spec/web_spec.rb",
     "testfiles/image.jpg"
   ]
   s.homepage = %q{http://github.com/kaspernj/knjrbfw}

data/lib/knj/arrayext.rb

@@ -1,166 +1,219 @@
 module Knj::ArrayExt
-	def self.join(args = {}, key = nil, sep = nil)
-		if args.is_a?(Array) and sep
-			args = {
-				:arr => args,
-				:sep => sep,
-				:key => key
-			}
-		end
-		
-		raise "No seperator given." if !args[:sep]
-		
-		str = ""
-		first = true
-		
-		args[:arr].each do |value|
-			if first
-				first = false
-			else
-				str += args[:sep]
-			end
-			
-			value = value[key] if args[:key]
-			value = value if !args[:key]
-			
-			if args[:callback]
+  def self.join(args = {}, key = nil, sep = nil)
+    if args.is_a?(Array) and sep
+      args = {
+        :arr => args,
+        :sep => sep,
+        :key => key
+      }
+    end
+    
+    raise "No seperator given." if !args[:sep]
+    
+    str = ""
+    first = true
+    
+    Knj::Php.foreach(args[:arr]) do |key, value|
+      if first
+        first = false
+      else
+        str << args[:sep]
+      end
+      
+      if args[:key]
+        value = key
+      else
+        value = value
+      end
+      
+      if args[:callback]
         if args[:callback].is_a?(Proc) or args[:callback].is_a?(Method)
           value = args[:callback].call(value)
         else
           value = Knj::Php.call_user_func(args[:callback], value) if args[:callback]
         end
       end
-			
-			raise "Callback returned nothing." if args[:callback] and !value
-			
-			str += args[:surr] if args[:surr]
-			str += value.to_s
-			str += args[:surr] if args[:surr]
-		end
-		
-		return str
-	end
-	
-	def self.hash(arr)
-		ret = {}
-		arr.each do |item|
-			ret[ret.length.to_s] = item
-		end
-		
-		return ret
-	end
-	
-	#Converts all keys in the given hash to symbols.
-	def self.hash_sym(hash)
-		raise "Invalid argument: #{hash.class.name}" if !hash or !hash.respond_to?(:each)
-		
-		adds = {}
-		hash.each do |key, value|
-			if !key.is_a?(Symbol)
-				adds[key.to_sym] = value
-				hash.delete(key)
-			end
-		end
-		
-		adds.each do |key, value|
-			hash[key] = value
-		end
-		
-		return hash
-	end
-	
-	def self.dict(arr)
-		ret = Dictionary.new
-		arr.each do |item|
-			ret[ret.length.to_s] = item
-		end
-		
-		return ret
-	end
-	
-	#Returns a hash based on the keys and values of a hash.
-	def self.hash_md5(hash)
-		combined_val = ""
-		hash.each do |key, val|
-			if combined_val.length > 0
-				combined_val += ";"
-			end
-			
-			combined_val += "#{key}:#{val}"
-		end
-		
-		return Digest::MD5.hexdigest(combined_val)
-	end
-	
-	#Compares the keys and values of two hashes and returns true if they are different.
-	def self.hash_diff?(h1, h2, args = {})
-		if !args.key?("h1_to_h2") or args["h1_to_h2"]
-			h1.each do |key, val|
-				return true if !h2.key?(key)
-				
-				hash_val = h2[key].to_s
-				hash_val = hash_val.force_encoding("UTF-8") if hash_val.respond_to?(:force_encoding)
-				
-				val = val.to_s
-				val = val.force_encoding("UTF-8") if val.respond_to?(:force_encoding)
-				
-				return true if hash_val != val
-			end
-		end
-		
-		if !args.key?("h2_to_h1") or args["h2_to_h1"]
-			h2.each do |key, val|
-				return true if !h1.key?(key)
-				
-				hash_val = h1[key].to_s
-				hash_val = hash_val.force_encoding("UTF-8") if hash_val.respond_to?(:force_encoding)
-				
-				val = val.to_s
-				val = val.force_encoding("UTF-8") if val.respond_to?(:force_encoding)
-				
-				return true if hash_val != val
-			end
-		end
-		
-		return false
-	end
-	
-	#Returns a hash based on the string-keys in a hash.
-	def self.hash_keys_hash(hash)
-		hashes = []
-		hash.keys.sort.each do |key|
-			hashes << Digest::MD5.hexdigest(key.to_s)
-		end
-		
-		return Digest::MD5.hexdigest(hashes.join("_"))
-	end
-	
-	#Returns hash based on the string-values in a hash.
-	def self.hash_values_hash(hash)
-		hashes = []
-		hash.keys.sort.each do |key|
-			hashes << Digest::MD5.hexdigest(hash[key].to_s)
-		end
-		
-		return Digest::MD5.hexdigest(hashes.join("_"))
-	end
-	
-	#Returns a hash based on the string-values of an array.
-	def self.array_hash(arr)
-		hashes = []
-		arr.each do |ele|
-			hashes << Digest::MD5.hexdigest(ele.to_s)
-		end
-		
-		return Digest::MD5.hexdigest(hashes.join("_"))
-	end
-	
-	#Validates a hash of data.
-	def self.validate_hash(h, args)
+      
+      raise "Callback returned nothing." if args[:callback] and !value
+      
+      str << args[:surr] if args[:surr]
+      str << value.to_s
+      str << args[:surr] if args[:surr]
+    end
+    
+    return str
+  end
+  
+  #Converts an array to a hash with the index a string-numbers.
+  def self.array_to_hash(arr)
+    ret = {}
+    arr.each do |item|
+      ret[ret.length.to_s] = item
+    end
+    
+    return ret
+  end
+  
+  #Returns true if all keys in a hash are numeric objects.
+  def self.hash_numeric_keys?(hash)
+    all_num = true
+    hash.each do |key, val|
+      if !Knj::Php.is_numeric(key)
+        all_num = false
+        break
+      end
+    end
+    
+    return all_num
+  end
+  
+  #Converts all keys in the given hash to symbols.
+  def self.hash_sym(hash_given)
+    raise "Invalid argument-class: '#{hash_given.class.name}'." if !hash_given or !hash_given.respond_to?(:each)
+    
+    adds = {}
+    hash_given.each do |key, value|
+      if !key.is_a?(Symbol)
+        adds[key.to_sym] = value
+        hash_given.delete(key)
+      end
+    end
+    
+    adds.each do |key, value|
+      hash_given[key] = value
+    end
+    
+    return hash_given
+  end
+  
+  def self.dict(arr)
+    ret = Dictionary.new
+    arr.each do |item|
+      ret[ret.length.to_s] = item
+    end
+    
+    return ret
+  end
+  
+  #Returns a hash based on the keys and values of a hash.
+  def self.hash_md5(hash)
+    combined_val = ""
+    hash.each do |key, val|
+      if combined_val.length > 0
+        combined_val << ";"
+      end
+      
+      combined_val << "#{key}:#{val}"
+    end
+    
+    return Digest::MD5.hexdigest(combined_val)
+  end
+  
+  #Compares the keys and values of two hashes and returns true if they are different.
+  def self.hash_diff?(h1, h2, args = {})
+    if !args.key?("h1_to_h2") or args["h1_to_h2"]
+      h1.each do |key, val|
+        return true if !h2.key?(key)
+        
+        hash_val = h2[key].to_s
+        hash_val = hash_val.force_encoding("UTF-8") if hash_val.respond_to?(:force_encoding)
+        
+        val = val.to_s
+        val = val.force_encoding("UTF-8") if val.respond_to?(:force_encoding)
+        
+        return true if hash_val != val
+      end
+    end
+    
+    if !args.key?("h2_to_h1") or args["h2_to_h1"]
+      h2.each do |key, val|
+        return true if !h1.key?(key)
+        
+        hash_val = h1[key].to_s
+        hash_val = hash_val.force_encoding("UTF-8") if hash_val.respond_to?(:force_encoding)
+        
+        val = val.to_s
+        val = val.force_encoding("UTF-8") if val.respond_to?(:force_encoding)
+        
+        return true if hash_val != val
+      end
+    end
+    
+    return false
+  end
+  
+  #Returns a hash based on the string-keys in a hash.
+  def self.hash_keys_hash(hash)
+    hashes = []
+    hash.keys.sort.each do |key|
+      hashes << Digest::MD5.hexdigest(key.to_s)
+    end
+    
+    return Digest::MD5.hexdigest(hashes.join("_"))
+  end
+  
+  #Returns hash based on the string-values in a hash.
+  def self.hash_values_hash(hash)
+    hashes = []
+    hash.keys.sort.each do |key|
+      hashes << Digest::MD5.hexdigest(hash[key].to_s)
+    end
+    
+    return Digest::MD5.hexdigest(hashes.join("_"))
+  end
+  
+  #Returns a hash based on the string-values of an array.
+  def self.array_hash(arr)
+    hashes = []
+    arr.each do |ele|
+      hashes << Digest::MD5.hexdigest(ele.to_s)
+    end
+    
+    return Digest::MD5.hexdigest(hashes.join("_"))
+  end
+  
+  #Validates a hash of data.
+  def self.validate_hash(h, args)
     h.each do |key, val|
       if args.key?(:not_empty) and args[:not_empty].index(key) != nil and val.to_s.strip.length <= 0
         raise Knj::Errors::InvalidData, sprintf(args[:not_empty_error], key)
       end
     end
-	end
+  end
+  
+  #Sorts the hash without being a retard...
+  def self.hash_sort(hash, &block)
+    sorted = hash.sort(&block)
+    
+    ret = {}
+    sorted.each do |ele|
+      ret[ele[0]] = ele[1]
+    end
+    
+    return ret
+  end
+  
+  #Forces all strings in an array or a hash to be encoded to a specific encoding recursively.
+  def self.clone_encode(hash, encoding, args = {})
+    return hash if !hash
+    
+    hash = hash.clone
+    Knj::Php.foreach(hash) do |key, val|
+      if val.is_a?(String)
+        begin
+          hash[key] = Knj::Php.utf8_encode(encoding)
+        rescue Encoding::UndefinedConversionError => e
+          if args["ignore_encoding_errors"]
+            next
+          else
+            raise e
+          end
+        end
+      elsif val.is_a?(Array) or val.is_a?(Hash)
+        hash[key] = Knj::ArrayExt.clone_encode(val, encoding, args)
+      end
+    end
+    
+    return hash
+  end
 end

data/lib/knj/autoload/backups/ping.rb

@@ -44,8 +44,8 @@ module Ping
   def pingecho(host, timeout=5, service="echo")
     begin
       timeout(timeout) do
-	s = TCPSocket.new(host, service)
-	s.close
+  s = TCPSocket.new(host, service)
+  s.close
       end
     rescue Errno::ECONNREFUSED
       return true

data/lib/knj/autoload/erubis.rb

@@ -1,8 +1,8 @@
 module Erubis; end #bugfix
 
 begin
-	require "erubis"
+  require "erubis"
 rescue LoadError
-	require "rubygems"
-	require "erubis"
+  require "rubygems"
+  require "erubis"
 end

data/lib/knj/autoload/facets_dictionary.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 
 begin
-	require "facets/dictionary"
+  require "facets/dictionary"
 rescue LoadError
-	require File.dirname(__FILE__) + "/backups/facets_dictionary"
+  require File.dirname(__FILE__) + "/backups/facets_dictionary"
 end

data/lib/knj/autoload/gettext.rb

@@ -2,8 +2,8 @@
 module GetText; end
 
 begin
-	require "gettext"
+  require "gettext"
 rescue LoadError
-	require "rubygems"
-	require "gettext"
+  require "rubygems"
+  require "gettext"
 end

data/lib/knj/autoload/gtk2.rb

@@ -1,5 +1,5 @@
 require "gtk2"
 
 module Gtk
-	autoload :MozEmbed, "gtkmozembed"
+  autoload :MozEmbed, "gtkmozembed"
 end

data/lib/knj/autoload/json.rb

@@ -0,0 +1,14 @@
+require "rubygems"
+
+begin
+  if RUBY_ENGINE == "jruby"
+    require "json/pure" #normal json has utf-8 encoding problems - knj.
+  else
+    require "json/pure"
+    
+    #deactivated because of problems with utf-8 encoding.
+    #require "json/ext"
+  end
+rescue LoadError
+  require "json/pure"
+end

data/lib/knj/autoload/magick.rb

@@ -1,6 +1,6 @@
 begin
-	require "RMagick"
+  require "RMagick"
 rescue LoadError
-	require "rubygems"
-	require "RMagick"
+  require "rubygems"
+  require "RMagick"
 end

data/lib/knj/autoload/mysql.rb

@@ -1,6 +1,6 @@
 begin
-	require "mysql"
+  require "mysql"
 rescue LoadError
-	require "rubygems"
-	require "mysql"
+  require "rubygems"
+  require "mysql"
 end

data/lib/knj/autoload/parsedate.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + "/backups/parsedate.rb"
+require "#{$knjpath}autoload/backups/parsedate.rb"

data/lib/knj/autoload/ping.rb

@@ -44,8 +44,8 @@ module Ping
   def pingecho(host, timeout=5, service="echo")
     begin
       timeout(timeout) do
-	s = TCPSocket.new(host, service)
-	s.close
+  s = TCPSocket.new(host, service)
+  s.close
       end
     rescue Errno::ECONNREFUSED
       return true

data/lib/knj/autoload/rexml.rb

@@ -1,12 +1,12 @@
 require "rexml/rexml"
 
 module REXML
-	autoload :Document, "rexml/document"
-	autoload :ParseException, "rexml/parseexception"
+  autoload :Document, "rexml/document"
+  autoload :ParseException, "rexml/parseexception"
 end
 
 module REXML::Formatters
-	autoload :Default, "rexml/formatters/default"
-	autoload :Pretty, "rexml/formatters/pretty"
-	autoload :Transitive, "rexml/formatters/transitive"
+  autoload :Default, "rexml/formatters/default"
+  autoload :Pretty, "rexml/formatters/pretty"
+  autoload :Transitive, "rexml/formatters/transitive"
 end

data/lib/knj/autoload/soap.rb

@@ -1,3 +1,3 @@
 module SOAP
-	autoload :WSDLDriverFactory, "soap/wsdlDriver"
+  autoload :WSDLDriverFactory, "soap/wsdlDriver"
 end

data/lib/knj/autoload/sqlite3.rb

@@ -1,6 +1,6 @@
 begin
-	require "sqlite3"
+  require "sqlite3"
 rescue LoadError
-	require "rubygems"
-	require "sqlite3"
+  require "rubygems"
+  require "sqlite3"
 end