rwdtinker 1.67 → 1.68

data/ev/net.rb

@@ -1,5 +1,6 @@
 require "ev/ruby"
 require "ev/ftools"
+require "ev/mime"
 require "net/http"
 require "socket"
 require "uri"
@@ -13,11 +14,11 @@ file	= "#{home}/.evnet"
 if File.file?(file)
   Hash.file(file).each do |k, v|
     eval "$#{k} = '#{v}'"	unless k=~ /^\#/
-    #$proxy_auth	= [$proxy_auth].pack("m").chomp	if k == "proxy_auth"
   end
 end
 
 def uri2txt(s)
+	# ??? Werkt niet goed
   i	= s.index(/%[[:digit:]]{2}/)
   while not i.nil?
     s	= s[0..(i-1)] + s[(i+1)..(i+2)].unpack('H2').shift.to_i.chr + s[(i+3)..-1]
@@ -147,6 +148,8 @@ class EVURI
     rescue
     end
 
+    @path		= "/"		if (not @path.nil? and @path.empty? and @protocol == "http")
+
     @protocol		= ""		if @protocol.nil?
     @userpass		= ""		if @userpass.nil?
     @host		= ""		if @host.nil?
@@ -163,7 +166,7 @@ class EVURI
     @port		= @port.to_i
   end
 
-  def + (url2)
+  def +(url2)
     url1	= self.to_s
     url2	= url2.to_s	if url2.kind_of?(self.class)
 
@@ -174,7 +177,7 @@ class EVURI
     protocol	= @protocol
     userpass	= @userpass
     host	= @host
-    port	= @port.to_s
+    port	= @port
     path	= @path
     vars	= varstring
     anchor	= @anchor
@@ -196,6 +199,33 @@ class EVURI
     return res
   end
 
+  def localname
+    protocol	= @protocol
+    userpass	= @userpass
+    host	= @host
+    port	= @port
+    path	= @path
+    vars	= varstring
+    anchor	= @anchor
+
+    protocol	= nil	if @protocol.empty?
+    userpass	= nil	if @userpass.empty?
+    host	= nil	if @host.empty?
+    port	= nil	if @port.zero?
+    path	= nil	if @path.empty?
+    vars	= nil	if @vars.empty?
+    anchor	= nil	if @anchor.empty?
+
+    path	= "#{path}."	if path =~ /[\/\\]$/
+
+    f	= MD5.new(protocol.to_s + userpass.to_s + host.to_s + port.to_s + File.dirname(path.to_s) + vars.to_s).to_s
+    e	= File.basename(path.to_s).gsub(/[^\w\.\-]/, "_").gsub(/_+/, "_")
+    res	= f + "." + e
+    res.gsub!(/[^\w]+$/, "")
+
+    return res
+  end
+
   def varstring
     res		= []
     vars	= @vars.dup
@@ -281,36 +311,52 @@ class HTTPClient
     end
   end
 
+  class NoAddressException < StandardError
+  end
+
+  def self.getaddress(host)
+    if not @@hosts.include?(host)
+      @@hosts[host]	= ""
+      evtimeout(5) do	# ??? Doet 'ut niet?...
+        @@hosts[host]	= IPSocket.getaddress(host)
+      end
+    end
+
+    raise NoAddressException, host	if @@hosts[host].empty?
+
+    @@hosts[host]
+  end
+
   def self.head(uri, form={}, recursive=true)
     header	= Header.new(nil)
 
     begin
       while not uri.nil?
-        if $proxy.nil? or $proxy.empty?
-          uri		= EVURI.new(uri) if uri.kind_of? String
-          host		= uri.host
-          port		= uri.port
+        uri		= EVURI.new(uri) if uri.kind_of? String
+        host		= uri.host
+        port		= uri.port
+
+        if $proxy.nil? or $proxy.empty? or host == "localhost"
           io		= nil
 
           @@mutex.synchronize do
-            @@hosts[host]	= IPSocket.getaddress(host)	if not @@hosts.include?(host)
-            io			= TCPSocket.new(@@hosts[host], port.zero? ? 80 : port)
+            io			= TCPSocket.new(getaddress(host), port.zero? ? 80 : port)
           end
 
           io.write("HEAD #{uri.path or '/'}#{uri.varstring.empty? ? '' : '?' + uri.varstring} HTTP/1.0\r\nHost: #{host}\r\n\r\n")
         else
           proxy		= EVURI.new($proxy)
-          host		= proxy.host
-          port		= proxy.port
-
-          io		= TCPSocket.new(host, port.zero? ? 8080 : port)
+          io		= TCPSocket.new(proxy.host, proxy.port.zero? ? 8080 : proxy.port)
 
           io.write("HEAD #{uri} HTTP/1.0\r\n#{"Proxy-Authorization: Basic "+$proxy_auth+"\r\n" if not $proxy_auth.nil?}\r\n\r\n")
         end
 
         io.close_write
 
-        res		= io.read
+        res	= io.read
+
+        io.close_read
+
         header, data	= nil, nil
         header, data	= res.split(/\r*\n\r*\n/, 2)	if not res.nil?
         header		= Header.new(header)
@@ -321,14 +367,23 @@ class HTTPClient
           uri	= nil
         end
       end
-    rescue
+    rescue Errno::ECONNRESET, Errno::EHOSTUNREACH => e
+      $stderr.puts e.message
+      sleep 1
+      retry
+    rescue Errno::ECONNREFUSED => e
+      data	= nil
+    rescue NoAddressException => e
+      $stderr.puts e.message
       header	= Header.new(nil)
     end
 
+    GC.start
+
     return header
   end
 
-  def self.get(uri, form={})
+  def self.get(uri, httpheader={}, form={})
     post	= Array.new
     form.each_pair do |var, value|
       post << "#{var.to_html}=#{value.to_html}"
@@ -339,15 +394,14 @@ class HTTPClient
 
     begin
       while not uri.nil?
-        if $proxy.nil? or $proxy.empty?
-          uri	= EVURI.new(uri) if uri.kind_of? String
-          host	= uri.host
-          port	= uri.port
+        uri	= EVURI.new(uri) if uri.kind_of? String
+        host	= uri.host
+        port	= uri.port
 
+        if $proxy.nil? or $proxy.empty? or host == "localhost"
           io	= nil
           @@mutex.synchronize do
-            @@hosts[host]	= IPSocket.getaddress(host)	if not @@hosts.include?(host)
-            io			= TCPSocket.new(@@hosts[host], port.zero? ? 80 : port)
+            io			= TCPSocket.new(getaddress(host), port.zero? ? 80 : port)
           end
 
           if post.empty?
@@ -357,10 +411,7 @@ class HTTPClient
           end
         else
           proxy	= EVURI.new($proxy)
-          host	= proxy.host
-          port	= proxy.port
-
-          io	= TCPSocket.new(host, port.zero? ? 8080 : port)
+          io	= TCPSocket.new(proxy.host, proxy.port.zero? ? 8080 : proxy.port)
 
           if post.empty?
             io.write "GET %s HTTP/1.0\r\n" % uri
@@ -370,22 +421,32 @@ class HTTPClient
         end
 
         io.write "Host: %s\r\n" % host
-        io.write "User-Agent: evwget\r\n"
-        io.write "Proxy-Authorization: Basic %s\r\n" % $proxy_auth unless $proxy_auth.nil?
+        io.write "User-Agent: xyz\r\n"
+        io.write "Proxy-Authorization: Basic %s\r\n" % $proxy_auth	unless $proxy_auth.nil?
         #io.write "Accept-Encoding: deflate\r\n"
-        #io.write "Connection: close\r\n"
+        #io.write "Accept-Charset: ISO-8859-1\r\n"
+        io.write "Connection: close\r\n"
         io.write "Content-Type: application/x-www-form-urlencoded\r\n"	unless post.empty?
         io.write "Content-Length: %s\r\n" % post.length			unless post.empty?
+        httpheader.each do |k, v|
+          $stderr.puts "%s: %s\r\n" % [k, v]
+          io.write "%s: %s\r\n" % [k, v]
+        end
         io.write "\r\n"
         io.write post							unless post.empty?
 
         io.close_write
 
         res		= io.read
+
+        io.close_read
+
         header, data	= nil, nil
         header, data	= res.split(/\r*\n\r*\n/, 2)	if not res.nil?
 
         header	= Header.new(header)
+        length	= header.header["content-length"]
+        data	= ""	if length == "0"
 
         if header.header["location"] != uri.to_s
           uri	= EVURI.new(uri) + header.header["location"]
@@ -397,12 +458,25 @@ class HTTPClient
           data	= Chunk.new(data).to_s	if not data.nil?
         end
 
+        #if header.header["content-encoding"] == "gzip"
+          #data	= "gzip -d".exec(data)	if not data.nil?
+        #end
+
         data	= nil	unless header.code == 200
       end
-    rescue
+    rescue Errno::ECONNRESET, Errno::EHOSTUNREACH => e
+      $stderr.puts e.message
+      sleep 1
+      retry
+    rescue Errno::ECONNREFUSED => e
+      data	= nil
+    rescue NoAddressException, Errno::ECONNREFUSED => e
+      $stderr.puts e.message
       data	= nil
     end
 
+    GC.start
+
     return data
   end
 
@@ -422,7 +496,7 @@ class HTTPClient
     file	= "#{dir}/#{hash}"
     data	= nil
 
-    Dir.mkdirrec(dir)
+    File.mkpath(dir)
 
     expire	= 356*24*60*60
 
@@ -447,7 +521,7 @@ end
 class RequestGet < Hash
   def initialize(data)
     CGI.parse(data).each do |k, v|
-      self[k]	= v.join(" ")
+      self[k]	= v
     end
   end
 end
@@ -455,7 +529,7 @@ end
 class RequestPost < Hash
   def initialize(data)
     CGI.parse(data).each do |k, v|
-      self[k]	= v.join(" ")
+      self[k]	= v
     end
   end
 end
@@ -493,6 +567,8 @@ class Request < Hash
   attr_reader :request
   attr_reader :cookies
   attr_reader :vars
+  attr_reader :user
+  attr_writer :user
 
   def initialize(io)
     @io		= io
@@ -562,6 +638,7 @@ end
 
 class Response < Hash
   attr_writer :response
+  attr_writer :file
   attr_reader :cookies
   attr_reader :stop
   attr_reader :at_stop
@@ -574,10 +651,20 @@ class Response < Hash
     @syncd	= false
     @stop	= false
     @at_stop	= lambda{}
+    @file	= nil
   end
 
   def flush
     sync
+
+    if @file
+      File.open(@file, "rb") do |f|
+        while data = f.read(10_000)
+          @io.write data
+        end
+      end
+    end
+
     @io.close
   end
 
@@ -595,6 +682,21 @@ class Response < Hash
   end
 
   def sync
+    size	= (@data or "").length
+
+    if @file
+      ext	= @file.scan(/\.[^\.]*$/)
+      ext	= ext.shift
+      ext	= ext[1..-1]	unless ext.nil?
+      mimetype	= EVMime::MimeType[ext]
+
+      self["Content-Type"]	= mimetype		unless mimetype.nil?
+
+      size += File.size(@file)	if File.file?(@file)
+    end
+
+    self["Content-Length"]	= size
+
     @io.write("#{to_s}\r\n")	unless @syncd
     @io.write(@data)
     @data	= ""
@@ -605,6 +707,10 @@ class Response < Hash
     @data << s
   end
 
+  def clean
+    @data	= ""
+  end
+
   def inspect
     "(Response: %s)" % [@response, @data].join(", ")
   end
@@ -640,7 +746,7 @@ class HTTPServer
       count	= 0
 
       at_exit do
-        $stderr.puts "Received #{count} requests"
+        #$stderr.puts "Received #{count} requests"
       end
 
       serverthread =
@@ -678,7 +784,7 @@ class HTTPServer
               end
 
               if (not remote) or (remote and (auth.nil? or auth.empty? or authenticate(auth, realm, req, resp)))
-                $stderr.puts "#{count2}, #{Time.new.strftime("%Y-%m-%d.%H:%M:%S")}, #{ip}, #{req.request.to_s.strip}"
+                $stderr.puts "#{count2} #{Time.new.strftime("%Y-%m-%d %H:%M:%S")} #{ip} #{req.user} #{req.request.to_s.strip}"
 
                 begin
                   yield(req, resp)
@@ -687,6 +793,16 @@ class HTTPServer
                     $stderr.puts e.class.to_s + ": " + e.message
                     $stderr.puts e.backtrace.collect{|s| "\t"+s}.join("\n")
                   end
+                  resp["Content-Type"]	= "text/plain"
+                  resp.response		= "HTTP/1.0 200 ???"
+                  resp.clean
+                  resp << e.class.to_s + ": " + e.message
+                  resp << "\n"
+                  resp << "\n"
+                  resp << e.backtrace.collect{|s| "\t"+s}.join("\n")
+                  resp << "\n"
+                  resp << "\n"
+                  resp << "(You can use the back button and stop the application properly, if appropriate.)"
                 end
 
                 stop	= true	if resp.stop?
@@ -738,13 +854,13 @@ class HTTPServer
 
     ok	= (auths.include?(u) and auths[u] == p)
 
-    if ok
-
-    else
+    unless ok
       resp["WWW-Authenticate"]	= "Basic realm=\"#{realm}\""
       resp.response		= "HTTP/1.0 401 Unauthorized"
     end
 
+    req.user	= u
+
     return ok
   end
 end

data/ev/ruby.rb

@@ -18,14 +18,16 @@ tekens23	= tekens + "'"
 
 tekens31	= '\w\s\r\n'
 
-RegExpStringWord	= "([#{tekens11}]+)"									; RegExpWord	= Regexp.new(RegExpStringWord)
-RegExpStringWord2	= "([#{tekens21}]([#{tekens22}]*[#{tekens23}])?)"					; RegExpWord2	= Regexp.new(RegExpStringWord2)
-RegExpStringText	= "([#{tekens31}]+)"									; RegExpText	= Regexp.new(RegExpStringText)
-RegExpStringFile	= '(\w[\w\.\-]*)'									; RegExpFile	= Regexp.new(RegExpStringFile)
-RegExpStringEmail	= '([\w\-\.]+@[\w\-\.]+)'								; RegExpEmail	= Regexp.new(RegExpStringEmail)
-RegExpStringURL		= '(\w+:\/\/[\w\.\-]+(:\d*)?\/[\w\.\-\/\#\?\=\%]*)'					; RegExpURL	= Regexp.new(RegExpStringURL)
-RegExpStringPrint	= '([\w \t\r\n\`\~\!\@\#\$\%\^\&\*\(\)\-\+\=\[\]\{\}\;\:\'\"\,\.\/\<\>\?\\\|]+)'	; RegExpPrint	= Regexp.new(RegExpStringPrint)
-RegExpStringDiff	= '(^[\-\+]([^\-\+].*)?)'								; RegExpDiff	= Regexp.new(RegExpStringDiff)
+RegExpStringWord	= "([#{tekens11}]+)"									; RegExpWord		= Regexp.new(RegExpStringWord)
+RegExpStringWord2	= "([#{tekens21}]([#{tekens22}]*[#{tekens23}])?)"					; RegExpWord2		= Regexp.new(RegExpStringWord2)
+RegExpStringText	= "([#{tekens31}]+)"									; RegExpText		= Regexp.new(RegExpStringText)
+RegExpStringFile	= '(\w[\w\.\-]*)'									; RegExpFile		= Regexp.new(RegExpStringFile)
+RegExpStringEmail	= '([\w\-\.]+@[\w\-\.]+)'								; RegExpEmail		= Regexp.new(RegExpStringEmail)
+RegExpStringURL		= '(\w+:\/\/[\w\.\-]+(:\d*)?\/[\w\.\-\/\#\?\=\%]*)'					; RegExpURL		= Regexp.new(RegExpStringURL)
+RegExpStringPrint	= '([\w \t\r\n\`\~\!\@\#\$\%\^\&\*\(\)\-\+\=\[\]\{\}\;\:\'\"\,\.\/\<\>\?\\\|]+)'	; RegExpPrint		= Regexp.new(RegExpStringPrint)
+RegExpStringDiff	= '(^[\-\+]([^\-\+].*)?)'								; RegExpDiff		= Regexp.new(RegExpStringDiff)
+RegExpStringHTHLink	= '(`[\w\,]*\ba\b[^`]*`)'								; RegExpHTHLink		= Regexp.new(RegExpStringHTHLink)
+RegExpStringHTHSpecial	= '(`[^`]*`)'										; RegExpHTHSpecial	= Regexp.new(RegExpStringHTHSpecial)
 
 module Enumerable
   def deep_dup
@@ -64,6 +66,10 @@ class Numeric
   def to_fs
     to_f
   end
+
+  def to_html(eolconversion=true)
+    self.to_s.to_html(eolconversion)
+  end
 end
 
 class Integer
@@ -211,8 +217,8 @@ class String
   end
 
   def splitwords(tokens=[])
-    tokens	= [tokens]	unless tokens.kind_of?(Array)
-    res		= []
+    tokens		= [tokens]	unless tokens.kind_of?(Array)
+    res			= []
 
     self.splitblocks(["'", "'"], ['"', '"']).each do |type, s|
       case type
@@ -437,13 +443,14 @@ class Array
   end
 
   def format(format)
+    format	= format.gsub(/\s/, "")
     res		= []
 
     [format.length, self.length].min.times do |n|
-      case format[n].chr
-      when "i"	then res << self[n].to_i
-      when "s"	then res << self[n].to_s
-      when "x"	then res << self[n]
+      case format[n].chr.downcase
+      when "i"	then	res << self[n].to_i
+      when "s"	then	res << self[n].to_s
+      else		res << self[n]
       end
     end
 
@@ -540,6 +547,36 @@ class Array
   def ids
     collect{|e| e.ids}
   end
+
+  def rotate
+    raise "Array has to be 2D (An Array of Arrays)."	unless self.dup.delete_if{|a| a.kind_of?(Array)}.empty?
+
+    res	= []
+
+    self[0].length.times do |x|
+      a	= []
+
+      self.length.times do |y|
+        a << self[y][x]
+      end
+
+      res << a
+    end
+
+    res
+  end
+
+  def to_h
+    raise "Array has to be 2D (An Array of Arrays)."	unless self.dup.delete_if{|a| a.kind_of?(Array)}.empty?
+
+    res	= {}
+
+    self.each do |k, v, *rest|
+      res[k]	= v
+    end
+
+    res
+  end
 end
 
 class Hash
@@ -699,7 +736,11 @@ def trap(signal)
 end
 
 def linux?
-  not windows? and not cygwin?
+  not (target_os.downcase =~ /linux/).nil?
+end
+
+def darwin?
+  not (target_os.downcase =~ /darwin/).nil?
 end
 
 def windows?
@@ -727,8 +768,9 @@ def temp
 end
 
 def stdtmp
-  $stderr = $stdout = File.new("#{temp}/ruby.#{Process.pid}.log", "a")	unless ARGV.include?("--rwd-exit")
+  $stderr = $stdout = File.new("#{temp}/ruby.#{Process.pid}.log", "a")
 end
+stdtmp	if defined?(RUBYSCRIPT2EXE) and (RUBYSCRIPT2EXE =~ /rubyw/i)
 
 $nobm	= false
 
@@ -745,7 +787,7 @@ def bm(label="")
     end
   end
 
-  label	= label.to_s
+  label	= label.inspect	#unless label.kind_of?(String)
   res	= nil
 
   $bm_mutex	= ($bm_mutex or Mutex.new)
@@ -757,29 +799,41 @@ def bm(label="")
       $bm		= {}
 
       at_exit do
-	format1	= "%10s %10s %10s %10s %10s %10s %10s"
-	format2	= "%10s %10.6f %10.6f %10.6f %10.6f %10.6f %10d"
-
-	$stderr.puts format1 % ["LABEL", "USERCPU", "SYSCPU", "CUSERCPU", "CSYSCPU", "ELAPSED", "TIMES"]
-	$bm.sort{|a, b| [a[1], a[0]] <=> [b[1], b[0]]}.each do |k, v|
-	  $stderr.puts format2 % [k, *v]
+        l	= $bm.keys.collect{|s| s.length}.max
+	#format1	= "%10s %10s %10s %10s %10s %10s   %s"
+	#format2	= "%10.6f %10.6f %10.6f %10.6f %10.6f %10d   %s"
+	#$stderr.puts format1 % ["USERCPU", "SYSCPU", "CUSERCPU", "CSYSCPU", "ELAPSED", "COUNT", "LABEL"]
+	#$bm.sort{|a, b| [b[1], b[0]] <=> [a[1], a[0]]}.each do |k, v|
+	  #$stderr.puts format2 % (v + [k])
+	#end
+
+	format1	= "%10s %10s %10s   %s"
+	format2	= "%10.6f %10.6f %10d   %s"
+        $bm.each do |k, v|
+          $bm[k]	= [v[0]+v[1], v[4], v[5]]
+        end
+	$stderr.puts format1 % ["CPU", "ELAPSED", "COUNT", "LABEL"]
+	$bm.sort{|a, b| [b[1], b[0]] <=> [a[1], a[0]]}.each do |k, v|
+	  $stderr.puts format2 % (v + [k])
 	end
       end
     end
 
     $bm[label] = [0.0]*5 + [0]	unless $bm.include?(label)
+    $bm[label][5] += 1
   end
 
   if block_given?
     bm	= Benchmark.measure{res = yield}
     bma	= bm.to_a	# [dummy label, user CPU time, system CPU time, childrens user CPU time, childrens system CPU time, elapsed real time]
 
+    $bm_last	= bma
+
     $bm_mutex.synchronize do
+      e	= $bm[label]
       0.upto(4) do |n|
-        $bm[label][n] += bma[n+1]
+        e[n] += bma[n+1]
       end
-
-      $bm[label][5] += 1
     end
   end
 
@@ -817,3 +871,19 @@ def lambda_cached(&block)
     res
   end
 end
+
+def ask(options, text=false)
+  i	= 0
+  $stderr.puts ""
+  options.each do |s|
+    $stderr.puts " %d %s" % [i+=1, s]
+  end
+  $stderr.puts ""
+  $stderr.print "? "
+  res	= $stdin.gets
+  unless res.nil?
+    res	= res.strip
+    res	= options[res.to_i-1]	if text and not res.empty?
+  end
+  res
+end