rwdtinker 1.69 → 1.70

data/Readme.txt

@@ -234,6 +234,16 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+Version 1.70
+ major update to applet loading routines
+ a properly prepared applet should be loadable and unloadable live with not restarting
+ localization is not yet updated in live applet loading
+ remove network line debugging output
+
+Version 1.69
+ More work on translations - Spanish almost done
+ removed remote control
+ 
 Version 1.68
  updated to newest Ruby webdialogs
 

data/code/01rwdcore/03helptexthash.rb

@@ -18,14 +18,6 @@ Then you should be able to login at: http://yourhostname:8080",
   <p>
   
   when you click on a document name, the document should pop up in a <br>
-  browser window, or in another browser tab.</b>",
-  :remote_control => "<b>Remote control gives you a way to determine what applications are running on which ports
-  <p>
-  The name of the application is set in the config file<br>
-  You need to click the show remote command choices first - this will show the port and query choices<br>
-   Then you can click in 'Run Command' to see if other applications are running.<br>
-<p>
-   The remote ports daemon will not be running unless you start it.
-   </b>
+  browser window, or in another browser tab.</b>
   "
       

data/code/01rwdcore/jumplinkcommand.rb

@@ -1,5 +1,5 @@
 # Bind message passing socket to rwdtinker application
-JumpLink = Hash.new { |hh, kk| hh[kk] = "ERROR: link not found: #{kk.inspect}."; hh[kk] }
+
     locationlink = {
     :helpscreen=> "runhelpwindow",
     :tinkerbackwindow=>"runrwdtinkerbackwindow",

data/code/superant.com.rwdtinkerbackwindow/initiateapplets.rb

@@ -0,0 +1,200 @@
+
+#***********************************************************************
+#* Rwd/Tinker -- A Ruby program for the RudyWebDialog.
+#* Copyright (c) 2004 - 2005 by Steven Gibson. All Rights Reserved.
+#*
+#* This library is free software; you can redistribute it and/or
+#* modify it under the terms of the GNU General Public
+#* License as published by the Free Software Foundation; either
+#* .
+#*
+#* These files are distributed in the hope that they will be useful,
+#* but WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#* General Public License for more details.
+#*
+#* You should have received a copy of the GNU General Public
+#* License along with these files; if not, write to the Free Software
+#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#*
+#* For further information please contact the author by e-mail
+#* at "smalllinux@gmail.com".
+#***********************************************************************/
+
+
+
+# integrate the new configuration files
+def initiateapplet(nametextlocal)
+	
+begin
+
+  Dir.chdir($progdir )    #changes the current working directory
+	  
+  @confignew =  "configuration/" + "#{nametextlocal}.cnf"
+  @configdist =  "configuration/" + "#{nametextlocal}.dist"
+  Rconftool::install(@configdist,@confignew)
+ 
+  configfileload = File.open(@confignew){|f| f.read}
+	 
+       eval configfileload  #load  config file
+       
+     setuphelpaboutoptions # update the help about list
+       setuptinkerdocuments # update the document pull down list
+       runhelpwindow   # update the help menu
+        showjumplinkoptions # update the application link menu
+	runrwdtinkerbackwindow # back to applet window
+	
+	# build the actual GUI from the gui parts
+  $tempdoc = " "
+  #get a list of the files and subdirectories on the starting directory only
+  a = Array.new(Dir[GuiDir].entries.sort)
+  #loop through the list, ignore the files and add all new directories found
+  a.each do |x|
+	  #if a directory...
+	  if(test(?d,x))
+		  #use this new dir find to add to the original list of directories
+		  @@root = x + "/**"
+		  #adds the new ones to the array
+		  b = Dir[@@root].entries.sort
+		  b.each do |x|
+			  if(test(?d,x))
+				  a.push(x)  #appends to the end of the array...
+			  end
+		  end
+	  end
+  end
+  a.each do |x|
+	  #if it is a file...
+	  if(!test(?d,x)) 
+		  a.delete(x)
+
+	  else #it is a directory...
+		  loadguifile(x + "/**")
+	  end
+  end
+
+$rwd_gui_tinker = $tempdoc
+
+# now load in the code files
+
+$tempdoc  = ""
+tempcodeinstallline  = ""
+
+         @fileName = "installed/" + nametextlocal + ".inf"
+	
+  tmpfilearray = File.readlines(@fileName)
+  
+  tmpfilearray.each do |line|
+	  
+       tempcodeinstallline = line.chomp
+       if tempcodeinstallline.include?('code/')
+	     findfiles(tempcodeinstallline  + "/**")
+            tempcoderesult = eval( $tempdoc ) # read the program code and evaluate
+       end
+end 
+  
+# resultend =  tempcodeinstallline .index("\n",resultstart)
+ tempresult  = @fileName
+ 
+return " applet loading successful " + tempresult 
+
+ rescue
+   
+    return " applet file error"
+
+  end
+
+end
+
+=begin
+
+
+  Dir.chdir($progdir) # change back to top program directory
+
+  # build the English Language hash file from the parts
+  languagehashvariable = 'Message = Hash.new { |hh, kk| hh[kk] = "ERROR: Message not found: #{kk.inspect}."; hh[kk] }
+  langmessage = {' + "\n"
+  startlangdir = File.join(LangDir,"en")
+  #get a list of the files and subdirectories on the starting directory only
+  alanghash = Array.new(Dir[startlangdir].entries.sort)
+  #loop through the list, ignore the files and add all new directories found
+  alanghash.each do |x|
+	  #if a directory...
+	  if(test(?d,x))
+		  # add to the original list of directories
+		  @@tmproot = x + "/**"
+		  #adds the new ones to the array
+		  blanghash = Dir[@@tmproot].entries.sort
+		  blanghash.each do |x|
+			  if(test(?d,x))
+				  alanghash.push(x)  #appends to the end of the array...
+			  end
+		  end
+	  end
+  end
+  alanghash.each do |x|
+	  #if it is a file...
+	  if(!test(?d,x))
+		  alanghash.delete(x)
+	  else              #it is a directory...
+		  findfiles(x + "/**")
+	  end
+  end
+
+
+  #writes the contents of doc into the  languagehashvariable 
+  languagehashvariable  =  languagehashvariable + $tempdoc + "}  ; langmessage.each { |kk, vv| Message[kk] = vv }"
+
+  # END of en Lang building
+  $tempdoc = " "
+  Dir.chdir($progdir) # change back to top program directory
+
+  # build the local Language hash file from the parts
+  startlangdir = File.join(LangDir,$lang)
+  #get a list of the files and subdirectories on the starting directory only
+  alanghash = Array.new(Dir[startlangdir].entries.sort)
+  #loop through the list, ignore the files and add all new directories found
+  alanghash.each do |x|
+	  #if a directory...
+	  if(test(?d,x))
+		  # add to the original list of directories
+		  @@tmproot = x + "/**"
+		  #adds the new ones to the array
+		  blanghash = Dir[@@tmproot].entries.sort
+		  blanghash.each do |x|
+			  if(test(?d,x))
+				  alanghash.push(x)  #appends to the end of the array...
+			  end
+		  end
+	  end
+  end
+  alanghash.each do |x|
+	  #if it is a file...
+	  if(!test(?d,x))
+		  alanghash.delete(x)
+	  else              #it is a directory...
+		  findfiles(x + "/**")
+	  end
+  end
+
+
+  #writes the contents of doc into the variable
+  languagehashvariable =  languagehashvariable  + " ; Message.update(" + $tempdoc + ' :rwdtinker => "Rwdtinker" ) '
+
+
+  $tempdoc = " "
+
+  Dir.chdir($progdir) # change back to top program directory
+
+  temp = eval(   languagehashvariable )
+
+  $tempdoc = " "
+
+ 
+
+	
+
+
+=end
+
+  

data/code/superant.com.rwdtinkerbackwindow/installapplet.rb

@@ -12,10 +12,12 @@ def installapplet
 
 		zf = Zip::ZipFile.new(fileName)
 		zf.sort.each {
+		
 			|entry|
 			zf.extract(entry.to_s, entry.to_s)
 		}
-		@installapplettext = Message[:applet_installed]  
+		@returninitateresults = initiateapplet(nametext)
+		@installapplettext = Message[:applet_installed] + " " +   @returninitateresults 
 
 	rescue
 		@installapplettext = "unzip error - applet may not be installed correctly"

data/code/superant.com.rwdtinkerbackwindow/installgemapplet.rb

@@ -12,10 +12,16 @@ def installgemapplet
 			|entry|
 			zf.extract(entry.to_s, entry.to_s)
 		}
-		@installapplettext = Message[:applet_installed]  
+		@nametextbase = File.basename(nametext)
+		@returninitateresults = initiateapplet(@nametextbase)
+		@installapplettext = Message[:applet_installed] + " " +   @returninitateresults 
+
+				
+       RWDWindow.new($rwd_gui_tinker, @rwd_window).render("DEFAULT")
 
 	rescue
 		@installapplettext = "unzip error - applet may not be installed correctly"
+		
 	end # exception rescue
 end
 

data/code/superant.com.rwdtinkerbackwindow/removeapplet.rb

@@ -3,8 +3,17 @@ def removeapplet
 	require 'fileutils'
 	nametext = "%s" % [@a_removeapplet]
 
+       fileName = "installed/" + nametext + ".inf"
+       @appletremoveresult = removeappletvariables(nametext)
+       
+       setuphelpaboutoptions # update the help about list
+       setuptinkerdocuments # update the document pull down list
+       runhelpwindow   # update the help menu
+        showjumplinkoptions # update the application link menu
+	runrwdtinkerbackwindow # back to applet window
+
 	begin # exception trapped block
-		fileName = "installed/" + nametext + ".inf"
+		
 		count =  0
 		fd = File.open(fileName,"r") 
 
@@ -19,11 +28,13 @@ def removeapplet
 			count = 1
 		}
 		fd.close
+ 
+           
 
 		FileUtils.rm_rf( fileName)
-
-
-		@removeapplettext = "applet files removed! - restart rwd to finish uninstalling"    
+		
+		  
+		@removeapplettext = "applet files removed!" + " " + @appletremoveresult
 
 	rescue
 		@removeapplettext = "\n" + "error"

data/code/superant.com.rwdtinkerbackwindow/removeappletvariables.rb

@@ -0,0 +1,52 @@
+
+#***********************************************************************
+#* Rwd/Tinker -- A Ruby program for the RudyWebDialog.
+#* Copyright (c) 2004 - 2005 by Steven Gibson. All Rights Reserved.
+#*
+#* This library is free software; you can redistribute it and/or
+#* modify it under the terms of the GNU General Public
+#* License as published by the Free Software Foundation; either
+#* .
+#*
+#* These files are distributed in the hope that they will be useful,
+#* but WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#* General Public License for more details.
+#*
+#* You should have received a copy of the GNU General Public
+#* License along with these files; if not, write to the Free Software
+#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#*
+#* For further information please contact the author by e-mail
+#* at "steven@superant.com".
+#***********************************************************************/
+
+def removeappletvariables(tempremovename)
+	
+ 	begin # exception trapped block
+	
+	$stderr.puts "in removeappletvariables"
+	
+	 # removefileinf = File.open(tempremove){|f| f.read}
+	 
+       removearray = [1 , 2]
+       temp = tempremovename.gsub("-","_")
+        removemethod = temp.gsub(".","_")
+       
+          
+        send "#{removemethod}"
+	
+	tmpremoveapplet = " successfull applet variable removal "
+	
+ 	rescue
+		tmpremoveapplet =  " file error - removeappletvariables"
+
+	end # exception rescue
+  
+      return  tmpremoveapplet
+      
+    end
+
+
+  
+  

data/configuration/language.dist

@@ -1,4 +1,4 @@
-##VERSION:1.68
+##VERSION:1.69
 #language selection file
 ##NAME:$lang:0
 #$lang = "jp"

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION:1.69
+##VERSION:1.70
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -14,6 +14,5 @@ LangDir = "lang"
 $rwdjumplink = ["helpscreen","tinkerbackwindow","returntomain","opendocuments","editconfiguration"]
 Browser_Exe = 'mozilla '
 $tinkerdocumentsarray +=["HowTo_Tinker.txt","rwdapplications.html","RubyWebDialogs.html"]
-RwdTinkerVersion = "1.69"
-	
-   
+RwdTinkerVersion = "1.70"
+

data/ev/net.rb

@@ -784,8 +784,8 @@ 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.user} #{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}"
+             1 == 1
                 begin
                   yield(req, resp)
                 rescue Exception => e

data/ev/rwd.rb

@@ -635,7 +635,7 @@ class RWDWindow
 
   def initialize(rwd, window=nil)
     rwd	= rwd.join("\n")	if rwd.kind_of?(Array)
-
+  
     if @@windows[rwd].nil?
       @@windows[rwd]		= {}
       @@helpwindows[rwd]	= {}
@@ -666,6 +666,8 @@ class RWDWindow
 
     vars	= vars.deep_dup
 
+begin # error wrap
+
     vars.each do |key, value|
       if not key.empty?
         if value.respond_to? "to_s"
@@ -721,6 +723,10 @@ class RWDWindow
 
     html
   end
+  
+  rescue 
+  $stderr.puts  "error in RWDWindow - render method"
+  end
 end
 
 class RWDMessage < RWDWindow
@@ -763,8 +769,10 @@ class RWDDone < RWDWindow
 end
 
 class RWDialog
+	
   def initialize(xml)
-    @rwd_xml			= xml
+    @rwd_xml			=  $rwd_gui_tinker
+    # change from default ev - was xml
     @rwd_exitbrowser		= false
     @rwd_history		= []
     @rwd_ignore_vars		= []
@@ -818,6 +826,7 @@ class RWDialog
     help		= false
     back		= false
     tab			= ""
+    @rwd_progress_thread = nil
     @rwd_msgtype	= nil	if @rwd_progress_thread.nil?
     @rwd_download	= nil
     @rwd_download_file	= nil
@@ -833,7 +842,7 @@ class RWDialog
 		# Copy the vars from the window to vars. vars wil later on be copied to instance variables.
 
     post.sort.each do |key, value|
-      puts "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
+      $stderr.puts  "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
 
       vars[key]	= value.from_html
     end
@@ -910,7 +919,7 @@ class RWDialog
 
       if (not back) or @rwd_call_after_back.include?(@rwd_action)
         unless @rwd_action =~ /^rwd_/
-          puts "Method: #{@rwd_action}(#{@rwd_args.join(", ")})"	if $rwd_debug
+          puts  "Method: #{@rwd_action}(#{@rwd_args.join(", ")})"	if $rwd_debug
           if methods.include?(@rwd_action)
             method(@rwd_action).call(*@rwd_args)
           else
@@ -948,7 +957,7 @@ class RWDialog
 		# just ignore.
 
     vars.sort.each do |key, value|
-      puts "Pre: #{key} -> #{value.inspect}"	if $rwd_debug
+      puts  "Pre: #{key} -> #{value.inspect}"	if $rwd_debug
     end
 
 
@@ -971,11 +980,18 @@ class RWDialog
             res << RWDError.new(@rwd_msg).render(pda)	if @rwd_msgtype == "error"
             res << @rwd_msg				if @rwd_msgtype == "text"
           else
-            puts "Window: #{@rwd_window}"		if $rwd_debug
-            puts "Tab: #{@rwd_tab}"		if $rwd_debug
-
-            res << RWDWindow.new(@rwd_xml, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
-          end
+           puts   "Window: #{@rwd_window}"		if $rwd_debug
+            puts  "Tab: #{@rwd_tab}"		if $rwd_debug
+
+begin # error block
+      if @rwd_window.empty? 
+	      @rwd_window = "main"
+	      end
+            res << RWDWindow.new($rwd_gui_tinker, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
+rescue
+ $stderr.puts  "error in render"
+ end
+end
         end
       end
     end

data/init.rb

@@ -18,7 +18,7 @@
 #* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #*
 #* For further information please contact the author by e-mail
-#* at "steven@superant.com".
+#* at "smalllinux@gmail.com".
 #***********************************************************************/
 
 require "ev/rwd"
@@ -234,8 +234,8 @@ Rconftool::install(configdist,confignew)     #integrates new file with old
   end
 
   # gui variable is done
-  guiRWD = $tempdoc
-
+  guiRWD = ""
+  $rwd_gui_tinker = $tempdoc
   require 'socket'		# Network stuff
   host = "127.0.0.1"
   port = $port
@@ -273,5 +273,5 @@ Rconftool::install(configdist,confignew)     #integrates new file with old
 
   end
 
-
-  RwdTinker.new(  guiRWD).serve(port) # start the main class and program
+  
+  RwdTinker.new(  $rwd_gui_tinker ).serve(port) # start the main class and program

data/rwdconfig.dist

@@ -14,6 +14,8 @@ $testharness=true
 $tinkerhelpaboutarray = ["Tinker"]
 ##NAME:$tinkerdocumentsarray:0
 $tinkerdocumentsarray = ["Readme.txt"]
-
-
+##NAME:$tinkeruninstallarray:0
+$tinkeruninstallarray = ["Tinker"]
+##NAME:JumpLink:0
+JumpLink = Hash.new { |hh, kk| hh[kk] = "ERROR: link not found: #{kk.inspect}."; hh[kk] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwdtinker
 version: !ruby/object:Gem::Version 
-  version: "1.69"
+  version: "1.70"
 platform: ruby
 authors: 
 - Steven Gibson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-22 00:00:00 -07:00
+date: 2008-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,8 @@ files:
 - code/superant.com.rwdtinkerbackwindow/loadconfigurationvariables.rb
 - code/superant.com.rwdtinkerbackwindow/listzips.rb
 - code/superant.com.rwdtinkerbackwindow/network.rb
+- code/superant.com.rwdtinkerbackwindow/initiateapplets.rb
+- code/superant.com.rwdtinkerbackwindow/removeappletvariables.rb
 - code/superant.com.rwdtinkerbackwindow/removeapplet.rb
 - code/superant.com.rwdtinkerbackwindow/viewgemappletcontents.rb
 - code/superant.com.rwdtinkerbackwindow/helptexthashtinkerwin2.rb